diff --git a/Build/build.ps1 b/Build/build.ps1 index cbe08679..87d2bdad 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -13,8 +13,8 @@ $treatWarningsAsErrors = $false $workingName = if ($workingName) {$workingName} else {"Working"} $assemblyVersion = if ($assemblyVersion) {$assemblyVersion} else {$majorVersion + '.0.0'} - $netCliChannel = "Current" - $netCliVersion = "6.0.400" + $netCliChannel = "STS" + $netCliVersion = "8.0.300" $nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $ensureNetCliSdk = $true @@ -26,7 +26,7 @@ $workingDir = "$baseDir\$workingName" $nugetPath = "$buildDir\Temp\nuget.exe" - $vswhereVersion = "2.3.2" + $vswhereVersion = "3.1.7" $vswherePath = "$buildDir\Temp\vswhere.$vswhereVersion" $nunitConsoleVersion = "3.8.0" $nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion" @@ -179,8 +179,9 @@ function EnsureDotnetCli() -OutFile "$buildDir\Temp\dotnet-install.ps1" exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version $netCliVersion | Out-Default } + exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '6.0.400' | Out-Default } exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '3.1.402' | Out-Default } - exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '2.1.811' | Out-Default } + exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '2.1.818' | Out-Default } } function EnsureNuGetExists() @@ -203,7 +204,7 @@ function EnsureNuGetPackage($packageName, $packagePath, $packageVersion) function GetMsBuildPath() { - $path = & $vswherePath\tools\vswhere.exe -latest -products * -requires Microsoft.Component.MSBuild -property installationPath + $path = & $vswherePath\tools\vswhere.exe -latest -prerelease -products * -requires Microsoft.Component.MSBuild -property installationPath if (!($path)) { throw "Could not find Visual Studio install path" @@ -241,7 +242,7 @@ function NetCliTests($build) Write-Host "Project path: $projectPath" Write-Host - exec { dotnet test $projectPath -f $testDir -c Release -l trx -r $workingDir --no-restore --no-build | Out-Default } + exec { dotnet test $projectPath -f $testDir -c Release -l trx --results-directory $workingDir --no-restore --no-build | Out-Default } } finally { diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index bafd1cd9..4b9c22ec 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -3,7 +3,7 @@ 4.6.2 0.10.10 4.2.3 - 6.0.0 + 8.0.0 4.3.0 1.0.0 16.3.0 diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index 49d267ff..f564f2bb 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -173,6 +173,8 @@ + + diff --git a/Src/Newtonsoft.Json/CompatibilitySuppressions.xml b/Src/Newtonsoft.Json/CompatibilitySuppressions.xml index 64d04acc..b69c3442 100644 --- a/Src/Newtonsoft.Json/CompatibilitySuppressions.xml +++ b/Src/Newtonsoft.Json/CompatibilitySuppressions.xml @@ -1,6 +1,30 @@  + - + + CP0001 + T:Newtonsoft.Json.Serialization.Action + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0001 + T:Newtonsoft.Json.Serialization.Action`2 + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0001 + T:Newtonsoft.Json.Serialization.Action`3 + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0001 + T:Newtonsoft.Json.Serialization.Action`4 + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + CP0001 T:Newtonsoft.Json.Serialization.Func`1 @@ -31,37 +55,6 @@ lib/net20/Newtonsoft.Json.dll lib/net35/Newtonsoft.Json.dll - - CP0001 - T:Newtonsoft.Json.Serialization.Action - lib/net20/Newtonsoft.Json.dll - lib/net35/Newtonsoft.Json.dll - - - CP0001 - T:Newtonsoft.Json.Serialization.Action`2 - lib/net20/Newtonsoft.Json.dll - lib/net35/Newtonsoft.Json.dll - - - CP0001 - T:Newtonsoft.Json.Serialization.Action`3 - lib/net20/Newtonsoft.Json.dll - lib/net35/Newtonsoft.Json.dll - - - CP0001 - T:Newtonsoft.Json.Serialization.Action`4 - lib/net20/Newtonsoft.Json.dll - lib/net35/Newtonsoft.Json.dll - - - - CP0001 - T:System.Runtime.Serialization.Formatters.FormatterAssemblyStyle - lib/netstandard1.3/Newtonsoft.Json.dll - lib/netstandard2.0/Newtonsoft.Json.dll - CP0001 T:Newtonsoft.Json.SerializationBinder @@ -74,31 +67,100 @@ lib/netstandard1.3/Newtonsoft.Json.dll lib/netstandard2.0/Newtonsoft.Json.dll - - CP0007 - T:Newtonsoft.Json.Serialization.DefaultSerializationBinder + CP0001 + T:System.Runtime.Serialization.Formatters.FormatterAssemblyStyle + lib/netstandard1.3/Newtonsoft.Json.dll + lib/netstandard2.0/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.JsonConvert.get_DefaultSettings + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.JsonSerializerSettings.get_ReferenceResolverProvider + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.Serialization.JsonContract.get_DefaultCreator + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.Serialization.JsonDictionaryContract.get_DictionaryKeyResolver + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.Serialization.JsonObjectContract.get_ExtensionDataNameResolver + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.Serialization.JsonProperty.get_SetIsSpecified + lib/net20/Newtonsoft.Json.dll + lib/net35/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.JsonSerializer.get_Binder + lib/netstandard1.3/Newtonsoft.Json.dll + lib/netstandard2.0/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.JsonSerializerSettings.get_Binder + lib/netstandard1.3/Newtonsoft.Json.dll + lib/netstandard2.0/Newtonsoft.Json.dll + + + CP0002 + M:Newtonsoft.Json.Serialization.ITraceWriter.get_LevelFilter lib/netstandard1.3/Newtonsoft.Json.dll lib/netstandard2.0/Newtonsoft.Json.dll - CP0002 M:Newtonsoft.Json.Serialization.ITraceWriter.Trace(Newtonsoft.Json.TraceLevel,System.String,System.Exception) lib/netstandard1.3/Newtonsoft.Json.dll lib/netstandard2.0/Newtonsoft.Json.dll + + CP0002 + M:Newtonsoft.Json.Serialization.MemoryTraceWriter.get_LevelFilter + lib/netstandard1.3/Newtonsoft.Json.dll + lib/netstandard2.0/Newtonsoft.Json.dll + CP0002 M:Newtonsoft.Json.Serialization.MemoryTraceWriter.Trace(Newtonsoft.Json.TraceLevel,System.String,System.Exception) lib/netstandard1.3/Newtonsoft.Json.dll lib/netstandard2.0/Newtonsoft.Json.dll - CP0006 M:Newtonsoft.Json.Serialization.ITraceWriter.Trace(System.Diagnostics.TraceLevel,System.String,System.Exception) lib/netstandard1.3/Newtonsoft.Json.dll lib/netstandard2.0/Newtonsoft.Json.dll + + CP0006 + P:Newtonsoft.Json.Serialization.ITraceWriter.LevelFilter + lib/netstandard1.3/Newtonsoft.Json.dll + lib/netstandard2.0/Newtonsoft.Json.dll + + + CP0007 + T:Newtonsoft.Json.Serialization.DefaultSerializationBinder + lib/netstandard1.3/Newtonsoft.Json.dll + lib/netstandard2.0/Newtonsoft.Json.dll + \ No newline at end of file diff --git a/Src/global.json b/Src/global.json index 18b4598f..e972eb19 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.400", + "version": "8.0.300", "rollForward": "latestFeature" } } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9ff4dd64..80277984 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,9 +6,14 @@ pool: vmImage: 'windows-2022' steps: +- task: UseDotNet@2 + inputs: + version: '8.0.x' + - task: UseDotNet@2 inputs: version: '6.0.x' + packageType: runtime - task: UseDotNet@2 inputs: