LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update .NET 8 SDK (#2959)

Browse Source
This commit is contained in:
James Newton-King
2024-05-28 13:18:47 +08:00
committed by GitHub
parent b0d1d0b905
commit 4738a64817
6 changed files with 115 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/build.ps1
+7 -6
View File
@@ -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
{
Src/Directory.Build.props
+1 -1
View File
@@ -3,7 +3,7 @@
<AutofacPackageVersion>4.6.2</AutofacPackageVersion>
<BenchmarkDotNetPackageVersion>0.10.10</BenchmarkDotNetPackageVersion>
<FSharpCorePackageVersion>4.2.3</FSharpCorePackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>6.0.0</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>8.0.0</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftCSharpPackageVersion>4.3.0</MicrosoftCSharpPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0</MicrosoftSourceLinkGitHubPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.3.0</MicrosoftNETTestSdkPackageVersion>
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
+2
View File
@@ -173,6 +173,8 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
<!-- Explicitly specify Microsoft.NETCore.App to fix vulnerability warnings -->
<PackageReference Include="Microsoft.NETCore.App" Version="2.1.30" />
<PackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
<PackageReference Include="System.ObjectModel" Version="$(SystemObjectModelPackageVersion)" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(SystemRuntimeSerializationPrimitivesPackageVersion)" />
Src/Newtonsoft.Json/CompatibilitySuppressions.xml
+99 -37
View File
@@ -1,6 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<!--Types removed from lib/net35 which are present on lib/net20-->
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action`2</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action`3</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action`4</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Func`1</Target>
@@ -31,37 +55,6 @@
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action`2</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action`3</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.Action`4</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<!--Types which were removed from lib/netstandard2.0 but are present in lib/netstandard1.3-->
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Runtime.Serialization.Formatters.FormatterAssemblyStyle</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Newtonsoft.Json.SerializationBinder</Target>
@@ -74,31 +67,100 @@
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<!--Type inherits from Newtonsoft.Json.SerializationBinder in netstandard1.3 but not in netstandard2.0-->
<Suppression>
<DiagnosticId>CP0007</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.DefaultSerializationBinder</Target>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Runtime.Serialization.Formatters.FormatterAssemblyStyle</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.JsonConvert.get_DefaultSettings</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.JsonSerializerSettings.get_ReferenceResolverProvider</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.JsonContract.get_DefaultCreator</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.JsonDictionaryContract.get_DictionaryKeyResolver</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.JsonObjectContract.get_ExtensionDataNameResolver</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.JsonProperty.get_SetIsSpecified</Target>
<Left>lib/net20/Newtonsoft.Json.dll</Left>
<Right>lib/net35/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.JsonSerializer.get_Binder</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.JsonSerializerSettings.get_Binder</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.ITraceWriter.get_LevelFilter</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<!--These members exist in netstandard1.3, but not on netstandard2.0-->
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.ITraceWriter.Trace(Newtonsoft.Json.TraceLevel,System.String,System.Exception)</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.MemoryTraceWriter.get_LevelFilter</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.MemoryTraceWriter.Trace(Newtonsoft.Json.TraceLevel,System.String,System.Exception)</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<!--Interface member got added in netstandard2.0-->
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:Newtonsoft.Json.Serialization.ITraceWriter.Trace(System.Diagnostics.TraceLevel,System.String,System.Exception)</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>P:Newtonsoft.Json.Serialization.ITraceWriter.LevelFilter</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0007</DiagnosticId>
<Target>T:Newtonsoft.Json.Serialization.DefaultSerializationBinder</Target>
<Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
<Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
</Suppression>
</Suppressions>
Src/global.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.400",
"version": "8.0.300",
"rollForward": "latestFeature"
}
}
azure-pipelines.yml
+5
View File
@@ -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: