Skip to content

Commit e6d81f9

Browse files
authored
Merge pull request #1920 from arturcic/feature/net6.0
Adds .net 6 test target
2 parents 6189846 + 9836399 commit e6d81f9

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,15 @@ jobs:
2828
uses: actions/[email protected]
2929
with:
3030
fetch-depth: 0
31-
- name: Setup .NET SDK
31+
- name: Install .NET SDK
32+
uses: actions/[email protected]
33+
with:
34+
dotnet-version: 6.0.x
35+
- name: Install .NET 5 runtime
3236
uses: actions/[email protected]
3337
with:
3438
dotnet-version: 5.0.x
35-
- name: Setup .NET Core 3.1 runtime
39+
- name: Install .NET Core 3.1 runtime
3640
uses: actions/[email protected]
3741
with:
3842
dotnet-version: 3.1.x
@@ -52,3 +56,5 @@ jobs:
5256
run: dotnet test LibGit2Sharp.sln --configuration Release --no-restore --framework netcoreapp3.1 --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
5357
- name: Run net5.0 tests
5458
run: dotnet test LibGit2Sharp.sln --configuration Release --no-restore --framework net5.0 --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
59+
- name: Run net6.0 tests
60+
run: dotnet test LibGit2Sharp.sln --configuration Release --no-restore --framework net6.0 --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING

LibGit2Sharp.Tests/BlobFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void CanGetBlobAsFilteredText(string autocrlf, string expectedText)
4343
}
4444
}
4545

46-
#if NETFRAMEWORK || NETCOREAPP3_1 //UTF-7 is disabled in .NET 5
46+
#if NETFRAMEWORK || NETCOREAPP3_1 //UTF-7 is disabled in .NET 5+
4747
[Theory]
4848
[InlineData("ascii", 4, "31 32 33 34")]
4949
[InlineData("utf-7", 4, "31 32 33 34")]

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>net472;netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)