From c715884c8abfc96c0cb20ef6091864ff128df314 Mon Sep 17 00:00:00 2001 From: Cinder Biscuits Date: Tue, 22 Oct 2019 08:05:39 -0500 Subject: [PATCH] Convert LibreMetaverse projects to be solely .NET Standard 2.0 and 2.1 --- .travis.yml | 23 ------------------- LibreMetaverse.GUI/LibreMetaverse.GUI.csproj | 4 ++-- ...ibreMetaverse.Rendering.Meshmerizer.csproj | 3 ++- .../LibreMetaverse.Rendering.Simple.csproj | 4 ++-- .../LibreMetaverse.StructuredData.csproj | 4 ++-- .../LibreMetaverse.Tests.csproj | 2 +- .../LibreMetaverse.Utilities.csproj | 4 ++-- LibreMetaverse/LibreMetaverse.csproj | 4 ++-- .../LibreMetaverse.Types.csproj | 2 +- PrimMesher/LibreMetaverse.PrimMesher.csproj | 8 +++---- Programs/Baker/Baker.csproj | 2 +- Programs/GridProxy/GridProxy.csproj | 4 ++-- Programs/VoiceTest/VoiceTest.csproj | 4 ++-- .../examples/IRCGateway/IRCGateway.csproj | 4 ++-- .../examples/PacketDump/PacketDump.csproj | 4 ++-- .../examples/TestClient/TestClient.csproj | 2 +- 16 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3844ba55..00000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: csharp -solution: LibreMetaverse.sln - -matrix: - include: - - os: linux - dist: xenial - sudo: required - dotnet: 2.2 - mono: none - script: - - dotnet --info - - dotnet restore - - dotnet build --runtime linux-x64 - - os: osx # OSX 10.12 - osx_image: xcode9.2 - dotnet: 2.2 - mono: none - script: - - dotnet --info - - dotnet restore - - dotnet build --runtime osx10.12-x64 - \ No newline at end of file diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj index b0dfa6a9..b584e746 100644 --- a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj +++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -10,7 +10,7 @@ Grid IE50 false - net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse.GUI true diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj index e19e285f..a1d62b68 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj +++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library @@ -66,6 +66,7 @@ + diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj index 28a53979..e7a9416b 100644 --- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj +++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse.Rendering.Simple true diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj index daa55f83..f5ae7c33 100644 --- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj +++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse.StructuredData true diff --git a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj index dfafeb24..b8631e7a 100644 --- a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj +++ b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse.Tests true diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj index d63169ac..e8c2c59c 100644 --- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj +++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse.Utilities true diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj index d85aabc8..b94dff6a 100644 --- a/LibreMetaverse/LibreMetaverse.csproj +++ b/LibreMetaverse/LibreMetaverse.csproj @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse true @@ -51,8 +51,8 @@ AnyCPU - + diff --git a/LibreMetaverseTypes/LibreMetaverse.Types.csproj b/LibreMetaverseTypes/LibreMetaverse.Types.csproj index 1fac39cd..5bb83960 100644 --- a/LibreMetaverseTypes/LibreMetaverse.Types.csproj +++ b/LibreMetaverseTypes/LibreMetaverse.Types.csproj @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library LibreMetaverse true diff --git a/PrimMesher/LibreMetaverse.PrimMesher.csproj b/PrimMesher/LibreMetaverse.PrimMesher.csproj index a40e445f..38028d56 100644 --- a/PrimMesher/LibreMetaverse.PrimMesher.csproj +++ b/PrimMesher/LibreMetaverse.PrimMesher.csproj @@ -8,7 +8,7 @@ Library LibreMetaverse.PrimMesher LibreMetaverse.PrimMesher - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Dhalia Trimble, OpenSim Contributors, Cinder Roxley true 1.2.0 @@ -33,10 +33,10 @@ prompt 4 - - - + + + diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj index e4d3a76e..66e0ea30 100644 --- a/Programs/Baker/Baker.csproj +++ b/Programs/Baker/Baker.csproj @@ -10,7 +10,7 @@ Grid IE50 false - net471 + netstandard2.1 WinExe Baker diff --git a/Programs/GridProxy/GridProxy.csproj b/Programs/GridProxy/GridProxy.csproj index 5ee9661e..22ca6417 100644 --- a/Programs/GridProxy/GridProxy.csproj +++ b/Programs/GridProxy/GridProxy.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Library GridProxy true diff --git a/Programs/VoiceTest/VoiceTest.csproj b/Programs/VoiceTest/VoiceTest.csproj index dc176b26..645c846c 100644 --- a/Programs/VoiceTest/VoiceTest.csproj +++ b/Programs/VoiceTest/VoiceTest.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -12,7 +12,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Exe VoiceTest true diff --git a/Programs/examples/IRCGateway/IRCGateway.csproj b/Programs/examples/IRCGateway/IRCGateway.csproj index 33e37bf5..aa3bb58c 100644 --- a/Programs/examples/IRCGateway/IRCGateway.csproj +++ b/Programs/examples/IRCGateway/IRCGateway.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -12,7 +12,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Exe IRCGateway true diff --git a/Programs/examples/PacketDump/PacketDump.csproj b/Programs/examples/PacketDump/PacketDump.csproj index d5701933..40c997c4 100644 --- a/Programs/examples/PacketDump/PacketDump.csproj +++ b/Programs/examples/PacketDump/PacketDump.csproj @@ -1,4 +1,4 @@ - + Local 14.0.25123 @@ -12,7 +12,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Exe PacketDump true diff --git a/Programs/examples/TestClient/TestClient.csproj b/Programs/examples/TestClient/TestClient.csproj index a0e8c8bf..61d36749 100644 --- a/Programs/examples/TestClient/TestClient.csproj +++ b/Programs/examples/TestClient/TestClient.csproj @@ -10,7 +10,7 @@ Grid IE50 false - netstandard2.0;net471 + netstandard2.0;netstandard2.1 Exe TestClient true