.github/workflows/ci.yml

@@ -15,43 +15,58 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.2
         with:
           fetch-depth: 0
       - name: Install .NET SDK
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v4.0.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Build
         run: dotnet build LibGit2Sharp.sln --configuration Release
       - name: Upload packages
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: NuGet packages
-          path: bin/Packages/
+          path: artifacts/package/
           retention-days: 7
+      - name: Verify trimming compatibility
+        run: dotnet publish TrimmingTestApp
   test:
     name: Test / ${{ matrix.os }} / ${{ matrix.arch }} / ${{ matrix.tfm }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        arch: [ amd64 ]
-        os: [ windows-2019, macos-11 ]
-        tfm: [ net472, net6.0, net7.0 ]
+        arch: [ x64 ]
+        os: [ windows-2019, windows-2022, macos-11, macos-12, macos-13 ]
+        tfm: [ net472, net6.0, net8.0 ]
         exclude:
           - os: macos-11
             tfm: net472
+          - os: macos-11
+            tfm: net8.0
+          - os: macos-12
+            tfm: net472
+          - os: macos-13
+            tfm: net472
+        include:
+          - arch: arm64
+            os: macos-14
+            tfm: net6.0
+          - arch: arm64
+            os: macos-14
+            tfm: net8.0
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.2
         with:
           fetch-depth: 0
       - name: Install .NET SDK
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: |
-            7.0.x
+            8.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
@@ -62,22 +77,32 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
-        distro: [ alpine.3.13, alpine.3.14, alpine.3.15, alpine.3.16, alpine.3.17, centos.stream.8, debian.10, debian.11, fedora.36, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
-        sdk:  [ '6.0', '7.0' ]
+        distro: [ alpine.3.13, alpine.3.14, alpine.3.15, alpine.3.16, alpine.3.17, alpine.3.18, centos.stream.8, debian.10, debian.11, fedora.36, fedora.37, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
+        sdk:  [ '6.0', '8.0' ]
         exclude:
           - distro: alpine.3.13
-            sdk: '7.0'
+            sdk: '8.0'
           - distro: alpine.3.14
-            sdk: '7.0'
+            sdk: '8.0'
+          - distro: alpine.3.15
+            sdk: '8.0'
+          - distro: alpine.3.16
+            sdk: '8.0'
+          - distro: debian.10
+            sdk: '8.0'
+          - distro: fedora.36
+            sdk: '8.0'
+          - distro: ubuntu.18.04
+            sdk: '8.0'
         include:
           - sdk: '6.0'
             tfm: net6.0
-          - sdk: '7.0'
-            tfm: net7.0
+          - sdk: '8.0'
+            tfm: net8.0
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v4.1.2
         with:
           fetch-depth: 0
       - name: Setup QEMU

.gitignore

@@ -38,5 +38,5 @@ _ReSharper*/
 *.DotSettings
 
 _NCrunch_LibGit2Sharp/
-packages/
+artifacts/
 worktree.playlist

CHANGES.md

@@ -1,5 +1,12 @@
 # LibGit2Sharp Changes
 
+## v0.30 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.29.0..0.30.0))
+
+### Changes
+- This release includes [libgit2 v1.7.2](https://github.com/libgit2/libgit2/releases/tag/v1.7.2).
+- Updates for trimming compatibility [#2084](https://github.com/libgit2/libgit2sharp/pull/2084)
+- Updates for .NET 8 [#2085](https://github.com/libgit2/libgit2sharp/pull/2085)
+
 ## v0.29 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.28.0..0.29.0))
 
 ### Changes
@@ -8,7 +15,7 @@
 
 ### Additions
 - Add proxy options [#2065](https://github.com/libgit2/libgit2sharp/pull/2065)
-  - See PR for details, including some  breaking changes to `CloneOptions` and `SubmoduleUpdateOptions`
+  - See PR for details, including some breaking changes to `CloneOptions` and `SubmoduleUpdateOptions`
 
 ## v0.28 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.27.2..0.28.0))
 

Directory.Build.props

@@ -1,10 +1,9 @@
 <Project>
 
   <PropertyGroup>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)bin\Packages\</PackageOutputPath>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
     <DefineConstants Condition=" '$(ExtraDefine)' != '' ">$(DefineConstants);$(ExtraDefine)</DefineConstants>
   </PropertyGroup>
 

LibGit2Sharp.Tests/BranchFixture.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
-using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -103,7 +102,7 @@ public void CanCreateAnUnbornBranch()
         public void CanCreateBranchUsingAbbreviatedSha()
         {
             string path = SandboxBareTestRepo();
-            using (var repo = new Repository(path, new RepositoryOptions{ Identity = Constants.Identity }))
+            using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
             {
                 EnableRefLog(repo);
 
@@ -1001,7 +1000,7 @@ public void OnlyOneBranchIsTheHead()
                         continue;
                     }
 
-                    Assert.True(false, string.Format("Both '{0}' and '{1}' appear to be Head.", head.CanonicalName, branch.CanonicalName));
+                    Assert.Fail(string.Format("Both '{0}' and '{1}' appear to be Head.", head.CanonicalName, branch.CanonicalName));
                 }
 
                 Assert.NotNull(head);

LibGit2Sharp.Tests/CloneFixture.cs

@@ -267,7 +267,7 @@ public void CanInspectCertificateOnClone(string url, string hostname, Type certT
                             Assert.True(valid);
                             var x509 = ((CertificateX509)cert).Certificate;
                             // we get a string with the different fields instead of a structure, so...
-                            Assert.Contains("CN=github.com,", x509.Subject);
+                            Assert.Contains("CN=github.com", x509.Subject);
                             checksHappy = true;
                             return false;
                         }

LibGit2Sharp.Tests/CommitFixture.cs

@@ -3,10 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using LibGit2Sharp.Core;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
-using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -150,10 +148,10 @@ public void CanEnumerateCommitsWithReverseTimeSorting()
             using (var repo = new Repository(path))
             {
                 foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter
-                                                                    {
-                                                                        IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
-                                                                        SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
-                                                                    }))
+                {
+                    IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
+                    SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
+                }))
                 {
                     Assert.NotNull(commit);
                     Assert.StartsWith(reversedShas[count], commit.Sha);
@@ -170,10 +168,10 @@ public void CanEnumerateCommitsWithReverseTopoSorting()
             using (var repo = new Repository(path))
             {
                 List<Commit> commits = repo.Commits.QueryBy(new CommitFilter
-                                                                {
-                                                                    IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
-                                                                    SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
-                                                                }).ToList();
+                {
+                    IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
+                    SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
+                }).ToList();
                 foreach (Commit commit in commits)
                 {
                     Assert.NotNull(commit);
@@ -216,10 +214,10 @@ public void CanEnumerateCommitsWithTimeSorting()
             using (var repo = new Repository(path))
             {
                 foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter
-                                                                    {
-                                                                        IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
-                                                                        SortBy = CommitSortStrategies.Time
-                                                                    }))
+                {
+                    IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
+                    SortBy = CommitSortStrategies.Time
+                }))
                 {
                     Assert.NotNull(commit);
                     Assert.StartsWith(expectedShas[count], commit.Sha);
@@ -236,10 +234,10 @@ public void CanEnumerateCommitsWithTopoSorting()
             using (var repo = new Repository(path))
             {
                 List<Commit> commits = repo.Commits.QueryBy(new CommitFilter
-                                                                {
-                                                                    IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
-                                                                    SortBy = CommitSortStrategies.Topological
-                                                                }).ToList();
+                {
+                    IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
+                    SortBy = CommitSortStrategies.Topological
+                }).ToList();
                 foreach (Commit commit in commits)
                 {
                     Assert.NotNull(commit);
@@ -331,9 +329,12 @@ public void CanEnumerateCommitsFromTwoHeads()
         public void CanEnumerateCommitsFromMixedStartingPoints()
         {
             AssertEnumerationOfCommits(
-                repo => new CommitFilter { IncludeReachableFrom = new object[] { repo.Branches["br2"],
+                repo => new CommitFilter
+                {
+                    IncludeReachableFrom = new object[] { repo.Branches["br2"],
                                                             "refs/heads/master",
-                                                            new ObjectId("e90810b8df3e80c413d903f631643c716887138d") } },
+                                                            new ObjectId("e90810b8df3e80c413d903f631643c716887138d") }
+                },
                 new[]
                     {
                         "4c062a6", "e90810b", "6dcf9bf", "a4a7dce",
@@ -389,9 +390,9 @@ public void CanEnumerateAllCommits()
         {
             AssertEnumerationOfCommits(
                 repo => new CommitFilter
-                    {
-                        IncludeReachableFrom = repo.Refs.OrderBy(r => r.CanonicalName, StringComparer.Ordinal),
-                    },
+                {
+                    IncludeReachableFrom = repo.Refs.OrderBy(r => r.CanonicalName, StringComparer.Ordinal),
+                },
                 new[]
                     {
                         "44d5d18", "bb65291", "532740a", "503a16f", "3dfd6fd",
@@ -406,7 +407,7 @@ public void CanEnumerateCommitsFromATagWhichPointsToABlob()
         {
             AssertEnumerationOfCommits(
                 repo => new CommitFilter { IncludeReachableFrom = repo.Tags["point_to_blob"] },
-                new string[] { });
+                Array.Empty<string>());
         }
 
         [Fact]
@@ -421,7 +422,7 @@ public void CanEnumerateCommitsFromATagWhichPointsToATree()
 
                 AssertEnumerationOfCommitsInRepo(repo,
                     r => new CommitFilter { IncludeReachableFrom = tag },
-                    new string[] { });
+                    Array.Empty<string>());
             }
         }
 
@@ -680,8 +681,12 @@ public void CanCommitALittleBit()
                 Assert.Equal(identity.Name, reflogEntry.Committer.Name);
                 Assert.Equal(identity.Email, reflogEntry.Committer.Email);
 
-                var now = DateTimeOffset.Now;
-                Assert.InRange(reflogEntry.Committer.When, before, now);
+                // When verifying the timestamp range, give a little more room on the range.
+                // Git or file system datetime truncation seems to cause these stamps to jump up to a second earlier
+                // than we expect. See https://github.com/libgit2/libgit2sharp/issues/1764
+                var low = before - TimeSpan.FromSeconds(1);
+                var high = DateTimeOffset.Now.TruncateMilliseconds() + TimeSpan.FromSeconds(1);
+                Assert.InRange(reflogEntry.Committer.When, low, high);
 
                 Assert.Equal(commit.Id, reflogEntry.To);
                 Assert.Equal(ObjectId.Zero, reflogEntry.From);
@@ -859,21 +864,21 @@ public void CanRetrieveChildrenOfASpecificCommit()
                 const string parentSha = "5b5b025afb0b4c913b4c338a42934a3863bf3644";
 
                 var filter = new CommitFilter
-                                 {
-                                     /* Revwalk from all the refs (git log --all) ... */
-                                     IncludeReachableFrom = repo.Refs,
+                {
+                    /* Revwalk from all the refs (git log --all) ... */
+                    IncludeReachableFrom = repo.Refs,
 
-                                     /* ... and stop when the parent is reached */
-                                     ExcludeReachableFrom = parentSha
-                                 };
+                    /* ... and stop when the parent is reached */
+                    ExcludeReachableFrom = parentSha
+                };
 
                 var commits = repo.Commits.QueryBy(filter);
 
                 var children = from c in commits
-                            from p in c.Parents
-                            let pId = p.Id
-                            where pId.Sha == parentSha
-                            select c;
+                               from p in c.Parents
+                               let pId = p.Id
+                               where pId.Sha == parentSha
+                               select c;
 
                 var expectedChildren = new[] { "c47800c7266a2be04c571c04d5a6614691ea99bd",
                                                 "4a202b346bb0fb0db7eff3cffeb3c70babbd2045" };

LibGit2Sharp.Tests/DiffTreeToTreeFixture.cs

@@ -9,7 +9,7 @@ namespace LibGit2Sharp.Tests
 {
     public class DiffTreeToTreeFixture : BaseFixture
     {
-        private static readonly string subBranchFilePath = String.Join("/", "1", "branch_file.txt");
+        private static readonly string subBranchFilePath = string.Join("/", "1", "branch_file.txt");
 
         [Fact]
         public void ComparingATreeAgainstItselfReturnsNoDifference()
@@ -27,7 +27,7 @@ public void ComparingATreeAgainstItselfReturnsNoDifference()
                 using (var patch = repo.Diff.Compare<Patch>(tree, tree))
                 {
                     Assert.Empty(patch);
-                    Assert.Equal(String.Empty, patch);
+                    Assert.Equal(string.Empty, patch);
                 }
             }
         }