net10 replacing net9 for now

.github/workflows/ci.yml

@@ -1,102 +1,151 @@
 name: CI
 on:
-  push:
-    branches: [master, release-*]
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+-*'
-  pull_request:
-  workflow_dispatch:
+    push:
+        branches: [master, release-*]
+        tags:
+            - "[0-9]+.[0-9]+.[0-9]+"
+            - "[0-9]+.[0-9]+.[0-9]+-*"
+    pull_request:
+    workflow_dispatch:
 env:
-  DOTNET_NOLOGO: true
+    DOTNET_NOLOGO: true
 jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.2
-        with:
-          fetch-depth: 0
-      - name: Install .NET SDK
-        uses: actions/setup-dotnet@v4.0.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Build
-        run: dotnet build LibGit2Sharp.sln --configuration Release
-      - name: Upload packages
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: NuGet 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: [ x64 ]
-        os: [ windows-2019, windows-2022, macos-13 ]
-        tfm: [ net472, net8.0, net9.0 ]
-        exclude:
-          - 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@v4.1.2
-        with:
-          fetch-depth: 0
-      - name: Install .NET SDK
-        uses: actions/setup-dotnet@v4.0.0
-        with:
-          dotnet-version: |
-            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: ${{ matrix.runnerImage }}
-    strategy:
-      matrix:
-        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.17
-            sdk: '9.0'
-          - distro: alpine.3.18
-            sdk: '9.0'
-          - distro: alpine.3.19
-            sdk: '9.0'
-        include:
-          - 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@v4.1.2
-        with:
-          fetch-depth: 0
-      - 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" -e OPENSSL_ENABLE_SHA1_SIGNATURES=1 gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
+    build:
+        name: Build
+        runs-on: ubuntu-22.04
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v6
+              with:
+                  fetch-depth: 0
+            - name: Install .NET SDK
+              uses: actions/setup-dotnet@v6
+              with:
+                  dotnet-version: 10.0.x
+            - name: Compute version override for branch builds
+              if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+              id: version
+              run: |
+                  # Latest release tag matching the convention <version>-octopus.<n>
+                  LATEST=$(git tag --list --sort=-v:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+-octopus\.[0-9]+$' | head -n 1)
+                  if [ -z "$LATEST" ]; then
+                    echo "::error::No release tag matching <version>-octopus.<n> found"
+                    exit 1
+                  fi
+                  # Sanitize branch name: lowercase, replace non-alphanumeric with hyphen, trim to 20 chars
+                  BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}}"
+                  SAFE_BRANCH=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//' | sed 's/-$//' | cut -c1-20)
+                  # Join with '.' (not '-') so branch/run land as separate prerelease IDs, keeping ordering correct vs the next octopus.<n+1>
+                  echo "override=${LATEST}.${SAFE_BRANCH}.${{ github.run_number }}" >> "$GITHUB_OUTPUT"
+            - name: Build
+              run: dotnet build LibGit2Sharp.sln --configuration Release ${{ steps.version.outputs.override && format('/p:MinVerVersionOverride={0}', steps.version.outputs.override) || '' }}
+            - name: Upload packages
+              uses: actions/upload-artifact@v7
+              with:
+                  name: NuGet 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: [x64]
+                os: [windows-2022, macos-14]
+                tfm: [net472, net8.0, net10.0]
+                exclude:
+                    - os: macos-14
+                      tfm: net472
+                include:
+                    - arch: arm64
+                      os: macos-14
+                      tfm: net8.0
+                    - arch: arm64
+                      os: macos-14
+                      tfm: net10.0
+            fail-fast: false
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v6
+              with:
+                  fetch-depth: 0
+            - name: Install .NET SDK
+              uses: actions/setup-dotnet@v6
+              with:
+                  dotnet-version: |
+                      10.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: ${{ matrix.runnerImage }}
+        strategy:
+            matrix:
+                arch: [amd64, arm64]
+                distro:
+                    [
+                        alpine.3.20,
+                        alpine.3.21,
+                        alpine.3.22,
+                        alpine.3.23,
+                        centos.stream.9,
+                        debian.12,
+                        fedora.41,
+                        fedora.42,
+                        fedora.43,
+                        ubuntu.22.04,
+                        ubuntu.24.04,
+                    ]
+                sdk: ["8.0", "10.0"]
+                include:
+                    - sdk: "8.0"
+                      tfm: net8.0
+                    - sdk: "10.0"
+                      tfm: net10.0
+                    - arch: amd64
+                      runnerImage: ubuntu-22.04
+                    - arch: arm64
+                      runnerImage: ubuntu-22.04-arm
+                exclude:
+                    - distro: alpine.3.20
+                      sdk: "10.0"
+                    - distro: alpine.3.21
+                      sdk: "10.0"
+                    - distro: fedora.41
+                      sdk: "10.0"
+                    - distro: ubuntu.22.04
+                      sdk: "10.0"
+            fail-fast: false
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v6
+              with:
+                  fetch-depth: 0
+            - 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" -w /app -e OPENSSL_ENABLE_SHA1_SIGNATURES=1 gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
+
+    nuget-push:
+        name: Octopus NuGet Push
+        needs: [build, test, test-linux]
+        # &&  github.ref == 'refs/heads/octopus/master'
+        if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' && github.event_name != 'schedule'
+        runs-on: ubuntu-22.04
+        steps:
+            - uses: actions/download-artifact@v8
+
+              with:
+                  path: staging
+            - name: Push package to feed 🐙
+              id: push-feed
+              shell: bash
+              env:
+                  FEED_API_KEY: ${{ secrets.FEED_API_KEY }}
+                  FEED_SOURCE: ${{ secrets.FEED_SOURCE }}
+              run: dotnet nuget push staging/**/*.nupkg --api-key "$FEED_API_KEY" --source "$FEED_SOURCE" --skip-duplicate

.gitignore

@@ -37,6 +37,7 @@ _ReSharper*/
 *.swp
 *.DotSettings
 
+.idea/
 _NCrunch_LibGit2Sharp/
 artifacts/
 worktree.playlist

LibGit2Sharp.Tests/GlobalSettingsFixture.cs

@@ -61,7 +61,6 @@ public void LoadFromSpecifiedPath(string architecture)
         {
             Skip.IfNot(Platform.IsRunningOnNetFramework(), ".NET Framework only test.");
 
-            var nativeDllFileName = NativeDllName.Name + ".dll";
             var testDir = Path.GetDirectoryName(typeof(GlobalSettingsFixture).Assembly.Location);
             var testAppExe = Path.Combine(testDir, $"NativeLibraryLoadTestApp.{architecture}.exe");
             var tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
@@ -71,7 +70,10 @@ public void LoadFromSpecifiedPath(string architecture)
             try
             {
                 Directory.CreateDirectory(platformDir);
-                File.Copy(Path.Combine(libraryPath, nativeDllFileName), Path.Combine(platformDir, nativeDllFileName));
+                foreach (var file in Directory.GetFiles(libraryPath, "*.dll"))
+                {
+                    File.Copy(file, Path.Combine(platformDir, Path.GetFileName(file)));
+                }
 
                 var (output, exitCode) = ProcessHelper.RunProcess(testAppExe, arguments: $@"{NativeDllName.Name} ""{platformDir}""", workingDirectory: tempDir);
 
@@ -90,17 +92,17 @@ public void SetExtensions()
             var extensions = GlobalSettings.GetExtensions();
 
             // Assert that "noop" is supported by default
-            Assert.Equal(new[] { "noop", "objectformat", "worktreeconfig" }, extensions);
+            Assert.Equal(new[] { "noop", "objectformat", "preciousobjects", "worktreeconfig" }, extensions);
 
             // Disable "noop" extensions
             GlobalSettings.SetExtensions("!noop");
             extensions = GlobalSettings.GetExtensions();
-            Assert.Equal(new[] { "objectformat", "worktreeconfig" }, extensions);
+            Assert.Equal(new[] { "objectformat", "preciousobjects", "worktreeconfig" }, extensions);
 
             // Enable two new extensions (it will reset the configuration and "noop" will be enabled)
             GlobalSettings.SetExtensions("partialclone", "newext");
             extensions = GlobalSettings.GetExtensions();
-            Assert.Equal(new[] { "newext", "noop", "objectformat", "partialclone", "worktreeconfig" }, extensions);
+            Assert.Equal(new[] { "newext", "noop", "objectformat", "partialclone", "preciousobjects", "worktreeconfig" }, extensions);
         }
 
         [Fact]

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

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