From f0a989cbffaa3606ffde00468351b28cf92225c3 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 01:23:27 -0500
Subject: [PATCH 1/7] Remove net6.0

---
 .github/workflows/ci.yml                     | 10 ++--------
 LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj |  2 +-
 LibGit2Sharp/LibGit2Sharp.csproj             |  6 +++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a7f9a0de..12ab34d05 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,16 +39,13 @@ jobs:
       matrix:
         arch: [ x64 ]
         os: [ windows-2019, windows-2022, macos-12, macos-13 ]
-        tfm: [ net472, net6.0, net8.0 ]
+        tfm: [ net472, net8.0 ]
         exclude:
           - 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
@@ -63,7 +60,6 @@ jobs:
         with:
           dotnet-version: |
             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
   test-linux:
@@ -74,7 +70,7 @@ jobs:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
         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' ]
+        sdk:  [ '8.0' ]
         exclude:
           - distro: alpine.3.13
             sdk: '8.0'
@@ -91,8 +87,6 @@ jobs:
           - distro: ubuntu.18.04
             sdk: '8.0'
         include:
-          - sdk: '6.0'
-            tfm: net6.0
           - sdk: '8.0'
             tfm: net8.0
       fail-fast: false
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index 4d648eead..052af578e 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 28404d948..eb1f81972 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
-    <LangVersion>10.0</LangVersion>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+    <LangVersion>12.0</LangVersion>
     <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>
@@ -24,7 +24,7 @@
     <MinVerBuildMetadata Condition="'$(libgit2_hash)' != ''">libgit2-$(libgit2_hash.Substring(0,7))</MinVerBuildMetadata>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 

From 0f1696378043e6f16ce8d7b81d4ce1d6f3a0c4ed Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 01:27:49 -0500
Subject: [PATCH 2/7] Add net9.0

---
 .github/workflows/ci.yml                     | 29 +++++++-------------
 LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj |  2 +-
 TrimmingTestApp/TrimmingTestApp.csproj       |  2 +-
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12ab34d05..9658f4240 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v4.0.0
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Build
         run: dotnet build LibGit2Sharp.sln --configuration Release
       - name: Upload packages
@@ -39,7 +39,7 @@ jobs:
       matrix:
         arch: [ x64 ]
         os: [ windows-2019, windows-2022, macos-12, macos-13 ]
-        tfm: [ net472, net8.0 ]
+        tfm: [ net472, net8.0, net9.0 ]
         exclude:
           - os: macos-12
             tfm: net472
@@ -49,6 +49,9 @@ jobs:
           - arch: arm64
             os: macos-14
             tfm: net8.0
+          - arch: arm64
+            os: macos-14
+            tfm: net9.0
       fail-fast: false
     steps:
       - name: Checkout
@@ -59,6 +62,7 @@ jobs:
         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
@@ -69,26 +73,13 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
-        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:  [ '8.0' ]
-        exclude:
-          - distro: alpine.3.13
-            sdk: '8.0'
-          - distro: alpine.3.14
-            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'
+        distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
+        sdk:  [ '8.0', '9.0' ]
         include:
           - sdk: '8.0'
             tfm: net8.0
+          - sdk: '9.0'
+            tfm: net9.0
       fail-fast: false
     steps:
       - name: Checkout
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index 052af578e..34338c754 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TrimmingTestApp/TrimmingTestApp.csproj b/TrimmingTestApp/TrimmingTestApp.csproj
index 9cb7e75b4..3c6d341f6 100644
--- a/TrimmingTestApp/TrimmingTestApp.csproj
+++ b/TrimmingTestApp/TrimmingTestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

From 6b38349bacc9e5071f7ce50e723d5d48c6b55e43 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 01:40:55 -0500
Subject: [PATCH 3/7] Update supported distros

---
 .github/workflows/ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9658f4240..82ced4d7c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,8 +73,15 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
-        distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
+        distro: [ alpine.3.17, alpine.3.18, alpine.3.19, alpine.3.20, centos.stream.9, debian.12, fedora.39, 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: fedora.39
+            sdk: '9.0'
         include:
           - sdk: '8.0'
             tfm: net8.0

From a66f8a9d7762cba1f76aee63eb8f12f54d7a409a Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 02:00:56 -0500
Subject: [PATCH 4/7] Fix centos.stream.9

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82ced4d7c..2d98ab699 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,11 +38,9 @@ jobs:
     strategy:
       matrix:
         arch: [ x64 ]
-        os: [ windows-2019, windows-2022, macos-12, macos-13 ]
+        os: [ windows-2019, windows-2022, macos-13 ]
         tfm: [ net472, net8.0, net9.0 ]
         exclude:
-          - os: macos-12
-            tfm: net472
           - os: macos-13
             tfm: net472
         include:
@@ -100,5 +98,5 @@ jobs:
         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"
 

From 3af04b0849ccd612fc1c9c757902ef592dfce4c7 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 02:12:29 -0500
Subject: [PATCH 5/7] Update packages

---
 LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj | 12 ++++++------
 LibGit2Sharp/LibGit2Sharp.csproj             |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index 34338c754..fb81a76a3 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -11,12 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.console" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageReference Include="xunit.skippablefact" Version="1.4.13" />
   </ItemGroup>
 
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index eb1f81972..3106b4bf0 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -40,8 +40,7 @@
 
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.322]" PrivateAssets="none" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
+    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <Import Project="..\Targets\CodeGenerator.targets" />

From 578176c75f6d2797979bdbc592389edb24b9248b Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 02:12:58 -0500
Subject: [PATCH 6/7] Reorder package reference item group

---
 LibGit2Sharp/LibGit2Sharp.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 3106b4bf0..8eadb87df 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -28,6 +28,11 @@
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.322]" PrivateAssets="none" />
+    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="..\square-logo.png" Pack="true" PackagePath="" Visible="false" />
     <None Include="..\README.md" Pack="true" PackagePath="App_Readme/" Visible="false" />
@@ -38,11 +43,6 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" /> <!-- Needed for T4 generation -->
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.322]" PrivateAssets="none" />
-    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
-  </ItemGroup>
-
   <Import Project="..\Targets\CodeGenerator.targets" />
   <Import Project="..\Targets\GenerateNativeDllName.targets" />
 

From 90e96c7428a13ce8cd0d1a691e67dce4906bfb2d Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 21 Nov 2024 23:38:35 -0500
Subject: [PATCH 7/7] Remove distro combinations that are missing images

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d98ab699..6d29a0999 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,14 +71,14 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
-        distro: [ alpine.3.17, alpine.3.18, alpine.3.19, alpine.3.20, centos.stream.9, debian.12, fedora.39, fedora.40, ubuntu.20.04, ubuntu.22.04, ubuntu.24.04 ]
+        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: fedora.39
+          - distro: alpine.3.19
             sdk: '9.0'
         include:
           - sdk: '8.0'