From 725c44fafecddcf4f93dac34a38432ce401b1af0 Mon Sep 17 00:00:00 2001
From: Kim <kim@ssi.co.nz>
Date: Tue, 25 Aug 2020 00:55:24 +1200
Subject: [PATCH 1/3] Update to MSTest v2.1.2. Add netcoreapp2.1 as a target
 framework. Used for running against the latest Microsoft.NET.Test.Sdk. Add
 conditional version of Microsoft.NET.Test.Sdk v16.2.0 for netcoreapp2.0
 testing.

---
 Zstandard.Net.Tests/Zstandard.Net.Tests.csproj | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Zstandard.Net.Tests/Zstandard.Net.Tests.csproj b/Zstandard.Net.Tests/Zstandard.Net.Tests.csproj
index ea5fa0e..f19f4eb 100644
--- a/Zstandard.Net.Tests/Zstandard.Net.Tests.csproj
+++ b/Zstandard.Net.Tests/Zstandard.Net.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,10 +10,16 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+  <ItemGroup>  
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'net45'">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
   </ItemGroup>
 
   <ItemGroup>

From e1afb37cd53d7478dc22226617a95b8b9cede2c6 Mon Sep 17 00:00:00 2001
From: Kim <kim@ssi.co.nz>
Date: Tue, 25 Aug 2020 00:57:08 +1200
Subject: [PATCH 2/3] Update System.Buffers to 4.5.1

---
 Zstandard.Net/Zstandard.Net.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zstandard.Net/Zstandard.Net.csproj b/Zstandard.Net/Zstandard.Net.csproj
index fe97d1f..ee9217d 100644
--- a/Zstandard.Net/Zstandard.Net.csproj
+++ b/Zstandard.Net/Zstandard.Net.csproj
@@ -32,7 +32,7 @@
 	</ItemGroup>
   
 	<ItemGroup>
-	  <PackageReference Include="System.Buffers" Version="4.5.0" />
+	  <PackageReference Include="System.Buffers" Version="4.5.1" />
 	</ItemGroup>
 
 </Project>

From 1a7eb5bebd3971f88148b32e0fbe4452a3b2d0f6 Mon Sep 17 00:00:00 2001
From: Kim <kim@ssi.co.nz>
Date: Tue, 25 Aug 2020 01:13:55 +1200
Subject: [PATCH 3/3] Update BenchmarkDotNet to v0.12.1 Update
 DontForceGcCollectionsConfig with new method names.

---
 Zstandard.Net.Benchmark/DontForceGcCollectionsConfig.cs | 2 +-
 Zstandard.Net.Benchmark/Zstandard.Net.Benchmark.csproj  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zstandard.Net.Benchmark/DontForceGcCollectionsConfig.cs b/Zstandard.Net.Benchmark/DontForceGcCollectionsConfig.cs
index 7831150..61b47ed 100644
--- a/Zstandard.Net.Benchmark/DontForceGcCollectionsConfig.cs
+++ b/Zstandard.Net.Benchmark/DontForceGcCollectionsConfig.cs
@@ -8,7 +8,7 @@ public class DontForceGcCollectionsConfig : ManualConfig
         public DontForceGcCollectionsConfig()
         {
             // tell BenchmarkDotNet not to force GC collections after every iteration
-            Add(Job.Default.With(new GcMode() { Force = false }));
+            AddJob(Job.Default.WithGcMode(new GcMode() { Force = false }));
         }
     }
 }
diff --git a/Zstandard.Net.Benchmark/Zstandard.Net.Benchmark.csproj b/Zstandard.Net.Benchmark/Zstandard.Net.Benchmark.csproj
index 7c9cb2e..c578f87 100644
--- a/Zstandard.Net.Benchmark/Zstandard.Net.Benchmark.csproj
+++ b/Zstandard.Net.Benchmark/Zstandard.Net.Benchmark.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
   </ItemGroup>
 
   <ItemGroup>