remove .NET Core 2.1 and .NET 5 support (#2611)

SpecFlowOSS · Jul 8, 2022 · a122ad4 · a122ad4
1 parent b590fd4
commit a122ad4
Show file tree

Hide file tree

Showing 54 changed files with 155 additions and 213 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -27,6 +27,7 @@ body:
   attributes:
     label: .NET Implementation
     options:
+      - .NET 6.0
       - .NET 5.0
       - .NET Core 3.1
       - .NET Core 3.0

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all"/>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.107" PrivateAssets="all"/>
     <None Include="$(MSBuildThisFileDirectory)/LICENSE.txt" Pack="true" PackagePath=""/>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -35,30 +35,28 @@
 
     <SpecFlow_Net6_TFM>net6.0</SpecFlow_Net6_TFM>
 
-    <SpecFlow_Net5_TFM>net5.0</SpecFlow_Net5_TFM>
 
     <SpecFlow_FullFramework_Runtime_TFM>$(SpecFlow_FullFramework_TFM)</SpecFlow_FullFramework_Runtime_TFM>
     <SpecFlow_Core_Runtime_TFM>netstandard2.0</SpecFlow_Core_Runtime_TFM>
 
     <SpecFlow_FullFramework_Generator_TFM>$(SpecFlow_FullFramework_TFM)</SpecFlow_FullFramework_Generator_TFM>
-    <SpecFlow_Core_Generator_TFM>netcoreapp2.1</SpecFlow_Core_Generator_TFM>
+    <SpecFlow_Core_Generator_TFM>netcoreapp3.1</SpecFlow_Core_Generator_TFM>
 
     <SpecFlow_FullFramework_Test_TFM>$(SpecFlow_FullFramework_TFM)</SpecFlow_FullFramework_Test_TFM>
-    <SpecFlow_Core_Test_TFM>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</SpecFlow_Core_Test_TFM>
+    <SpecFlow_Core_Test_TFM>netcoreapp3.1;net6.0</SpecFlow_Core_Test_TFM>
 
     <SpecFlow_FullFramework_Specs_TFM>$(SpecFlow_FullFramework_TFM)</SpecFlow_FullFramework_Specs_TFM>
     <SpecFlow_Net6_Specs_TFM>$(SpecFlow_Net6_TFM)</SpecFlow_Net6_Specs_TFM>
 
     <SpecFlow_FullFramework_Tools_TFM>$(SpecFlow_FullFramework_TFM)</SpecFlow_FullFramework_Tools_TFM>
-    <SpecFlow_Core_Tools_TFM>netcoreapp2.1</SpecFlow_Core_Tools_TFM> 
-    <SpecFlow_Net5_Tools_TFM>$(SpecFlow_Net5_TFM)</SpecFlow_Net5_Tools_TFM>
+    <SpecFlow_Core_Tools_TFM>netcoreapp3.1</SpecFlow_Core_Tools_TFM> 
     <SpecFlow_Net6_Tools_TFM>$(SpecFlow_Net6_TFM)</SpecFlow_Net6_Tools_TFM>
 
-    <SpecFlow_Runtime_TFM>$(SpecFlow_FullFramework_Runtime_TFM);$(SpecFlow_Core_Runtime_TFM);$(SpecFlow_Net5_TFM);$(SpecFlow_Net6_TFM)</SpecFlow_Runtime_TFM>
-    <SpecFlow_Generator_TFM>$(SpecFlow_FullFramework_Generator_TFM);$(SpecFlow_Core_Generator_TFM);$(SpecFlow_Net5_TFM);$(SpecFlow_Net6_TFM)</SpecFlow_Generator_TFM>
+    <SpecFlow_Runtime_TFM>$(SpecFlow_FullFramework_Runtime_TFM);$(SpecFlow_Core_Runtime_TFM);$(SpecFlow_Net6_TFM)</SpecFlow_Runtime_TFM>
+    <SpecFlow_Generator_TFM>$(SpecFlow_FullFramework_Generator_TFM);$(SpecFlow_Core_Generator_TFM);$(SpecFlow_Net6_TFM)</SpecFlow_Generator_TFM>
     <SpecFlow_Test_TFM>$(SpecFlow_FullFramework_Test_TFM);$(SpecFlow_Core_Test_TFM)</SpecFlow_Test_TFM>
     <SpecFlow_Specs_TFM>$(SpecFlow_Net6_Specs_TFM)</SpecFlow_Specs_TFM>
-    <SpecFlow_Tools_TFM>$(SpecFlow_FullFramework_Tools_TFM);$(SpecFlow_Core_Tools_TFM);$(SpecFlow_Net5_Tools_TFM);$(SpecFlow_Net6_Tools_TFM)</SpecFlow_Tools_TFM>
+    <SpecFlow_Tools_TFM>$(SpecFlow_FullFramework_Tools_TFM);$(SpecFlow_Core_Tools_TFM);$(SpecFlow_Net6_Tools_TFM)</SpecFlow_Tools_TFM>
 
     <SpecFlow_EnableStrongNameSigning>true</SpecFlow_EnableStrongNameSigning>
   </PropertyGroup>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -8,7 +8,6 @@
       <NuspecProperties>$(NuspecProperties);author=$(SpecFlow_Authors)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);owner=$(SpecFlow_Owners)</NuspecProperties>
 
-      <NuspecProperties>$(NuspecProperties);SpecFlow_Net5_TFM=$(SpecFlow_Net5_TFM)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);SpecFlow_Net6_TFM=$(SpecFlow_Net6_TFM)</NuspecProperties>
 
       <NuspecProperties>$(NuspecProperties);SpecFlow_FullFramework_Runtime_TFM=$(SpecFlow_FullFramework_Runtime_TFM)</NuspecProperties>
@@ -18,7 +17,6 @@
       <NuspecProperties>$(NuspecProperties);SpecFlow_Core_Generator_TFM=$(SpecFlow_Core_Generator_TFM)</NuspecProperties>
 
       <NuspecProperties>$(NuspecProperties);SpecFlow_Core_Tools_TFM=$(SpecFlow_Core_Tools_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);SpecFlow_Net5_Tools_TFM=$(SpecFlow_Net5_Tools_TFM)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);SpecFlow_Net6_Tools_TFM=$(SpecFlow_Net6_Tools_TFM)</NuspecProperties>
     </PropertyGroup>
   </Target>

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsof
     && apt update \
     && apt install apt-transport-https -y \
     && apt update
-RUN apt install dotnet-sdk-2.1 -y
+RUN apt install dotnet-sdk-3.1 -y
 
 # RUN git clone --recurse-submodules--single-branch --branch updateLinuxBuild -j8 https://github.com/techtalk/SpecFlow.git /src \
 #     && ls -la

diff --git a/ExternalRepositories/SpecFlow.TestProjectGenerator b/ExternalRepositories/SpecFlow.TestProjectGenerator
diff --git a/Installer/TechTalk.SpecFlow.CustomPlugin/SpecFlow.CustomPlugin.nuspec b/Installer/TechTalk.SpecFlow.CustomPlugin/SpecFlow.CustomPlugin.nuspec
@@ -35,15 +35,10 @@
     <file src="bin\$config$\net461\TechTalk.SpecFlow.Utils.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
     <file src="bin\$config$\net461\TechTalk.SpecFlow.Parser.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
 
-    <file src="bin\$config$\netcoreapp2.1\Gherkin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.Generator.*" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.Utils.*" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.Parser.*" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-
-    <file src="bin\$config$\net5.0\Gherkin.dll" target="lib\$SpecFlow_Net5_TFM$" />
-    <file src="bin\$config$\net5.0\TechTalk.SpecFlow.Generator.*" target="lib\$SpecFlow_Net5_TFM$" />
-    <file src="bin\$config$\net5.0\TechTalk.SpecFlow.Utils.*" target="lib\$SpecFlow_Net5_TFM$" />
-    <file src="bin\$config$\net5.0\TechTalk.SpecFlow.Parser.*" target="lib\$SpecFlow_Net5_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\Gherkin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.Generator.*" target="lib\$SpecFlow_Core_Runtime_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.Utils.*" target="lib\$SpecFlow_Core_Runtime_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.Parser.*" target="lib\$SpecFlow_Core_Runtime_TFM$" />
 
     <file src="bin\$config$\net6.0\Gherkin.dll" target="lib\$SpecFlow_Net6_TFM$" />
     <file src="bin\$config$\net6.0\TechTalk.SpecFlow.Generator.*" target="lib\$SpecFlow_Net6_TFM$" />

diff --git a/Installer/TechTalk.SpecFlow.NUnit.Runners/TechTalk.SpecFlow.NUnit.Runners.csproj b/Installer/TechTalk.SpecFlow.NUnit.Runners/TechTalk.SpecFlow.NUnit.Runners.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Plugins/SpecFlow.Autofac.SpecFlowPlugin/SpecFlow.Autofac.SpecFlowPlugin.csproj b/Plugins/SpecFlow.Autofac.SpecFlowPlugin/SpecFlow.Autofac.SpecFlowPlugin.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Plugins/SpecFlow.Autofac.SpecFlowPlugin/SpecFlow.Autofac.nuspec b/Plugins/SpecFlow.Autofac.SpecFlowPlugin/SpecFlow.Autofac.nuspec
@@ -24,10 +24,6 @@
         <dependency id="SpecFlow" version="[$version$]" />
         <dependency id="Autofac" version="4.0.0" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="SpecFlow" version="[$version$]" />
-        <dependency id="Autofac" version="4.0.0" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="SpecFlow" version="[$version$]" />
         <dependency id="Autofac" version="4.0.0" />
@@ -41,9 +37,6 @@
     <file src="bin\$config$\netstandard2.0\SpecFlow.Autofac.SpecFlowPlugin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
     <file src="bin\$config$\netstandard2.0\SpecFlow.Autofac.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Core_Runtime_TFM$" />
 
-    <file src="bin\$config$\net5.0\SpecFlow.Autofac.SpecFlowPlugin.dll" target="lib\$SpecFlow_Net5_TFM$" />
-    <file src="bin\$config$\net5.0\SpecFlow.Autofac.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Net5_TFM$" />
-
     <file src="bin\$config$\net6.0\SpecFlow.Autofac.SpecFlowPlugin.dll" target="lib\$SpecFlow_Net6_TFM$" />
     <file src="bin\$config$\net6.0\SpecFlow.Autofac.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Net6_TFM$" />
 

diff --git a/...ternalData.SpecFlowPlugin.UnitTests/SpecFlow.ExternalData.SpecFlowPlugin.UnitTests.csproj b/...ternalData.SpecFlowPlugin.UnitTests/SpecFlow.ExternalData.SpecFlowPlugin.UnitTests.csproj
@@ -10,11 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Moq" Version="4.18.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -42,4 +44,5 @@
     </None>
   </ItemGroup>
 
+
 </Project>
diff --git a/...rnalData/SpecFlow.ExternalData.SpecFlowPlugin/SpecFlow.ExternalData.SpecFlowPlugin.csproj b/...rnalData/SpecFlow.ExternalData.SpecFlowPlugin/SpecFlow.ExternalData.SpecFlowPlugin.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
 
-    <PackageReference Include="CsvHelper" Version="27.0.4" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
 
     <PackageReference Include="ExcelDataReader" Version="3.6.0" />
     <PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />

diff --git a/...s/SpecFlow.ExternalData/SpecFlow.ExternalData.SpecFlowPlugin/SpecFlow.ExternalData.nuspec b/...s/SpecFlow.ExternalData/SpecFlow.ExternalData.SpecFlowPlugin/SpecFlow.ExternalData.nuspec
@@ -23,7 +23,7 @@
 
     <file src="bin\$config$\net461\**\*" target="build\net461"/>
 
-    <file src="bin\$config$\netcoreapp2.1\*" target="build\netcoreapp2.1"/>
+    <file src="bin\$config$\netcoreapp3.1\*" target="build\netcoreapp3.1"/>
 
     <file src="$SolutionDir$LICENSE.txt" target="LICENSE.txt" />
     <file src="$SolutionDir$specflow-icon.png" target="images\" />

diff --git a/...low.ExternalData/SpecFlow.ExternalData.SpecFlowPlugin/build/SpecFlow.ExternalData.targets b/...low.ExternalData/SpecFlow.ExternalData.SpecFlowPlugin/build/SpecFlow.ExternalData.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<_ExternalDataGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_ExternalDataGeneratorPluginFramework>
+		<_ExternalDataGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_ExternalDataGeneratorPluginFramework>
 		<_ExternalDataGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' != 'Core'">net461</_ExternalDataGeneratorPluginFramework>
 
 		<_ExternalDataGeneratorPluginPath>$(MSBuildThisFileDirectory)$(_ExternalDataGeneratorPluginFramework)\SpecFlow.ExternalData.SpecFlowPlugin.dll</_ExternalDataGeneratorPluginPath>

diff --git a/Plugins/SpecFlow.ExternalData/sample/ExternalDataSample/Specs.csproj b/Plugins/SpecFlow.ExternalData/sample/ExternalDataSample/Specs.csproj
@@ -4,14 +4,14 @@
   <Import Project="..\..\..\..\SpecFlow.Tools.MsBuild.Generation\build\SpecFlow.Tools.MsBuild.Generation.props" />
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
 
     <PackageReference Include="nunit" Version="3.13.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Plugins/SpecFlow.Windsor.SpecFlowPlugin/SpecFlow.Windsor.SpecFlowPlugin.csproj b/Plugins/SpecFlow.Windsor.SpecFlowPlugin/SpecFlow.Windsor.SpecFlowPlugin.csproj
@@ -14,14 +14,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Windsor" Version="5.0.1" />
+    <PackageReference Include="Castle.Windsor" Version="5.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Plugins/SpecFlow.Windsor.SpecFlowPlugin/SpecFlow.Windsor.nuspec b/Plugins/SpecFlow.Windsor.SpecFlowPlugin/SpecFlow.Windsor.nuspec
@@ -18,19 +18,15 @@
     <dependencies>
       <group targetFramework=".NETFramework4.6.1">
         <dependency id="SpecFlow" version="[$version$]" />
-        <dependency id="Castle.Windsor" version="5.0.1" />
+        <dependency id="Castle.Windsor" version="5.1.2" />
       </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="SpecFlow" version="[$version$]" />
-        <dependency id="Castle.Windsor" version="5.0.1" />
-      </group>
-      <group targetFramework="net5.0">
-        <dependency id="SpecFlow" version="[$version$]" />
-        <dependency id="Castle.Windsor" version="5.0.1" />
+        <dependency id="Castle.Windsor" version="5.1.2" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="SpecFlow" version="[$version$]" />
-        <dependency id="Castle.Windsor" version="5.0.1" />
+        <dependency id="Castle.Windsor" version="5.1.2" />
       </group>
 
     </dependencies>
@@ -41,7 +37,6 @@
     <file src="bin\$config$\net461\SpecFlow.Windsor.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
     <file src="bin\$config$\netstandard2.0\SpecFlow.Windsor.SpecFlowPlugin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
     <file src="bin\$config$\netstandard2.0\SpecFlow.Windsor.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-    <file src="bin\$config$\net5.0\SpecFlow.Windsor.SpecFlowPlugin.*" target="lib\$SpecFlow_Net5_TFM$" />
     <file src="bin\$config$\net6.0\SpecFlow.Windsor.SpecFlowPlugin.*" target="lib\$SpecFlow_Net6_TFM$" />
 
     <file src="$SolutionDir$LICENSE.txt" target="LICENSE.txt" />

diff --git a/Plugins/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin/SpecFlow.MSTest.nuspec b/Plugins/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin/SpecFlow.MSTest.nuspec
@@ -26,11 +26,6 @@
         <dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
         <dependency id="MSTest.TestFramework" version="2.1.2" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="SpecFlow" version="[$version$]" />
-        <dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="2.1.2" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="SpecFlow" version="[$version$]" />
         <dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
@@ -42,15 +37,13 @@
   <files>
     <file src="build\**\*" exclude="build\*.template.*" target="build" />
     <file src="bin\$config$\net461\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Core_Runtime_TFM$" />
-    <file src="bin\$config$\net5.0\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.*" target="lib\$SpecFlow_Net5_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Core_Runtime_TFM$" />
     <file src="bin\$config$\net6.0\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.*" target="lib\$SpecFlow_Net6_TFM$" />
 
     <file src="bin\$config$\net461\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_FullFramework_Generator_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.dll" target="build\$SpecFlow_Core_Generator_TFM$" />
-    <file src="bin\$config$\netcoreapp2.1\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.pdb" target="build\$SpecFlow_Core_Generator_TFM$" />
-    <file src="bin\$config$\net5.0\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_Net5_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.dll" target="build\$SpecFlow_Core_Generator_TFM$" />
+    <file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.pdb" target="build\$SpecFlow_Core_Generator_TFM$" />
     <file src="bin\$config$\net6.0\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_Net6_TFM$" />
 
     <file src="$SolutionDir$LICENSE.txt" target="LICENSE.txt" />

diff --git a/....MSTest.Generator.SpecFlowPlugin/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.csproj b/....MSTest.Generator.SpecFlowPlugin/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -30,9 +30,10 @@
     <ProjectReference Include="..\TechTalk.SpecFlow.MSTest.SpecFlowPlugin\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.csproj" />
   </ItemGroup>
 
+
   <Target Name="WriteAssemblyHooksVersion" AfterTargets="GetBuildVersion" BeforeTargets="BeforeCompile" Condition="$(DesignTimeBuild) != 'true' or '$(BuildingProject)' == 'true'">
-    <ReplaceTextInFileTask InputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.template.cs" OutputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.cs" TextToReplace="SPECFLOW_VERSION" TextToReplaceWith="$(NuGetPackageVersion)" WriteOnlyWhenChanged="true"/>
-    <ReplaceTextInFileTask InputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.template.vb" OutputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.vb" TextToReplace="SPECFLOW_VERSION" TextToReplaceWith="$(NuGetPackageVersion)" WriteOnlyWhenChanged="true"/>
+    <ReplaceTextInFileTask InputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.template.cs" OutputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.cs" TextToReplace="SPECFLOW_VERSION" TextToReplaceWith="$(NuGetPackageVersion)" WriteOnlyWhenChanged="true" />
+    <ReplaceTextInFileTask InputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.template.vb" OutputFile="$(MSBuildThisFileDirectory)\build\MSTest.AssemblyHooks.vb" TextToReplace="SPECFLOW_VERSION" TextToReplaceWith="$(NuGetPackageVersion)" WriteOnlyWhenChanged="true" />
   </Target>
 
 </Project>
diff --git a/Plugins/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin/build/SpecFlow.MsTest.targets b/Plugins/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin/build/SpecFlow.MsTest.targets
@@ -17,7 +17,7 @@
 
   <PropertyGroup>
 
-    <_SpecFlow_MsTestGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_SpecFlow_MsTestGeneratorPlugin>
+    <_SpecFlow_MsTestGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_SpecFlow_MsTestGeneratorPlugin>
     <_SpecFlow_MsTestGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'">net461</_SpecFlow_MsTestGeneratorPlugin>
     <_SpecFlow_MsTestGeneratorPluginPath>$(MSBuildThisFileDirectory)\$(_SpecFlow_MsTestGeneratorPlugin)\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.dll</_SpecFlow_MsTestGeneratorPluginPath>
 

diff --git a/...ns/TechTalk.SpecFlow.MSTest.SpecFlowPlugin/TechTalk.SpecFlow.MSTest.SpecFlowPlugin.csproj b/...ns/TechTalk.SpecFlow.MSTest.SpecFlowPlugin/TechTalk.SpecFlow.MSTest.SpecFlowPlugin.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>