From 024c1daeb5ae96c81d4b0b799ac03ce5771f1183 Mon Sep 17 00:00:00 2001 From: cinder Date: Fri, 11 Nov 2022 12:06:30 -0600 Subject: [PATCH] Updates for .NET7, drop netcoreapp3.1 support. --- LibreMetaverse.GUI/LibreMetaverse.GUI.csproj | 8 ++++---- LibreMetaverse.LslTools/LibreMetaverse.LslTools.csproj | 2 +- .../LibreMetaverse.Rendering.Meshmerizer.csproj | 4 ++-- .../LibreMetaverse.Rendering.Simple.csproj | 2 +- .../LibreMetaverse.StructuredData.csproj | 2 +- LibreMetaverse.Tests/LibreMetaverse.Tests.csproj | 9 ++++----- LibreMetaverse.Types/LibreMetaverse.Types.csproj | 2 +- LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj | 2 +- LibreMetaverse.Voice/LibreMetaverse.Voice.csproj | 2 +- LibreMetaverse/LibreMetaverse.csproj | 8 ++++---- PrimMesher/LibreMetaverse.PrimMesher.csproj | 4 ++-- Programs/Baker/Baker.csproj | 8 ++++---- Programs/GridProxy/GridProxy.csproj | 2 +- Programs/VoiceTest/VoiceTest.csproj | 2 +- Programs/examples/GridAccountant/GridAccountant.csproj | 8 ++++---- Programs/examples/IRCGateway/IRCGateway.csproj | 4 ++-- Programs/examples/PacketDump/PacketDump.csproj | 4 ++-- Programs/examples/TestClient/TestClient.csproj | 2 +- Programs/mapgenerator/mapgenerator.csproj | 4 ++-- global.json | 2 +- 20 files changed, 40 insertions(+), 41 deletions(-) diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj index 9c6fc857..f31a6cf2 100644 --- a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj +++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj @@ -1,12 +1,12 @@ - + - netcoreapp3.1;net5.0-windows;net6.0-windows + net6.0-windows;net7.0-windows - netcoreapp3.1;net5.0-linux;net6.0-linux + net6.0-linux;net7.0-linux - netcoreapp3.1;net5.0-macos;net6.0-macos + net6.0-macos;net7.0-macos LibreMetaverse.GUI diff --git a/LibreMetaverse.LslTools/LibreMetaverse.LslTools.csproj b/LibreMetaverse.LslTools/LibreMetaverse.LslTools.csproj index 25d4291b..9db02215 100644 --- a/LibreMetaverse.LslTools/LibreMetaverse.LslTools.csproj +++ b/LibreMetaverse.LslTools/LibreMetaverse.LslTools.csproj @@ -1,6 +1,6 @@ - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 LibreMetaverse.LslTools LibreMetaverse.LslTools Lexer for LSL scrripting language diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj index 227cea2f..30ed2a24 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj +++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj @@ -4,7 +4,7 @@ LibreMetaverse.Rendering.Meshmerizer Meshmerizer library for rendering mesh assets in LibreMetaverse LibreMetaverse.Rendering.Meshmerizer - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 Library true true @@ -50,7 +50,7 @@ - + diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj index 3fdf31c1..7153f80b 100644 --- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj +++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj @@ -3,7 +3,7 @@ LibreMetaverse.Rendering.Simple Simple library for rendering mesh assets in LibreMetaverse LibreMetaverse.Rendering.Simple - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 Library LibreMetaverse.Rendering.Simple true diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj index bde5b1b4..c7f949a9 100644 --- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj +++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj @@ -3,7 +3,7 @@ LibreMetaverse.StructuredData LibreMetaverse structured data library LibreMetaverse.StructuredData - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 Library LibreMetaverse.StructuredData true diff --git a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj index 90ccc288..e9470543 100644 --- a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj +++ b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj @@ -1,8 +1,7 @@ - + LibreMetaverse.Tests - netcoreapp3.1;net5.0;net6.0 - + net6.0;net7.0 Library LibreMetaverse.Tests true @@ -38,10 +37,10 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LibreMetaverse.Types/LibreMetaverse.Types.csproj b/LibreMetaverse.Types/LibreMetaverse.Types.csproj index 9fff71d9..8a6abd8a 100644 --- a/LibreMetaverse.Types/LibreMetaverse.Types.csproj +++ b/LibreMetaverse.Types/LibreMetaverse.Types.csproj @@ -3,7 +3,7 @@ LibreMetaverse.Types LibreMetaverse.Types LibreMetaverse type library - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 Library LibreMetaverse true diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj index 88b76fd8..01f5ff47 100644 --- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj +++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj @@ -3,7 +3,7 @@ LibreMetaverse.Utilities LibreMetaverse.Utilities LibreMetaverse utility library - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 Library LibreMetaverse.Utilities true diff --git a/LibreMetaverse.Voice/LibreMetaverse.Voice.csproj b/LibreMetaverse.Voice/LibreMetaverse.Voice.csproj index 7c9e98ca..2eba1557 100644 --- a/LibreMetaverse.Voice/LibreMetaverse.Voice.csproj +++ b/LibreMetaverse.Voice/LibreMetaverse.Voice.csproj @@ -9,7 +9,7 @@ true snupkg 0419,1574,1591 - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 x64;x86;AnyCPU ..\bin\ diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj index 7c2abeca..60e8275d 100644 --- a/LibreMetaverse/LibreMetaverse.csproj +++ b/LibreMetaverse/LibreMetaverse.csproj @@ -11,7 +11,7 @@ true snupkg 0419,1574,1591 - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 x64;x86;AnyCPU ..\bin\ @@ -44,13 +44,13 @@ - + - + - + diff --git a/PrimMesher/LibreMetaverse.PrimMesher.csproj b/PrimMesher/LibreMetaverse.PrimMesher.csproj index f784e5c5..c8747d65 100644 --- a/PrimMesher/LibreMetaverse.PrimMesher.csproj +++ b/PrimMesher/LibreMetaverse.PrimMesher.csproj @@ -4,7 +4,7 @@ LibreMetaverse.PrimMesher LibreMetaverse.PrimMesher Library - netstandard2.1;net5.0;net6.0 + netstandard2.1;net6.0;net7.0 Dhalia Trimble, Sjofn LLC, OpenMetaverse Developers true true @@ -47,7 +47,7 @@ TRACE;VERTEX_INDEXER - + diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj index 6ed5d9ca..06b784f7 100644 --- a/Programs/Baker/Baker.csproj +++ b/Programs/Baker/Baker.csproj @@ -1,12 +1,12 @@ - + - netcoreapp3.1;net5.0-windows;net6.0-windows + net6.0-windows;net7.0-windows - netcoreapp3.1;net5.0-linux;net6.0-linux + net6.0-linux;net7.0-linux - netcoreapp3.1;net5.0-macos;net6.0-macos + net6.0-macos;net7.0-macos Baker diff --git a/Programs/GridProxy/GridProxy.csproj b/Programs/GridProxy/GridProxy.csproj index 9916794d..79151563 100644 --- a/Programs/GridProxy/GridProxy.csproj +++ b/Programs/GridProxy/GridProxy.csproj @@ -5,7 +5,7 @@ Library GridProxy true - netcoreapp3.1;net5.0;net6.0 + net6.0;net7.0 x64;x86 ..\..\bin\ false diff --git a/Programs/VoiceTest/VoiceTest.csproj b/Programs/VoiceTest/VoiceTest.csproj index 40b40a4c..df440c66 100644 --- a/Programs/VoiceTest/VoiceTest.csproj +++ b/Programs/VoiceTest/VoiceTest.csproj @@ -4,7 +4,7 @@ Exe true ..\..\bin\ - netcoreapp3.1;net5.0;net6.0 + net6.0;net7.0 x64;x86;AnyCPU false diff --git a/Programs/examples/GridAccountant/GridAccountant.csproj b/Programs/examples/GridAccountant/GridAccountant.csproj index 54dad9d2..e1c0c4d8 100644 --- a/Programs/examples/GridAccountant/GridAccountant.csproj +++ b/Programs/examples/GridAccountant/GridAccountant.csproj @@ -1,12 +1,12 @@ - + - netcoreapp3.1;net5.0-windows;net6.0-windows + net6.0-windows;net7.0-windows - netcoreapp3.1;net5.0-linux;net6.0-linux + net6.0-linux;net7.0-linux - netcoreapp3.1;net5.0-macos;net6.0-macos + net6.0-macos;net7.0-macos GridAccountant diff --git a/Programs/examples/IRCGateway/IRCGateway.csproj b/Programs/examples/IRCGateway/IRCGateway.csproj index c1c22617..cb81fa41 100644 --- a/Programs/examples/IRCGateway/IRCGateway.csproj +++ b/Programs/examples/IRCGateway/IRCGateway.csproj @@ -1,11 +1,11 @@ - + IrcGateway IrcGateway true Exe ..\..\..\bin\ - netcoreapp3.1;net5.0;net6.0 + net6.0;net7.0 x64;x86 false diff --git a/Programs/examples/PacketDump/PacketDump.csproj b/Programs/examples/PacketDump/PacketDump.csproj index 309428ee..d1607c57 100644 --- a/Programs/examples/PacketDump/PacketDump.csproj +++ b/Programs/examples/PacketDump/PacketDump.csproj @@ -1,11 +1,11 @@ - + PacketDump PacketDump Exe true ..\..\..\bin\ - netcoreapp3.1;net5.0;net6.0 + net6.0;net7.0 AnyCPU true snupkg diff --git a/Programs/examples/TestClient/TestClient.csproj b/Programs/examples/TestClient/TestClient.csproj index 3819a590..308c0248 100644 --- a/Programs/examples/TestClient/TestClient.csproj +++ b/Programs/examples/TestClient/TestClient.csproj @@ -4,7 +4,7 @@ Exe true ..\..\..\bin\ - netcoreapp3.1;net5.0;net6.0 + net5.0;net6.0 x64;x86 true snupkg diff --git a/Programs/mapgenerator/mapgenerator.csproj b/Programs/mapgenerator/mapgenerator.csproj index 06456fbe..30c1161b 100644 --- a/Programs/mapgenerator/mapgenerator.csproj +++ b/Programs/mapgenerator/mapgenerator.csproj @@ -1,11 +1,11 @@ - + MapGenerator Exe true ..\..\bin\ LibreMetaverse.MapGenerator - netcoreapp3.1;net5.0;net6.0 + net6.0;net7.0 AnyCPU true snupkg diff --git a/global.json b/global.json index 1b8195c4..1bf76a58 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100", + "version": "7.0.100", "rollForward": "latestMinor" } }