From 120aee8039d7c62a1f9a895d9943ee7a7509423e Mon Sep 17 00:00:00 2001
From: Adam Hathcock <adam@hathcock.co.uk>
Date: Thu, 14 May 2020 13:09:17 +0100
Subject: [PATCH 1/2] See if windows reference is fixed

---
 .github/workflows/dotnetcore.yml                   | 2 +-
 src/SharpCompress/SharpCompress.csproj             | 8 ++++----
 tests/SharpCompress.Test/SharpCompress.Test.csproj | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index c1780ebe..52510f58 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -12,6 +12,6 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100
+        dotnet-version: 3.1.202
     - name: Run the Cake script
       uses: ecampidoglio/cake-action@master
diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj
index 9f6b8ef1..6948e99c 100644
--- a/src/SharpCompress/SharpCompress.csproj
+++ b/src/SharpCompress/SharpCompress.csproj
@@ -24,11 +24,11 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.1' ">
     <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net46' ">
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
+  </ItemGroup>
 </Project>
diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj
index db05739c..5de24b26 100644
--- a/tests/SharpCompress.Test/SharpCompress.Test.csproj
+++ b/tests/SharpCompress.Test/SharpCompress.Test.csproj
@@ -12,10 +12,10 @@
     <ProjectReference Include="..\..\src\SharpCompress\SharpCompress.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.8" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
   </ItemGroup>
 </Project>

From 4f824b1d9a3e1dc847ea4a79816b258f441b7d3c Mon Sep 17 00:00:00 2001
From: Adam Hathcock <adam@hathcock.co.uk>
Date: Thu, 14 May 2020 13:16:00 +0100
Subject: [PATCH 2/2] Add build flags for Core targets

---
 src/SharpCompress/Common/ArchiveEncoding.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SharpCompress/Common/ArchiveEncoding.cs b/src/SharpCompress/Common/ArchiveEncoding.cs
index 689f7b49..9973f504 100644
--- a/src/SharpCompress/Common/ArchiveEncoding.cs
+++ b/src/SharpCompress/Common/ArchiveEncoding.cs
@@ -32,10 +32,12 @@ namespace SharpCompress.Common
             Password = Encoding.GetEncoding(437);
         }
 
+#if NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1
         static ArchiveEncoding()
         {
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
+#endif
 
         public string Decode(byte[] bytes)
         {