diff --git a/Build/build.ps1 b/Build/build.ps1 index 718de33c..7491dc6f 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -32,7 +32,7 @@ $nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion" $builds = @( - @{Framework = "netstandard2.0"; TestsFunction = "NetCliTests"; TestFramework = "net5.0"; Enabled=$true}, + @{Framework = "netstandard2.0"; TestsFunction = "NetCliTests"; TestFramework = "net6.0"; Enabled=$true}, @{Framework = "netstandard1.3"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp3.1"; Enabled=$true}, @{Framework = "netstandard1.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp2.1"; Enabled=$true}, @{Framework = "net45"; TestsFunction = "NUnitTests"; TestFramework = "net46"; NUnitFramework="net-4.0"; Enabled=$true}, diff --git a/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.csproj b/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.csproj index 5959077a..b8a43257 100644 --- a/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.csproj +++ b/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.csproj @@ -1,7 +1,7 @@  Exe - net46;net5.0 + net46;net6.0 latest Newtonsoft.Json.TestConsole Newtonsoft.Json.TestConsole diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index 5b355da4..250b9b66 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -1,6 +1,6 @@  - net46;net40;net35;net20;net5.0;netcoreapp3.1;netcoreapp2.1 + net46;net40;net35;net20;net6.0;netcoreapp3.1;netcoreapp2.1 $(TestFrameworks) 9.0 1.0 @@ -109,7 +109,7 @@ NET20;$(AdditionalConstants) - + @@ -124,7 +124,7 @@ - + Json.NET Tests .NET Standard 2.0 .NETStandard,Version=v2.0 NETSTANDARD2_0;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;HAVE_REGEX_TIMEOUTS;$(AdditionalConstants) diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs index ef6e561d..9488ab9e 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ExpressionReflectionDelegateFactoryTests.cs @@ -145,7 +145,8 @@ namespace Newtonsoft.Json.Tests.Utilities }, new[] { "Cannot create an abstract class.", - "Cannot create an abstract class 'System.Type'." // mono + "Cannot create an abstract class 'System.Type'.", // mono + "Cannot dynamically create an instance of type 'System.Type'. Reason: Cannot create an abstract class." // net60 }); } diff --git a/Src/global.json b/Src/global.json index 04702084..19c87f2a 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.100" + "version": "6.0.300" } }