-Updated NuGet packages

-Changed .NET Core test project to 1.1
This commit is contained in:
James Newton-King
2017-04-02 12:53:59 +12:00
parent aa5f28c097
commit f001339ae2
24 changed files with 112 additions and 48 deletions
+1 -1
View File
@@ -270,7 +270,7 @@ function NetCliTests($build)
Write-Host -ForegroundColor Green "Ensuring test project builds for $name" Write-Host -ForegroundColor Green "Ensuring test project builds for $name"
Write-Host Write-Host
exec { dotnet test $projectPath -f netcoreapp1.0 -c Release -l trx | Out-Default } exec { dotnet test $projectPath -f netcoreapp1.1 -c Release -l trx | Out-Default }
copy-item -Path "$location\TestResults\*.trx" -Destination $workingDir copy-item -Path "$location\TestResults\*.trx" -Destination $workingDir
} }
finally finally
+1 -1
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.26228.4 VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B520C700-7D45-4D82-BFB5-218FA68CF5CF}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B520C700-7D45-4D82-BFB5-218FA68CF5CF}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
namespace Newtonsoft.Json.Tests.Benchmarks namespace Newtonsoft.Json.Tests.Benchmarks
{ {
public static class BenchmarkConstants public static class BenchmarkConstants
@@ -77,3 +79,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
@"{""strings"":[null,""Markus egger ]><[, (2nd)"",null],""dictionary"":{""Val & asd1"":1,""Val2 & asd1"":3,""Val3 & asd1"":4},""Name"":""Rick"",""Now"":""2012-02-25T19:55:50.6095676+13:00"",""BigNumber"":34123123123.121,""Address1"":{""Street"":""fff Street"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""},""Addresses"":[{""Street"":""\u001farray<address"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""},{""Street"":""array 2 address"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""}]}"; @"{""strings"":[null,""Markus egger ]><[, (2nd)"",null],""dictionary"":{""Val & asd1"":1,""Val2 & asd1"":3,""Val3 & asd1"":4},""Name"":""Rick"",""Now"":""2012-02-25T19:55:50.6095676+13:00"",""BigNumber"":34123123123.121,""Address1"":{""Street"":""fff Street"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""},""Addresses"":[{""Street"":""\u001farray<address"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""},{""Street"":""array 2 address"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""}]}";
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -78,3 +80,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,16 +23,20 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
#if (!DNXCORE50)
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Web.Script.Serialization;
#endif
using System.Runtime.Serialization.Json; using System.Runtime.Serialization.Json;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web.Script.Serialization;
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using Newtonsoft.Json.Bson; using Newtonsoft.Json.Bson;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -67,6 +71,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return (T)dataContractSerializer.ReadObject(ms); return (T)dataContractSerializer.ReadObject(ms);
} }
#if (!DNXCORE50)
[Benchmark] [Benchmark]
public TestClass BinaryFormatter() public TestClass BinaryFormatter()
{ {
@@ -91,6 +96,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return ser.Deserialize<T>(json); return ser.Deserialize<T>(json);
} }
#endif
[Benchmark] [Benchmark]
public TestClass DataContractJsonSerializer() public TestClass DataContractJsonSerializer()
@@ -116,7 +122,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return DeserializeJsonNetManual(BenchmarkConstants.JsonText); return DeserializeJsonNetManual(BenchmarkConstants.JsonText);
} }
#region DeserializeJsonNetManual #region DeserializeJsonNetManual
private TestClass DeserializeJsonNetManual(string json) private TestClass DeserializeJsonNetManual(string json)
{ {
TestClass c = new TestClass(); TestClass c = new TestClass();
@@ -204,7 +210,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
return a; return a;
} }
#endregion #endregion
[Benchmark] [Benchmark]
public Task<TestClass> JsonNetManualAsync() public Task<TestClass> JsonNetManualAsync()
@@ -321,3 +327,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
#pragma warning restore 618 #pragma warning restore 618
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -95,3 +97,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -62,3 +64,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Xml; using System.Xml;
@@ -66,3 +68,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System.IO; using System.IO;
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Running; using BenchmarkDotNet.Running;
@@ -45,3 +47,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -72,3 +74,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
@@ -87,3 +89,5 @@ If attributes are not mentioned, default values are used in each case.
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -44,11 +46,16 @@ namespace Newtonsoft.Json.Tests.Benchmarks
[TestFixture] [TestFixture]
public class Runner : TestFixtureBase public class Runner : TestFixtureBase
{ {
[Test] #if DNXCORE50
[Test(Skip = "Don't run with other unit tests")]
#else
[Ignore("Don't run with other unit tests")] [Ignore("Don't run with other unit tests")]
#endif
public void RunBenchmarks() public void RunBenchmarks()
{ {
new BenchmarkSwitcher(typeof(Runner).GetTypeInfo().Assembly).Run(new []{ "*" }); new BenchmarkSwitcher(typeof(Runner).GetTypeInfo().Assembly).Run(new []{ "*" });
} }
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -60,3 +62,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -23,16 +23,20 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
#if (!DNXCORE50)
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Web.Script.Serialization;
#endif
using System.Runtime.Serialization.Json; using System.Runtime.Serialization.Json;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web.Script.Serialization;
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using Newtonsoft.Json.Bson; using Newtonsoft.Json.Bson;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -91,6 +95,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
#if (!DNXCORE50)
[Benchmark] [Benchmark]
public byte[] BinaryFormatter() public byte[] BinaryFormatter()
{ {
@@ -118,6 +123,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return ser.Serialize(value); return ser.Serialize(value);
} }
#endif
[Benchmark] [Benchmark]
public string DataContractJsonSerializer() public string DataContractJsonSerializer()
@@ -152,7 +158,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return SerializeJsonNetLinq(TestClass); return SerializeJsonNetLinq(TestClass);
} }
#region SerializeJsonNetManual #region SerializeJsonNetManual
private string SerializeJsonNetLinq(TestClass c) private string SerializeJsonNetLinq(TestClass c)
{ {
JObject o = new JObject( JObject o = new JObject(
@@ -174,7 +180,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return o.ToString(Formatting.None); return o.ToString(Formatting.None);
} }
#endregion #endregion
[Benchmark] [Benchmark]
public string JsonNetManual() public string JsonNetManual()
@@ -182,7 +188,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
return SerializeJsonNetManual(TestClass); return SerializeJsonNetManual(TestClass);
} }
#region SerializeJsonNetManual #region SerializeJsonNetManual
private string SerializeJsonNetManual(TestClass c) private string SerializeJsonNetManual(TestClass c)
{ {
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
@@ -237,7 +243,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
writer.Flush(); writer.Flush();
return sw.ToString(); return sw.ToString();
} }
#endregion #endregion
[Benchmark] [Benchmark]
public Task<string> JsonNetManualAsync() public Task<string> JsonNetManualAsync()
@@ -329,3 +335,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
#pragma warning restore 618 #pragma warning restore 618
} }
} }
#endif
@@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -63,3 +65,5 @@ namespace Newtonsoft.Json.Tests.Benchmarks
} }
} }
} }
#endif
@@ -1,6 +1,6 @@
{ {
"dependencies": { "dependencies": {
"NUnit": "2.6.2" "NUnit": "3.6.0"
}, },
"frameworks": { "frameworks": {
"net20": {} "net20": {}
@@ -1,6 +1,6 @@
{ {
"dependencies": { "dependencies": {
"NUnit": "2.6.2" "NUnit": "3.6.0"
}, },
"frameworks": { "frameworks": {
"net35": {} "net35": {}
@@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"NUnit": "2.6.2", "NUnit": "3.6.0",
"FSharp.Core": "4.0.0.1", "FSharp.Core": "4.1.2",
"System.ValueTuple": "4.3.0" "System.ValueTuple": "4.3.0"
}, },
"frameworks": { "frameworks": {
@@ -1,8 +1,8 @@
{ {
"dependencies": { "dependencies": {
"FSharp.Core": "4.0.0.1", "FSharp.Core": "4.1.2",
"NUnit": "2.6.2", "NUnit": "3.6.0",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.3.1",
"System.ValueTuple": "4.3.0" "System.ValueTuple": "4.3.0"
}, },
"frameworks": { "frameworks": {
@@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"FSharp.Core": "4.0.0.1", "FSharp.Core": "4.1.2",
"NUnit": "2.6.2" "NUnit": "3.6.0"
}, },
"frameworks": { "frameworks": {
"net40": {} "net40": {}
@@ -6,8 +6,9 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<PropertyGroup> <PropertyGroup>
<TargetFrameworks Condition="'$(DotnetOnly)'==''">net45;net40;net35;net20;netcoreapp1.0</TargetFrameworks> <TargetFrameworks Condition="'$(DotnetOnly)'==''">net45;net40;net35;net20;netcoreapp1.1</TargetFrameworks>
<TargetFrameworks Condition="'$(DotnetOnly)'=='true'">netcoreapp1.0</TargetFrameworks> <TargetFrameworks Condition="'$(DotnetOnly)'=='true'">netcoreapp1.1</TargetFrameworks>
<!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
<VersionPrefix>10.0.1</VersionPrefix> <VersionPrefix>10.0.1</VersionPrefix>
<Authors>James Newton-King</Authors> <Authors>James Newton-King</Authors>
<NeutralLanguage>en-US</NeutralLanguage> <NeutralLanguage>en-US</NeutralLanguage>
@@ -15,11 +16,10 @@
<AssemblyName>Newtonsoft.Json.Tests</AssemblyName> <AssemblyName>Newtonsoft.Json.Tests</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<!-- 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'">Full</DebugType> <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.1'">Full</DebugType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="**\*.orig" /> <None Remove="**\*.orig" />
<Compile Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'net45'" Remove="Benchmarks\**" />
<None Include="large.json"> <None Include="large.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
@@ -43,9 +43,9 @@
<ItemGroup Condition="'$(TargetFramework)'=='net45'"> <ItemGroup Condition="'$(TargetFramework)'=='net45'">
<PackageReference Include="NUnit" Version="3.6.0" /> <PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
<PackageReference Include="Autofac" Version="4.0.0-rc2-240" /> <PackageReference Include="Autofac" Version="4.4.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.10.2" /> <PackageReference Include="BenchmarkDotNet" Version="0.10.2" />
<PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" /> <PackageReference Include="FSharp.Core" Version="4.1.2" />
<PackageReference Include="System.Buffers" Version="4.0.0" /> <PackageReference Include="System.Buffers" Version="4.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" /> <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" /> <PackageReference Include="System.ValueTuple" Version="4.3.0" />
@@ -63,7 +63,7 @@
<ItemGroup Condition="'$(TargetFramework)'=='net40'"> <ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="NUnit" Version="3.6.0" /> <PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
<PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" /> <PackageReference Include="FSharp.Core" Version="4.1.2" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" /> <PackageReference Include="System.ValueTuple" Version="4.3.0" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
@@ -97,8 +97,9 @@
<PropertyGroup Condition="'$(TargetFramework)'=='net20'"> <PropertyGroup Condition="'$(TargetFramework)'=='net20'">
<DefineConstants>NET20;$(AdditionalConstants)</DefineConstants> <DefineConstants>NET20;$(AdditionalConstants)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'"> <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
<PackageReference Include="FSharp.Core" Version="4.1.0" /> <PackageReference Include="BenchmarkDotNet" Version="0.10.2" />
<PackageReference Include="FSharp.Core" Version="4.1.2" />
<PackageReference Include="System.ObjectModel" Version="4.3.0" /> <PackageReference Include="System.ObjectModel" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" /> <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
@@ -114,7 +115,7 @@
<!-- Tracking for removal https://github.com/Microsoft/vstest/issues/472 --> <!-- Tracking for removal https://github.com/Microsoft/vstest/issues/472 -->
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'"> <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
<DefineConstants>NETSTANDARD1_1;DNXCORE50;PORTABLE;$(AdditionalConstants)</DefineConstants> <DefineConstants>NETSTANDARD1_3;DNXCORE50;PORTABLE;$(AdditionalConstants)</DefineConstants>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
@@ -1,11 +1,11 @@
{ {
"dependencies": { "dependencies": {
"Autofac": "4.0.0-rc2-240", "Autofac": "4.4.0",
"BenchmarkDotNet": "0.10.2", "BenchmarkDotNet": "0.10.2",
"FSharp.Core": "4.0.0.1", "FSharp.Core": "4.1.2",
"NUnit": "2.6.2", "NUnit": "3.6.0",
"System.Buffers": "4.0.0", "System.Buffers": "4.0.0",
"System.Collections.Immutable": "1.1.37", "System.Collections.Immutable": "1.3.1",
"System.ValueTuple": "4.3.0" "System.ValueTuple": "4.3.0"
}, },
"frameworks": { "frameworks": {
@@ -29,7 +29,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(NET20 || DNXCORE50) #if !(NET20)
[Serializable] [Serializable]
[DataContract] [DataContract]
public class Address public class Address
@@ -29,7 +29,7 @@ using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.TestObjects namespace Newtonsoft.Json.Tests.TestObjects
{ {
#if !(NET20 || DNXCORE50) #if !(NET20)
[Serializable] [Serializable]
[DataContract] [DataContract]
public class TestClass public class TestClass