From ffe53eb3bfaa694581a49ece22f37165742973bf Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 9 Sep 2017 22:57:18 +1200
Subject: [PATCH] -NuGet packages updated

---
 .../Benchmarks/LargeJArrayBenchmarks.cs       |  2 +-
 .../DiscriminatedUnionConverterTests.cs       |  2 +-
 .../Newtonsoft.Json.Tests.csproj              | 55 +++++++++----------
 .../Serialization/FSharpTests.cs              |  2 +-
 .../TestObjects/GeometricForms/Shape.cs       |  2 +-
 .../TestObjects/Money/Currency.cs             |  2 +-
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/Src/Newtonsoft.Json.Tests/Benchmarks/LargeJArrayBenchmarks.cs b/Src/Newtonsoft.Json.Tests/Benchmarks/LargeJArrayBenchmarks.cs
index 8ed55418..2d365dbd 100644
--- a/Src/Newtonsoft.Json.Tests/Benchmarks/LargeJArrayBenchmarks.cs
+++ b/Src/Newtonsoft.Json.Tests/Benchmarks/LargeJArrayBenchmarks.cs
@@ -40,7 +40,7 @@ namespace Newtonsoft.Json.Tests.Benchmarks
     {
         private JArray _largeJArraySample;
 
-        [Setup]
+        [GlobalSetup]
         public void SetupData()
         {
             _largeJArraySample = new JArray();
diff --git a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs
index 54b09adc..1ff89384 100644
--- a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs
@@ -23,7 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if !(NET35 || NET20 || DNXCORE50)
+#if !(NET40 || NET35 || NET20 || DNXCORE50)
 using System.Diagnostics;
 using System.Reflection;
 using Microsoft.FSharp.Core;
diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
index 834d3a7d..487a5f40 100644
--- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
+++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
@@ -46,13 +46,13 @@
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net46'">
-    <PackageReference Include="NUnit" Version="3.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
-    <PackageReference Include="Autofac" Version="4.5.0" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.5" />
-    <PackageReference Include="FSharp.Core" Version="4.1.2" />    
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="Autofac" Version="4.6.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.9" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />    
     <PackageReference Include="System.Buffers" Version="4.3.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web" />
@@ -69,12 +69,12 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net451'">
-    <PackageReference Include="NUnit" Version="3.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
-    <PackageReference Include="Autofac" Version="4.5.0" />
-    <PackageReference Include="FSharp.Core" Version="4.1.2" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="Autofac" Version="4.6.1" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />
     <PackageReference Include="System.Buffers" Version="4.3.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web" />
@@ -91,12 +91,12 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net452'">
-    <PackageReference Include="NUnit" Version="3.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
-    <PackageReference Include="Autofac" Version="4.5.0" />
-    <PackageReference Include="FSharp.Core" Version="4.1.2" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="Autofac" Version="4.6.1" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />
     <PackageReference Include="System.Buffers" Version="4.3.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web" />
@@ -113,9 +113,8 @@
   </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.1.2" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web" />
@@ -131,8 +130,8 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net35'">
-    <PackageReference Include="NUnit" Version="3.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <Reference Include="System.Web" />
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.Data.Entity" />
@@ -146,8 +145,8 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net20'">
-    <PackageReference Include="NUnit" Version="3.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <Reference Include="System.Web" />
   </ItemGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net20'">
@@ -156,8 +155,8 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.5" />
-    <PackageReference Include="FSharp.Core" Version="4.1.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.9" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />
     <PackageReference Include="System.ObjectModel" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
@@ -166,7 +165,7 @@
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />    
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
   </ItemGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
     <AssemblyTitle>Json.NET Tests .NET Standard 1.3</AssemblyTitle>
@@ -175,7 +174,7 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
-    <PackageReference Include="FSharp.Core" Version="4.1.2" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />
     <PackageReference Include="System.ObjectModel" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
@@ -184,7 +183,7 @@
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
   </ItemGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
     <AssemblyTitle>Json.NET Tests .NET Standard 1.0</AssemblyTitle>
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs
index 0f500687..12c2225e 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/FSharpTests.cs
@@ -23,7 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if !(NET35 || NET20 || DNXCORE50)
+#if !(NET40 || NET35 || NET20 || DNXCORE50)
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/GeometricForms/Shape.cs b/Src/Newtonsoft.Json.Tests/TestObjects/GeometricForms/Shape.cs
index 82350e0e..671e2e25 100644
--- a/Src/Newtonsoft.Json.Tests/TestObjects/GeometricForms/Shape.cs
+++ b/Src/Newtonsoft.Json.Tests/TestObjects/GeometricForms/Shape.cs
@@ -23,7 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if !(NET35 || NET20 || DNXCORE50)
+#if !(NET40 || NET35 || NET20 || DNXCORE50)
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs b/Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs
index 3e2ad1a0..99ccbc4f 100644
--- a/Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs
+++ b/Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs
@@ -23,7 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if !(NET35 || NET20 || DNXCORE50)
+#if !(NET40 || NET35 || NET20 || DNXCORE50)
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;