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)
solidtoken · Nov 16, 2021 · 393b556 · 393b556
1 parent 9891f2d
commit 393b556
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 26 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ SpecFlow plugin that enables to use Microsoft.Extensions.DependencyInjection for
 
 Currently supports:
 * [SpecFlow v3.9.8](https://www.nuget.org/packages/SpecFlow/3.9.8) or above
-* [Microsoft.Extensions.DependencyInjection v5.0.1](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/5.0.1) or above
+* [Microsoft.Extensions.DependencyInjection v3.1.0](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/3.1.0) or above
 
 Based on [SpecFlow.Autofac](https://github.com/gasparnagy/SpecFlow.Autofac).
 Listed on [Available Plugins for SpecFlow](https://specflow.org/documentation/Available-Plugins/).

diff --git a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Product>SpecFlow.DependencyInjection</Product>
     <RootNamespace>SolidToken.SpecFlow.DependencyInjection.Tests</RootNamespace>
     <AssemblyName>SolidToken.SpecFlow.DependencyInjection.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.8.0" Condition="$(TargetFramework.StartsWith('net4')) AND '$(OS)' == 'Unix'" />
     <PackageReference Include="SpecFlow" Version="3.9.8" />
     <PackageReference Include="xunit" Version="2.4.1" />
@@ -22,7 +22,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="SpecFlow.xUnit" Version="3.9.8" />
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -34,7 +34,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\SpecFlow.DependencyInjection\SpecFlow.DependencyInjection.csproj" />
   </ItemGroup>

diff --git a/SpecFlow.DependencyInjection.sln b/SpecFlow.DependencyInjection.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29721.120
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.31903.286
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpecFlow.DependencyInjection", "SpecFlow.DependencyInjection\SpecFlow.DependencyInjection.csproj", "{CACF906A-7230-4E37-984C-739AB1620995}"
 EndProject
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
-		.github\dependabot.yml = .github\dependabot.yml
 		GitVersion.yml = GitVersion.yml
 		LICENSE = LICENSE
 		README.md = README.md

diff --git a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj
@@ -11,10 +11,11 @@
     <Company>Solid Token</Company>
     <Copyright>Copyright © Solid Token</Copyright>
     <PackageIcon>assets/icon.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/solidtoken/SpecFlow.DependencyInjection</PackageProjectUrl>
     <PackageTags>microsoft;dependencyinjection;di;specflow;plugin</PackageTags>
-
+    
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -24,17 +25,18 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="../README.md" Pack="true" Visible="false" PackagePath="" />
     <None Include="../LICENSE" Pack="true" Visible="false" PackagePath="" />
     <None Include="assets/icon.png" Pack="true" Visible="true" PackagePath="assets/" />
     <None Include="build/*" Pack="true" Visible="true" PackagePath="build/" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.10">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -21,11 +21,26 @@ variables:
 trigger:
 - main
 
+pool:
+  vmImage: 'ubuntu-latest'
+
 stages:
 - stage: CI
   jobs:
   - job: Build
     steps:
+    - task: UseDotNet@2
+      displayName: '.NET SDK 3.1 (until December 3, 2022)'
+      inputs:
+        version: 3.1.x      
+    - task: UseDotNet@2
+      displayName: '.NET SDK 5.0 (until May 8, 2022)'
+      inputs:
+        version: 5.0.x
+    - task: UseDotNet@2
+      displayName: '.NET SDK 6.0 (until November 8, 2024)'
+      inputs:
+        version: 6.0.x      
     - task: gitversion/setup@0
       displayName: 'Prepare'
       inputs: