From 7f6c877fdcc7626f1792f3d8fdc37ea1ebd5ccf9 Mon Sep 17 00:00:00 2001
From: Jeremy Pritts <jrpritts7@gmail.com>
Date: Wed, 30 Mar 2022 21:24:51 -0400
Subject: [PATCH 1/4] add a net 6 target and make trimmable

---
 global.json                            | 2 +-
 src/SharpCompress/SharpCompress.csproj | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/global.json b/global.json
index db3bce96..a3bb3f5e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.300",
+    "version": "6.0.200",
     "rollForward": "latestFeature"
   }
 }
\ No newline at end of file
diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj
index c40cec46..d742ba29 100644
--- a/src/SharpCompress/SharpCompress.csproj
+++ b/src/SharpCompress/SharpCompress.csproj
@@ -6,7 +6,7 @@
     <AssemblyVersion>0.31.0</AssemblyVersion>
     <FileVersion>0.31.0</FileVersion>
     <Authors>Adam Hathcock</Authors>
-    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <AssemblyName>SharpCompress</AssemblyName>
@@ -19,12 +19,13 @@
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>SharpCompress is a compression library for NET Standard 2.0/2.1/NET 5.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</Description>
-    <LangVersion>9</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>

From ed3c11f44cf1e27628760367185ca06e6b3680d9 Mon Sep 17 00:00:00 2001
From: Jeremy Pritts <jrpritts7@gmail.com>
Date: Thu, 31 Mar 2022 04:04:56 -0400
Subject: [PATCH 2/4] update workflow and csproj files

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

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index cc01a875..46d23e12 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 6.0.x
     - run: dotnet run -p build/build.csproj
     - uses: actions/upload-artifact@v2
       with:
diff --git a/build/build.csproj b/build/build.csproj
index 5cd0ceaf..d951d8c2 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net5.0;net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj
index de801011..a29b6d4a 100644
--- a/tests/SharpCompress.Test/SharpCompress.Test.csproj
+++ b/tests/SharpCompress.Test/SharpCompress.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net461</TargetFrameworks>
     <AssemblyName>SharpCompress.Test</AssemblyName>
     <AssemblyOriginatorKeyFile>../../SharpCompress.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

From 196df63de28b29e859213e60d643ee5d1932c74d Mon Sep 17 00:00:00 2001
From: Jeremy Pritts <jrpritts7@gmail.com>
Date: Thu, 31 Mar 2022 14:52:36 -0400
Subject: [PATCH 3/4] fix build project

---
 build/Program.cs   | 2 +-
 build/build.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Program.cs b/build/Program.cs
index 307b6d7f..e0a972e2 100644
--- a/build/Program.cs
+++ b/build/Program.cs
@@ -52,7 +52,7 @@ class Program
                    Run("dotnet", "build src/SharpCompress/SharpCompress.csproj -c Release");
                });
 
-        Target(Test, DependsOn(Build), ForEach("net5.0", "net461"),
+        Target(Test, DependsOn(Build), ForEach("net5.0", "net6.0", "net461"),
                framework =>
                {
                    IEnumerable<string> GetFiles(string d)
diff --git a/build/build.csproj b/build/build.csproj
index d951d8c2..8326a3aa 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0;net6.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From eb44cdc903bbdf783b99c8d6b39ead3f43a1c189 Mon Sep 17 00:00:00 2001
From: ds5678 <jrpritts7@gmail.com>
Date: Fri, 8 Apr 2022 02:21:07 -0400
Subject: [PATCH 4/4] Update dotnetcore.yml

---
 .github/workflows/dotnetcore.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 46d23e12..e3eaa142 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -12,7 +12,9 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          5.0.x
+          6.0.x
     - run: dotnet run -p build/build.csproj
     - uses: actions/upload-artifact@v2
       with: