Update SDK version (#2031)
This commit is contained in:
+4
-4
@@ -1,7 +1,7 @@
|
|||||||
properties {
|
properties {
|
||||||
$zipFileName = "Json120r1.zip"
|
$zipFileName = "Json120r2.zip"
|
||||||
$majorVersion = "12.0"
|
$majorVersion = "12.0"
|
||||||
$majorWithReleaseVersion = "12.0.1"
|
$majorWithReleaseVersion = "12.0.2"
|
||||||
$nugetPrerelease = "beta1"
|
$nugetPrerelease = "beta1"
|
||||||
$version = GetVersion $majorWithReleaseVersion
|
$version = GetVersion $majorWithReleaseVersion
|
||||||
$packageId = "Newtonsoft.Json"
|
$packageId = "Newtonsoft.Json"
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
$treatWarningsAsErrors = $false
|
$treatWarningsAsErrors = $false
|
||||||
$workingName = if ($workingName) {$workingName} else {"Working"}
|
$workingName = if ($workingName) {$workingName} else {"Working"}
|
||||||
$netCliChannel = "2.0"
|
$netCliChannel = "2.0"
|
||||||
$netCliVersion = "2.1.500"
|
$netCliVersion = "2.2.105"
|
||||||
$nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
|
$nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
|
||||||
|
|
||||||
$baseDir = resolve-path ..
|
$baseDir = resolve-path ..
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
$nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion"
|
$nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion"
|
||||||
|
|
||||||
$builds = @(
|
$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.3"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.1"; Enabled=$true},
|
||||||
@{Framework = "netstandard1.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.0"; Enabled=$true},
|
@{Framework = "netstandard1.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.0"; Enabled=$true},
|
||||||
@{Framework = "net45"; TestsFunction = "NUnitTests"; TestFramework = "net46"; NUnitFramework="net-4.0"; Enabled=$true},
|
@{Framework = "net45"; TestsFunction = "NUnitTests"; TestFramework = "net46"; NUnitFramework="net-4.0"; Enabled=$true},
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
|
<TargetFrameworks>net46;netcoreapp2.2</TargetFrameworks>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<RootNamespace>Newtonsoft.Json.TestConsole</RootNamespace>
|
<RootNamespace>Newtonsoft.Json.TestConsole</RootNamespace>
|
||||||
<AssemblyName>Newtonsoft.Json.TestConsole</AssemblyName>
|
<AssemblyName>Newtonsoft.Json.TestConsole</AssemblyName>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks Condition="'$(TestFrameworks)'==''">net46;net451;net452;net40;net35;net20;netcoreapp2.1;netcoreapp1.1;netcoreapp1.0</TargetFrameworks>
|
<TargetFrameworks Condition="'$(TestFrameworks)'==''">net46;net451;net452;net40;net35;net20;netcoreapp2.2;netcoreapp1.1;netcoreapp1.0</TargetFrameworks>
|
||||||
<TargetFrameworks Condition="'$(TestFrameworks)'!=''">$(TestFrameworks)</TargetFrameworks>
|
<TargetFrameworks Condition="'$(TestFrameworks)'!=''">$(TestFrameworks)</TargetFrameworks>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<VersionPrefix>1.0</VersionPrefix>
|
<VersionPrefix>1.0</VersionPrefix>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
<!-- Workaround for https://github.com/nunit/nunit3-vs-adapter/issues/296 -->
|
<!-- Workaround for https://github.com/nunit/nunit3-vs-adapter/issues/296 -->
|
||||||
<DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'netcoreapp1.1' AND '$(TargetFramework)' != 'netcoreapp2.1'">Full</DebugType>
|
<DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'netcoreapp1.1' AND '$(TargetFramework)' != 'netcoreapp2.2'">Full</DebugType>
|
||||||
<!-- Disabled because SourceLink isn't referenced to calculate paths -->
|
<!-- Disabled because SourceLink isn't referenced to calculate paths -->
|
||||||
<DeterministicSourcePaths>false</DeterministicSourcePaths>
|
<DeterministicSourcePaths>false</DeterministicSourcePaths>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
<DefineConstants>NET20;$(AdditionalConstants)</DefineConstants>
|
<DefineConstants>NET20;$(AdditionalConstants)</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
|
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
|
||||||
<PackageReference Include="BenchmarkDotNet" Version="0.10.10" />
|
<PackageReference Include="BenchmarkDotNet" Version="0.10.10" />
|
||||||
<PackageReference Include="FSharp.Core" Version="4.2.3" />
|
<PackageReference Include="FSharp.Core" Version="4.2.3" />
|
||||||
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
|
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
|
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
|
||||||
<AssemblyTitle>Json.NET Tests .NET Standard 2.0</AssemblyTitle>
|
<AssemblyTitle>Json.NET Tests .NET Standard 2.0</AssemblyTitle>
|
||||||
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
|
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
|
||||||
<DefineConstants>NETSTANDARD2_0;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;$(AdditionalConstants)</DefineConstants>
|
<DefineConstants>NETSTANDARD2_0;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;$(AdditionalConstants)</DefineConstants>
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "2.1.500"
|
"version": "2.2.105"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,10 @@ pool:
|
|||||||
vmImage: 'VS2017-Win2016'
|
vmImage: 'VS2017-Win2016'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- powershell: |
|
||||||
|
dotnet --info
|
||||||
|
displayName: 'Dotnet installs'
|
||||||
|
|
||||||
- powershell: |
|
- powershell: |
|
||||||
$basePath = resolve-path .
|
$basePath = resolve-path .
|
||||||
$keyPath = "$basePath\key.snk"
|
$keyPath = "$basePath\key.snk"
|
||||||
|
|||||||
Reference in New Issue
Block a user