From 93b0249db9370b4badfe82429ddf0c78c11ce672 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 16 Feb 2017 21:27:08 +1300
Subject: [PATCH] -Build

---
 Src/Newtonsoft.Json.Tests/JsonConvertTest.cs        |  6 +-----
 .../Newtonsoft.Json.Tests.Roslyn.csproj             | 13 +++++++++----
 .../Schema/JsonSchemaSpecTests.cs                   |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
index 06e5fe8a..be188bee 100644
--- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
+++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
@@ -949,11 +949,7 @@ namespace Newtonsoft.Json.Tests
             if (timeZoneHandling == DateTimeZoneHandling.RoundtripKind)
             {
                 T parsed = JsonConvert.DeserializeObject<T>(date);
-                try
-                {
-                    Assert.AreEqual(value, parsed);
-                }
-                catch (Exception)
+                if (!value.Equals(parsed))
                 {
                     long valueTicks = GetTicks(value);
                     long parsedTicks = GetTicks(parsed);
diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj
index 02c8bfa0..e73f10ec 100644
--- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj
+++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Target Name="WorkAroundPackageAndProjectReferenceConflict" BeforeTargets="ResolveLockFileReferences">
     <ItemGroup>
+      <!-- Required for https://github.com/dotnet/roslyn-project-system/issues/1386 -->
       <ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)" Condition="'%(ResolvedCompileFileDefinitions.Filename)' == 'Newtonsoft.Json'" />
     </ItemGroup>
   </Target>  
   <PropertyGroup>
     <TargetFrameworks Condition="'$(DotnetOnly)'==''">net45;net40;net35;net20;netcoreapp1.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotnetOnly)'=='true'">netcoreapp1.0</TargetFrameworks>
-    <!--<TargetFrameworks>net45;net40;net35;net20;netcoreapp1.0</TargetFrameworks>-->
     <VersionPrefix>10.0.1</VersionPrefix>
     <Authors>James Newton-King</Authors>
     <NeutralLanguage>en-US</NeutralLanguage>
@@ -38,11 +38,9 @@
     </None>
     <ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Roslyn.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp1.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
     <PackageReference Include="NUnit" Version="3.6.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
     <PackageReference Include="Autofac" Version="4.0.0-rc2-240" />
     <PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" />    
     <PackageReference Include="System.Buffers" Version="4.0.0" />
@@ -59,6 +57,8 @@
     <DefineConstants>NET45;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
+    <PackageReference Include="NUnit" Version="3.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
     <PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web" />
@@ -72,6 +72,8 @@
     <DefineConstants>NET40;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net35'">
+    <PackageReference Include="NUnit" Version="3.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
     <Reference Include="System.Web" />
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.Data.Entity" />
@@ -83,6 +85,8 @@
     <DefineConstants>NET35;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net20'">
+    <PackageReference Include="NUnit" Version="3.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
     <Reference Include="System.Web" />
   </ItemGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net20'">
@@ -99,6 +103,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
   </ItemGroup>
   <ItemGroup>
+    <!-- Tracking for removal https://github.com/Microsoft/vstest/issues/472 -->
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs
index 8aafa1f7..69c31e8d 100644
--- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaSpecTests.cs
@@ -72,7 +72,7 @@ namespace Newtonsoft.Json.Tests.Schema
             Assert.AreEqual(jsonSchemaSpecTest.IsValid, v, jsonSchemaSpecTest.TestCaseDescription + " - " + jsonSchemaSpecTest.TestDescription + " - errors: " + string.Join(", ", errorMessages));
         }
 
-        public IList<JsonSchemaSpecTest> GetSpecTestDetails()
+        public static IList<JsonSchemaSpecTest> GetSpecTestDetails()
         {
             IList<JsonSchemaSpecTest> specTests = new List<JsonSchemaSpecTest>();