Skip to content

Commit f4fc144

Browse files
bordingbording
authored
Updates (#2128)
* Remove net6.0 * Add net9.0 * Update supported distros * Fix centos.stream.9 * Update packages * Reorder package reference item group * Remove distro combinations that are missing images
1 parent a88e2a0 commit f4fc144

File tree

4 files changed

+33
-44
lines changed

4 files changed

+33
-44
lines changed

‎.github/workflows/ci.yml

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install .NET SDK
2222
uses: actions/setup-dotnet@v4.0.0
2323
with:
24-
dotnet-version: 8.0.x
24+
dotnet-version: 9.0.x
2525
- name: Build
2626
run: dotnet build LibGit2Sharp.sln --configuration Release
2727
- name: Upload packages
@@ -38,20 +38,18 @@ jobs:
3838
strategy:
3939
matrix:
4040
arch: [ x64 ]
41-
os: [ windows-2019, windows-2022, macos-12, macos-13 ]
42-
tfm: [ net472, net6.0, net8.0 ]
41+
os: [ windows-2019, windows-2022, macos-13 ]
42+
tfm: [ net472, net8.0, net9.0 ]
4343
exclude:
44-
- os: macos-12
45-
tfm: net472
4644
- os: macos-13
4745
tfm: net472
4846
include:
4947
- arch: arm64
5048
os: macos-14
51-
tfm: net6.0
49+
tfm: net8.0
5250
- arch: arm64
5351
os: macos-14
54-
tfm: net8.0
52+
tfm: net9.0
5553
fail-fast: false
5654
steps:
5755
- name: Checkout
@@ -62,8 +60,8 @@ jobs:
6260
uses: actions/setup-dotnet@v4.0.0
6361
with:
6462
dotnet-version: |
63+
9.0.x
6564
8.0.x
66-
6.0.x
6765
- name: Run ${{ matrix.tfm }} tests
6866
run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
6967
test-linux:
@@ -73,28 +71,20 @@ jobs:
7371
matrix:
7472
arch: [ amd64 ]
7573
# arch: [ amd64, arm64 ]
76-
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 ]
77-
sdk: [ '6.0', '8.0' ]
74+
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 ]
75+
sdk: [ '8.0', '9.0' ]
7876
exclude:
79-
- distro: alpine.3.13
80-
sdk: '8.0'
81-
- distro: alpine.3.14
82-
sdk: '8.0'
83-
- distro: alpine.3.15
84-
sdk: '8.0'
85-
- distro: alpine.3.16
86-
sdk: '8.0'
87-
- distro: debian.10
88-
sdk: '8.0'
89-
- distro: fedora.36
90-
sdk: '8.0'
91-
- distro: ubuntu.18.04
92-
sdk: '8.0'
77+
- distro: alpine.3.17
78+
sdk: '9.0'
79+
- distro: alpine.3.18
80+
sdk: '9.0'
81+
- distro: alpine.3.19
82+
sdk: '9.0'
9383
include:
94-
- sdk: '6.0'
95-
tfm: net6.0
9684
- sdk: '8.0'
9785
tfm: net8.0
86+
- sdk: '9.0'
87+
tfm: net9.0
9888
fail-fast: false
9989
steps:
10090
- name: Checkout
@@ -108,5 +98,5 @@ jobs:
10898
run: |
10999
git_command="git config --global --add safe.directory /app"
110100
test_command="dotnet test LibGit2Sharp.sln --configuration Release -p:TargetFrameworks=${{ matrix.tfm }} --logger "GitHubActions" -p:ExtraDefine=LEAKS_IDENTIFYING"
111-
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"
101+
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"
112102

‎LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -11,12 +11,12 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
16-
<PackageReference Include="Moq" Version="4.20.70" />
17-
<PackageReference Include="xunit" Version="2.7.0" />
18-
<PackageReference Include="xunit.runner.console" Version="2.7.0" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
14+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageReference Include="Moq" Version="4.20.72" />
17+
<PackageReference Include="xunit" Version="2.9.2" />
18+
<PackageReference Include="xunit.runner.console" Version="2.9.2" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
2020
<PackageReference Include="xunit.skippablefact" Version="1.4.13" />
2121
</ItemGroup>
2222

‎LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
5-
<LangVersion>10.0</LangVersion>
4+
<TargetFrameworks>net472;net8.0</TargetFrameworks>
5+
<LangVersion>12.0</LangVersion>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .NET</Description>
88
<Company>LibGit2Sharp contributors</Company>
@@ -24,10 +24,15 @@
2424
<MinVerBuildMetadata Condition="'$(libgit2_hash)' != ''">libgit2-$(libgit2_hash.Substring(0,7))</MinVerBuildMetadata>
2525
</PropertyGroup>
2626

27-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
27+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
2828
<IsTrimmable>true</IsTrimmable>
2929
</PropertyGroup>
3030

31+
<ItemGroup>
32+
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.322]" PrivateAssets="none" />
33+
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
34+
</ItemGroup>
35+
3136
<ItemGroup>
3237
<None Include="..\square-logo.png" Pack="true" PackagePath="" Visible="false" />
3338
<None Include="..\README.md" Pack="true" PackagePath="App_Readme/" Visible="false" />
@@ -38,12 +43,6 @@
3843
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" /> <!-- Needed for T4 generation -->
3944
</ItemGroup>
4045

41-
<ItemGroup>
42-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.322]" PrivateAssets="none" />
43-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
44-
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all" />
45-
</ItemGroup>
46-
4746
<Import Project="..\Targets\CodeGenerator.targets" />
4847
<Import Project="..\Targets\GenerateNativeDllName.targets" />
4948

‎TrimmingTestApp/TrimmingTestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>

0 commit comments

Comments
 (0)