From f044a6c74b8eb6b00ad13822d07e9cec5279700f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Luthi?= <cedric.luthi@gmail.com>
Date: Sat, 6 Feb 2021 08:06:08 +0100
Subject: [PATCH] PR #549: Add .NET Standard 2.1 target framework

Also fix the .NET Standard 2.0 target framework moniker: netstandard2.0 instead of netstandard2, see https://docs.microsoft.com/en-us/dotnet/standard/frameworks#supported-target-frameworks
---
 .github/workflows/on-push.yml                            | 3 +--
 .github/workflows/pull-request.yml                       | 9 +++++----
 .travis.yml                                              | 4 ++--
 .../ICSharpCode.SharpZipLib.csproj                       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 14b49d357..1ef2bafad 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         configuration: [debug, release]
         os: [ubuntu, windows, macos]
-        libtarget: [netstandard2]
+        libtarget: [netstandard2.0, netstandard2.1]
         testtarget: [netcoreapp3.1]
         include:
           - configuration: debug
@@ -31,7 +31,6 @@ jobs:
     - uses: actions/checkout@v2
       
     - name: Setup .NET Core
-      if: matrix.libtarget == 'netstandard2'
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 72f6556d2..497152fc4 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         configuration: [debug, release]
         os: [ubuntu, windows, macos]
-        target: [netstandard2]
+        target: [netstandard2.0, netstandard2.1]
         include:
           - configuration: Debug
             os: windows
@@ -24,7 +24,6 @@ jobs:
     - uses: actions/checkout@v2
       
     - name: Setup .NET Core
-      if: matrix.target == 'netstandard2'
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
@@ -78,8 +77,10 @@ jobs:
       with:
         dotnet-version: '3.1.x'
         
-    - name: Build library for .NET Standard 2
-      run: dotnet build -c Release -f netstandard2 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+    - name: Build library for .NET Standard 2.0
+      run: dotnet build -c Release -f netstandard2.0 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+    - name: Build library for .NET Standard 2.1
+      run: dotnet build -c Release -f netstandard2.1 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
     - name: Build library for .NET Framework 4.5
       run: dotnet build -c Release -f net45 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
 
diff --git a/.travis.yml b/.travis.yml
index 9b54b3f9d..1e76533f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,14 @@ install:
 # - nuget restore ICSharpCode.SharpZipLib.sln
 # - nuget install NUnit.Console -Version 3.8.0 -OutputDirectory _testRunner
 script:
-  - dotnet build -f netstandard2 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+  - dotnet build -f netstandard2.0 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
   - dotnet run -c Debug -f netcoreapp2 -p test/ICSharpCode.SharpZipLib.TestBootstrapper/ICSharpCode.SharpZipLib.TestBootstrapper.csproj -- --where "class !~ WindowsNameTransformHandling & test !~ ZipEntryFactoryHandling.CreatedValues & test !~ ZipNameTransformHandling.FilenameCleaning" --result=docs/nunit3-test-results-debug.xml
   - dotnet run -c Release -f netcoreapp2 -p test/ICSharpCode.SharpZipLib.TestBootstrapper/ICSharpCode.SharpZipLib.TestBootstrapper.csproj -- --where "class !~ WindowsNameTransformHandling & test !~ ZipEntryFactoryHandling.CreatedValues & test !~ ZipNameTransformHandling.FilenameCleaning" --result=docs\nunit3-test-results-release.xml
 #  - dotnet test test/ICSharpCode.SharpZipLib.Tests/ICSharpCode.SharpZipLib.Tests.csproj
 #  - xbuild /p:Configuration=Release ICSharpCode.SharpZipLib.sln
 #  - mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe --framework=mono-4.0 --labels=All --result=./Documentation/nunit3-test-results-travis.xml ./bin/Release/ICSharpCode.SharpZipLib.Tests.dll
 after_script:
-  - dotnet pack -f netstandard2 -o _dist/ src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+  - dotnet pack -f netstandard2.0 -o _dist/ src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
 #cache:
 #  directories:
 #    - bin
diff --git a/src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj b/src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
index 03dcc861d..6248b6287 100644
--- a/src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+++ b/src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net45</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>../../assets/ICSharpCode.SharpZipLib.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>