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

Commit 393b556

Browse files
authored
Support .NET 6 (#71)
* Add 'net6.0' target (#70) * Remove 'netcoreapp2.1' target * Remove dependabot * Lower MEDI dependency requirement to 3.1.0 (#67) * Add README to NuGet (#47)
1 parent 9891f2d commit 393b556

File tree

6 files changed

+29
-26
lines changed

6 files changed

+29
-26
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SpecFlow plugin that enables to use Microsoft.Extensions.DependencyInjection for
99

1010
Currently supports:
1111
* [SpecFlow v3.9.8](https://www.nuget.org/packages/SpecFlow/3.9.8) or above
12-
* [Microsoft.Extensions.DependencyInjection v5.0.1](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/5.0.1) or above
12+
* [Microsoft.Extensions.DependencyInjection v3.1.0](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/3.1.0) or above
1313

1414
Based on [SpecFlow.Autofac](https://github.com/gasparnagy/SpecFlow.Autofac).
1515
Listed on [Available Plugins for SpecFlow](https://specflow.org/documentation/Available-Plugins/).

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<Product>SpecFlow.DependencyInjection</Product>
77
<RootNamespace>SolidToken.SpecFlow.DependencyInjection.Tests</RootNamespace>
88
<AssemblyName>SolidToken.SpecFlow.DependencyInjection.Tests</AssemblyName>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
12+
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1717
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.8.0" Condition="$(TargetFramework.StartsWith('net4')) AND '$(OS)' == 'Unix'" />
1818
<PackageReference Include="SpecFlow" Version="3.9.8" />
1919
<PackageReference Include="xunit" Version="2.4.1" />
@@ -22,7 +22,7 @@
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
2424
<PackageReference Include="SpecFlow.xUnit" Version="3.9.8" />
25-
<PackageReference Include="coverlet.collector" Version="3.0.3">
25+
<PackageReference Include="coverlet.collector" Version="3.1.0">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>
@@ -34,7 +34,7 @@
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>
3636
</ItemGroup>
37-
37+
3838
<ItemGroup>
3939
<ProjectReference Include="..\SpecFlow.DependencyInjection\SpecFlow.DependencyInjection.csproj" />
4040
</ItemGroup>

SpecFlow.DependencyInjection.sln

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29721.120
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.31903.286
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpecFlow.DependencyInjection", "SpecFlow.DependencyInjection\SpecFlow.DependencyInjection.csproj", "{CACF906A-7230-4E37-984C-739AB1620995}"
77
EndProject
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.editorconfig = .editorconfig
1111
.gitignore = .gitignore
1212
azure-pipelines.yml = azure-pipelines.yml
13-
.github\dependabot.yml = .github\dependabot.yml
1413
GitVersion.yml = GitVersion.yml
1514
LICENSE = LICENSE
1615
README.md = README.md

SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
<Company>Solid Token</Company>
1212
<Copyright>Copyright © Solid Token</Copyright>
1313
<PackageIcon>assets/icon.png</PackageIcon>
14+
<PackageReadmeFile>README.md</PackageReadmeFile>
1415
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
1516
<PackageProjectUrl>https://github.com/solidtoken/SpecFlow.DependencyInjection</PackageProjectUrl>
1617
<PackageTags>microsoft;dependencyinjection;di;specflow;plugin</PackageTags>
17-
18+
1819
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1920
<IncludeSymbols>true</IncludeSymbols>
2021
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -24,17 +25,18 @@
2425
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2526
</PropertyGroup>
2627
<ItemGroup>
28+
<None Include="../README.md" Pack="true" Visible="false" PackagePath="" />
2729
<None Include="../LICENSE" Pack="true" Visible="false" PackagePath="" />
2830
<None Include="assets/icon.png" Pack="true" Visible="true" PackagePath="assets/" />
2931
<None Include="build/*" Pack="true" Visible="true" PackagePath="build/" />
3032
</ItemGroup>
3133
<ItemGroup>
32-
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
34+
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
3335
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3436
<PrivateAssets>all</PrivateAssets>
3537
</PackageReference>
36-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
38+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
39+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
3840
<PrivateAssets>all</PrivateAssets>
3941
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4042
</PackageReference>

azure-pipelines.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,26 @@ variables:
2121
trigger:
2222
- main
2323

24+
pool:
25+
vmImage: 'ubuntu-latest'
26+
2427
stages:
2528
- stage: CI
2629
jobs:
2730
- job: Build
2831
steps:
32+
- task: UseDotNet@2
33+
displayName: '.NET SDK 3.1 (until December 3, 2022)'
34+
inputs:
35+
version: 3.1.x
36+
- task: UseDotNet@2
37+
displayName: '.NET SDK 5.0 (until May 8, 2022)'
38+
inputs:
39+
version: 5.0.x
40+
- task: UseDotNet@2
41+
displayName: '.NET SDK 6.0 (until November 8, 2024)'
42+
inputs:
43+
version: 6.0.x
2944
- task: gitversion/setup@0
3045
displayName: 'Prepare'
3146
inputs:

0 commit comments

Comments
 (0)