diff --git a/Build/build.ps1 b/Build/build.ps1 index f17ab5a2..85541c09 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -1,7 +1,7 @@ properties { - $zipFileName = "Json120r1.zip" + $zipFileName = "Json120r2.zip" $majorVersion = "12.0" - $majorWithReleaseVersion = "12.0.1" + $majorWithReleaseVersion = "12.0.2" $nugetPrerelease = "beta1" $version = GetVersion $majorWithReleaseVersion $packageId = "Newtonsoft.Json" @@ -13,7 +13,7 @@ $treatWarningsAsErrors = $false $workingName = if ($workingName) {$workingName} else {"Working"} $netCliChannel = "2.0" - $netCliVersion = "2.1.500" + $netCliVersion = "2.2.105" $nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $baseDir = resolve-path .. @@ -30,7 +30,7 @@ $nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion" $builds = @( - @{Framework = "netstandard2.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp2.1"; Enabled=$true}, + @{Framework = "netstandard2.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp2.2"; Enabled=$true}, @{Framework = "netstandard1.3"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.1"; Enabled=$true}, @{Framework = "netstandard1.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.0"; 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 e9d9480b..97a67d43 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;netcoreapp2.0 + net46;netcoreapp2.2 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 752d33ac..66e46a23 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -1,6 +1,6 @@  - net46;net451;net452;net40;net35;net20;netcoreapp2.1;netcoreapp1.1;netcoreapp1.0 + net46;net451;net452;net40;net35;net20;netcoreapp2.2;netcoreapp1.1;netcoreapp1.0 $(TestFrameworks) latest 1.0 @@ -13,7 +13,7 @@ Newtonsoft.Json.Tests false - Full + Full false @@ -153,7 +153,7 @@ NET20;$(AdditionalConstants) - + @@ -168,7 +168,7 @@ - + Json.NET Tests .NET Standard 2.0 .NETStandard,Version=v2.0 NETSTANDARD2_0;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;$(AdditionalConstants) diff --git a/Src/global.json b/Src/global.json index 21e27ced..2be3e866 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.1.500" + "version": "2.2.105" } } \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0cc6f9e0..baffb324 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,6 +6,10 @@ pool: vmImage: 'VS2017-Win2016' steps: +- powershell: | + dotnet --info + displayName: 'Dotnet installs' + - powershell: | $basePath = resolve-path . $keyPath = "$basePath\key.snk"