Add .NET 7 and remove .NET Core 3.1

Author: bording

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
       - name: Build
         run: dotnet build LibGit2Sharp.sln --configuration Release
       - name: Upload packages
@@ -36,8 +36,8 @@ jobs:
     strategy:
       matrix:
         arch: [ amd64 ]
-        os: [windows-2019, macos-10.15]
-        tfm: [ net472, netcoreapp3.1, net6.0 ]
+        os: [ windows-2019, macos-10.15 ]
+        tfm: [ net472, net6.0, net7.0 ]
         exclude:
           - os: macos-10.15
             tfm: net472
@@ -50,12 +50,9 @@ jobs:
       - name: Install .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 6.0.x
-      - name: Install .NET Core 3.1 runtime
-        if: matrix.tfm == 'netcoreapp3.1'
-        uses: actions/[email protected]
-        with:
-          dotnet-version: 3.1.x
+          dotnet-version: |
+            7.0.x
+            6.0.x
       - name: Run ${{ matrix.tfm }} tests
         run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
   test-linux:
@@ -66,7 +63,7 @@ jobs:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
-        sdk:  [ '6.0', '3.1' ]
+        sdk:  [ '6.0', '7.0' ]
         exclude:
           - arch: arm64
             distro: alpine.3.12
@@ -81,8 +78,8 @@ jobs:
         include:
           - sdk: '6.0'
             tfm: net6.0
-          - sdk: '3.1'
-            tfm: netcoreapp3.1
+          - sdk: '7.0'
+            tfm: net7.0
       fail-fast: false
     steps:
       - name: Checkout

LibGit2Sharp.Tests/BlobFixture.cs

@@ -45,7 +45,7 @@ public void CanGetBlobAsFilteredText(string autocrlf, string expectedText)
             }
         }
 
-#if NETFRAMEWORK || NETCOREAPP3_1 //UTF-7 is disabled in .NET 5+
+#if NETFRAMEWORK //UTF-7 is disabled in .NET 5+
         [Theory]
         [InlineData("ascii", 4, "31 32 33 34")]
         [InlineData("utf-7", 4, "31 32 33 34")]
@@ -239,11 +239,11 @@ public void CanTellIfABlobIsMissing()
             // Manually delete the objects directory to simulate a partial clone
             Directory.Delete(Path.Combine(repoPath, "objects", "a8"), true);
 
-            using (var repo = new Repository(repoPath)) 
+            using (var repo = new Repository(repoPath))
             {
                 // Look up for the tree that reference the blob which is now missing
                 var tree = repo.Lookup<Tree>("fd093bff70906175335656e6ce6ae05783708765");
-                var blob = (Blob) tree["README"].Target;
+                var blob = (Blob)tree["README"].Target;
 
                 Assert.Equal("a8233120f6ad708f843d861ce2b7228ec4e3dec6", blob.Sha);
                 Assert.NotNull(blob);

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .NET</Description>
     <Company>LibGit2Sharp contributors</Company>