Skip to content

Commit 0dc07df

Browse files
authored
Merge pull request #18 from OctopusDeploy/robe/include-net6
Re-introduce .net6 while we still have Calamari running in .net6
2 parents 1367830 + 65ca2c0 commit 0dc07df

File tree

8 files changed

+41
-3
lines changed

8 files changed

+41
-3
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
matrix:
4141
arch: [ x64 ]
4242
os: [ windows-2022, macos-13 ]
43-
tfm: [ net472, net8.0, net9.0 ]
43+
tfm: [ net472, net6.0, net8.0, net9.0 ]
4444
exclude:
4545
- os: macos-13
4646
tfm: net472
@@ -63,6 +63,7 @@ jobs:
6363
dotnet-version: |
6464
9.0.x
6565
8.0.x
66+
6.0.x
6667
- name: Run ${{ matrix.tfm }} tests
6768
run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
6869
test-linux:
@@ -81,6 +82,8 @@ jobs:
8182
- distro: alpine.3.19
8283
sdk: '9.0'
8384
include:
85+
- sdk: '6.0'
86+
tfm: net6.0
8487
- sdk: '8.0'
8588
tfm: net8.0
8689
- sdk: '9.0'

.idea/.idea.LibGit2Sharp/.idea/.gitignore

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.LibGit2Sharp/.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.LibGit2Sharp/.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.LibGit2Sharp/.idea/indexLayout.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.LibGit2Sharp/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LibGit2Sharp.Tests/LibGit2Sharp.Tests.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-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

LibGit2Sharp/LibGit2Sharp.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0;net6.0</TargetFrameworks>
55
<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>
@@ -28,6 +28,9 @@
2828
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
2929
<IsTrimmable>true</IsTrimmable>
3030
</PropertyGroup>
31+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
32+
<IsTrimmable>true</IsTrimmable>
33+
</PropertyGroup>
3134

3235
<ItemGroup>
3336
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.323]" PrivateAssets="none" />

0 commit comments

Comments
 (0)