Skip to content

Commit ae450c9

Browse files
committed
Update test TFMs
1 parent 05fb439 commit ae450c9

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net472;netcoreapp2.1;net5.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<ProjectReference Include="..\LibGit2Sharp\LibGit2Sharp.csproj" />
9-
<ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
10-
<ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
9+
<ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
10+
<ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
@@ -23,7 +23,7 @@
2323

2424
<ItemGroup>
2525
<Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
26-
<Compile Remove="desktop\**" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
26+
<Compile Remove="desktop\**" Condition="'$(TargetFramework)' != 'net472'" />
2727
<Content Include="Resources\**\*.*" CopyToOutputDirectory="PreserveNewest" />
2828
<None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
2929
</ItemGroup>

azure-pipelines/dotnet.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@ steps:
66
- script: dotnet pack --no-build -c $(BuildConfiguration) /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/pack.binlog"
77
displayName: dotnet pack
88

9-
- task: DotNetCoreCLI@2
10-
displayName: dotnet test -f net46 (w/ coverage)
11-
inputs:
12-
command: test
13-
arguments: --no-build -c $(BuildConfiguration) -f net46 --filter "TestCategory!=FailsInCloudTest & TestCategory!=FailsWhileInstrumented" -v n /p:CollectCoverage=true
14-
testRunTitle: net46-$(Agent.JobName)
15-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
16-
17-
- task: DotNetCoreCLI@2
18-
displayName: dotnet test -f net46 (w/o coverage)
19-
inputs:
20-
command: test
21-
arguments: --no-build -c $(BuildConfiguration) -f net46 --filter "TestCategory!=FailsInCloudTest & TestCategory=FailsWhileInstrumented" -v n
22-
testRunTitle: net46-$(Agent.JobName)-nocoverage
23-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
24-
259
- task: DotNetCoreCLI@2
2610
displayName: dotnet test -f net472 (w/ coverage)
2711
inputs:
@@ -45,6 +29,13 @@ steps:
4529
arguments: --no-build -c $(BuildConfiguration) -f netcoreapp2.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true
4630
testRunTitle: netcoreapp2.1-$(Agent.JobName)
4731

32+
- task: DotNetCoreCLI@2
33+
displayName: dotnet test -f net5.0
34+
inputs:
35+
command: test
36+
arguments: --no-build -c $(BuildConfiguration) -f net5.0 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true
37+
testRunTitle: net5.0-$(Agent.JobName)
38+
4839
- task: PowerShell@2
4940
inputs:
5041
filePath: azure-pipelines/artifacts/_pipelines.ps1

0 commit comments

Comments
 (0)