iCodeSometime · pull · Mar 14, 2024 · Mar 14, 2024 · Mar 14, 2024 · Mar 16, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,77 +15,88 @@ 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: 9.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-13 ]
+        tfm: [ net472, net8.0, net9.0 ]
        exclude:
-          - os: macos-11
+          - os: macos-13
            tfm: net472
+        include:
+          - arch: arm64
+            os: macos-14
+            tfm: net8.0
+          - arch: arm64
+            os: macos-14
+            tfm: net9.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
-            6.0.x
+            9.0.x
+            8.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:
    name: Test / ${{ matrix.distro }} / ${{ matrix.arch }} / ${{ matrix.tfm }}
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.runnerImage }}
    strategy:
      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' ]
+        arch: [ amd64, arm64 ]
+        distro: [ alpine.3.17, alpine.3.18, alpine.3.19, alpine.3.20, centos.stream.9, debian.12, fedora.40, ubuntu.20.04, ubuntu.22.04, ubuntu.24.04 ]
+        sdk:  [ '8.0', '9.0' ]
        exclude:
-          - distro: alpine.3.13
-            sdk: '7.0'
-          - distro: alpine.3.14
-            sdk: '7.0'
+          - distro: alpine.3.17
+            sdk: '9.0'
+          - distro: alpine.3.18
+            sdk: '9.0'
+          - distro: alpine.3.19
+            sdk: '9.0'
        include:
-          - sdk: '6.0'
-            tfm: net6.0
-          - sdk: '7.0'
-            tfm: net7.0
+          - sdk: '8.0'
+            tfm: net8.0
+          - sdk: '9.0'
+            tfm: net9.0
+          - arch: amd64
+            runnerImage: ubuntu-22.04
+          - arch: arm64
+            runnerImage: ubuntu-22.04-arm
      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
-        if: matrix.arch == 'arm64'
-        run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
      - name: Run ${{ matrix.tfm }} tests
        run: |
            git_command="git config --global --add safe.directory /app"
            test_command="dotnet test LibGit2Sharp.sln --configuration Release -p:TargetFrameworks=${{ matrix.tfm }} --logger "GitHubActions" -p:ExtraDefine=LEAKS_IDENTIFYING"
-            docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
+            docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" -e OPENSSL_ENABLE_SHA1_SIGNATURES=1 gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"

diff --git a/.gitignore b/.gitignore
@@ -38,5 +38,5 @@ _ReSharper*/
 *.DotSettings

 _NCrunch_LibGit2Sharp/
-packages/
+artifacts/
 worktree.playlist
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,30 @@
 # LibGit2Sharp Changes

+## v0.31 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.30.0..0.31.0))
+
+### Changes
+- This release includes [libgit2 v1.8.4](https://github.com/libgit2/libgit2/releases/tag/v1.8.4).
+  - SSH is now supported through [libgit2's support for OpenSSH](https://github.com/libgit2/libgit2/pull/6617).
+- The ppc64le architecture is now supported on Linux.
+- .NET 6 has reached end of support, so LibGit2Sharp now targets `net472` and `net8.0`.
+
+### Additions
+- Adds Depth to FetchOptions allowing for shallow cloning [#2070](https://github.com/libgit2/libgit2sharp/pull/2070)
+- Make owner validation configurable [#2093](https://github.com/libgit2/libgit2sharp/pull/2093)
+- Add a CloneOptions constructor that takes a FetchOptions [#2132](https://github.com/libgit2/libgit2sharp/pull/2132)
+
+### Fixes
+- TreeDefinition.Remove fails to remove unwrapped trees [#1869](https://github.com/libgit2/libgit2sharp/issues/1869) 
+- ObjectDatabase.Write<T>(Stream stream...) overload does not respect T [#2071](https://github.com/libgit2/libgit2sharp/issues/2071)
+- Repository.Worktrees.Add leaves now worktree empty [#2037](https://github.com/libgit2/libgit2sharp/issues/2037)
+
+## 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 +33,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))


diff --git a/Directory.Build.props b/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>


diff --git a/LibGit2Sharp.Tests/BlameFixture.cs b/LibGit2Sharp.Tests/BlameFixture.cs
@@ -62,10 +62,10 @@ public void CanBlameFromVariousTypes()
            string path = SandboxBareTestRepo();
            using (var repo = new Repository(path))
            {
-                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions {StartingAt = "HEAD" }));
-                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions {StartingAt = repo.Head }));
-                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions {StartingAt = repo.Head.Tip }));
-                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions {StartingAt = repo.Branches["master"]}));
+                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions { StartingAt = "HEAD" }));
+                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions { StartingAt = repo.Head }));
+                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions { StartingAt = repo.Head.Tip }));
+                AssertCorrectHeadBlame(repo.Blame("README", new BlameOptions { StartingAt = repo.Branches["master"] }));
            }
        }

@@ -78,7 +78,7 @@ public void CanStopBlame()
                // $ git blame .\new.txt
                // 9fd738e8 (Scott Chacon 2010-05-24 10:19:19 -0700 1) my new file
                // (be3563a comes after 9fd738e8)
-                var blame = repo.Blame("new.txt", new BlameOptions {StoppingAt = "be3563a"});
+                var blame = repo.Blame("new.txt", new BlameOptions { StoppingAt = "be3563a" });
                Assert.StartsWith("be3563a", blame[0].FinalCommit.Sha);
            }
        }

diff --git a/LibGit2Sharp.Tests/BranchFixture.cs b/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);

diff --git a/LibGit2Sharp.Tests/CheckoutFixture.cs b/LibGit2Sharp.Tests/CheckoutFixture.cs
@@ -269,7 +269,7 @@ public void CanForcefullyCheckoutWithConflictingStagedChanges()
                Assert.Throws<CheckoutConflictException>(() => Commands.Checkout(repo, master.CanonicalName));

                // Checkout with force option should succeed.
-                Commands.Checkout(repo, master.CanonicalName, new CheckoutOptions() { CheckoutModifiers = CheckoutModifiers.Force});
+                Commands.Checkout(repo, master.CanonicalName, new CheckoutOptions() { CheckoutModifiers = CheckoutModifiers.Force });

                // Assert that master branch is checked out.
                Assert.True(repo.Branches["master"].IsCurrentRepositoryHead);
@@ -411,7 +411,7 @@ public void CheckingOutThroughBranchCallsCheckoutProgress()

                Branch branch = repo.Branches[otherBranchName];
                Commands.Checkout(repo, branch,
-                    new CheckoutOptions { OnCheckoutProgress = (path, completed, total) => wasCalled = true});
+                    new CheckoutOptions { OnCheckoutProgress = (path, completed, total) => wasCalled = true });

                Assert.True(wasCalled);
            }
@@ -427,7 +427,7 @@ public void CheckingOutThroughRepositoryCallsCheckoutProgress()
                PopulateBasicRepository(repo);
                bool wasCalled = false;

-                Commands.Checkout(repo, otherBranchName, new CheckoutOptions() { OnCheckoutProgress = (path, completed, total) => wasCalled = true});
+                Commands.Checkout(repo, otherBranchName, new CheckoutOptions() { OnCheckoutProgress = (path, completed, total) => wasCalled = true });

                Assert.True(wasCalled);
            }
@@ -779,7 +779,7 @@ public void CheckoutFromDetachedHead(string commitPointer)
        public void CheckoutBranchFromDetachedHead()
        {
            string path = SandboxStandardTestRepo();
-            using (var repo = new Repository(path, new RepositoryOptions{ Identity = Constants.Identity }))
+            using (var repo = new Repository(path, new RepositoryOptions { Identity = Constants.Identity }))
            {
                // Set the working directory to the current head
                ResetAndCleanWorkingDirectory(repo);

diff --git a/LibGit2Sharp.Tests/CloneFixture.cs b/LibGit2Sharp.Tests/CloneFixture.cs
@@ -35,6 +35,34 @@ public void CanClone(string url)
            }
        }

+        [Theory]
+        [InlineData("https://github.com/libgit2/TestGitRepository", 1)]
+        [InlineData("https://github.com/libgit2/TestGitRepository", 5)]
+        [InlineData("https://github.com/libgit2/TestGitRepository", 7)]
+        public void CanCloneShallow(string url, int depth)
+        {
+            var scd = BuildSelfCleaningDirectory();
+
+            var clonedRepoPath = Repository.Clone(url, scd.DirectoryPath, new CloneOptions
+            {
+                FetchOptions =
+                {
+                    Depth = depth,
+                },
+            });
+
+            using (var repo = new Repository(clonedRepoPath))
+            {
+                var commitsFirstParentOnly = repo.Commits.QueryBy(new CommitFilter
+                {
+                    FirstParentOnly = true,
+                });
+
+                Assert.Equal(depth, commitsFirstParentOnly.Count());
+                Assert.Equal("49322bb17d3acc9146f98c97d078513228bbf3c0", repo.Head.Tip.Id.ToString());
+            }
+        }
+
        [Theory]
        [InlineData("br2", "a4a7dce85cf63874e984719f4fdd239f5145052f")]
        [InlineData("packed", "41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9")]
@@ -238,7 +266,7 @@ static Credentials CreateUsernamePasswordCredentials(string user, string pass, b

        [SkippableTheory]
        [InlineData("https://github.com/libgit2/TestGitRepository.git", "github.com", typeof(CertificateX509))]
-        [InlineData("git@github.com:libgit2/TestGitRepository.git", "github.com", typeof(CertificateSsh))]
+        //[InlineData("git@github.com:libgit2/TestGitRepository.git", "github.com", typeof(CertificateSsh))]
        public void CanInspectCertificateOnClone(string url, string hostname, Type certType)
        {
            var scd = BuildSelfCleaningDirectory();
@@ -267,7 +295,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;
                        }