Skip to content
This repository was archived by the owner on May 22, 2024. It is now read-only.

Commit bc053f7

Browse files
authored
Support .NET Core LTS (#17)
* Relax dependencies in order to support .NET Core 2.1 LTS (#16) * Target both .NET Core 2.1 and 3.1 in Tests project (#16) * Change to windows-latest agent pool * Add separate Test tasks for 2.1 and 3.1 (#16) Resolves #16. +semver: feature
1 parent 7f53e23 commit bc053f7

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>SolidToken.SpecFlow.DependencyInjection.Tests</RootNamespace>
77
<AssemblyName>SolidToken.SpecFlow.DependencyInjection.Tests</AssemblyName>
@@ -12,11 +12,25 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
1615
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
1716
<PrivateAssets>all</PrivateAssets>
1817
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1918
</PackageReference>
19+
</ItemGroup>
20+
21+
<!-- .NET Core 2.1 LTS -->
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
23+
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.0.188" />
24+
<PackageReference Include="SpecFlow.xUnit" Version="3.0.188" />
25+
<PackageReference Include="xunit" Version="2.4.0" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
31+
32+
<!-- .NET Core 3.1 LTS -->
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
2034
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.1.82" />
2135
<PackageReference Include="SpecFlow.xUnit" Version="3.1.82" />
2236
<PackageReference Include="xunit" Version="2.4.1" />
@@ -25,7 +39,7 @@
2539
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2640
</PackageReference>
2741
</ItemGroup>
28-
42+
2943
<ItemGroup>
3044
<ProjectReference Include="..\SpecFlow.DependencyInjection\SpecFlow.DependencyInjection.csproj" />
3145
</ItemGroup>

SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1" />
3030
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
31-
<PackageReference Include="SpecFlow" Version="3.1.82" />
31+
<PackageReference Include="SpecFlow" Version="3.0.188" />
3232
</ItemGroup>
3333
</Project>

azure-pipelines.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ variables:
66
trigger:
77
- master
88

9-
#pool:
10-
# vmImage: 'ubuntu-latest'
9+
pool:
10+
vmImage: 'windows-latest'
1111

1212
steps:
1313
# Restore
@@ -21,13 +21,20 @@ steps:
2121
inputs:
2222
command: build
2323
arguments: '--configuration $(BuildConfiguration)'
24-
# Test
24+
# Test .NET Core 2.1
2525
- task: DotNetCoreCLI@2
26-
displayName: Test
26+
displayName: Test .NET Core 2.1
2727
inputs:
2828
command: test
2929
projects: '**/*.Tests/*.csproj'
30-
arguments: '--configuration $(BuildConfiguration)'
30+
arguments: '--configuration $(BuildConfiguration) --framework netcoreapp2.1'
31+
# Test .NET Core 3.1
32+
- task: DotNetCoreCLI@2
33+
displayName: Test .NET Core 3.1
34+
inputs:
35+
command: test
36+
projects: '**/*.Tests/*.csproj'
37+
arguments: '--configuration $(BuildConfiguration) --framework netcoreapp3.1'
3138
# Pack
3239
- task: DotNetCoreCLI@2
3340
displayName: Pack

0 commit comments

Comments
 (0)