Skip to content

Commit

Permalink
upgrade to .NET 4.6.2 and xUnit 2.1.4 (#2634)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SabotageAndi
SabotageAndi authored Aug 10, 2022
1 parent 6c290dd commit a11a768
Show file tree
Hide file tree
Showing 31 changed files with 83 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>

<PropertyGroup>
<SpecFlow_FullFramework_TFM>net461</SpecFlow_FullFramework_TFM>
<SpecFlow_FullFramework_TFM>net462</SpecFlow_FullFramework_TFM>

<SpecFlow_Net6_TFM>net6.0</SpecFlow_Net6_TFM>

Expand Down
2 changes: 1 addition & 1 deletion ExternalRepositories/SpecFlow.TestProjectGenerator
Submodule SpecFlow.TestProjectGenerator updated 10 files
+4 −4 SpecFlow.TestProjectGenerator.Tests/ProjectTests.cs
+1 −1 SpecFlow.TestProjectGenerator.Tests/SolutionTests.cs
+2 −2 SpecFlow.TestProjectGenerator.Tests/TechTalk.SpecFlow.TestProjectGenerator.Tests.csproj
+1 −0 SpecFlow.TestProjectGenerator/Data/TargetFramework.cs
+1 −0 SpecFlow.TestProjectGenerator/Factories/ProjectBuilderFactory.cs
+2 −0 SpecFlow.TestProjectGenerator/FilesystemWriter/NetCoreSdkInfoProvider.cs
+1 −1 SpecFlow.TestProjectGenerator/FilesystemWriter/SolutionWriter.cs
+12 −13 SpecFlow.TestProjectGenerator/ProjectBuilder.cs
+1 −0 SpecFlow.TestProjectGenerator/TargetFrameworkMonikerStringBuilder.cs
+1 −0 SpecFlow.TestProjectGenerator/TargetFrameworkVersionStringBuilder.cs
8 changes: 4 additions & 4 deletions Installer/TechTalk.SpecFlow.CustomPlugin/SpecFlow.CustomPlugin.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@

<files>

<file src="bin\$config$\net461\Gherkin.dll" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net461\TechTalk.SpecFlow.Generator.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<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$\net462\Gherkin.dll" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.Generator.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.Utils.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.Parser.*" target="lib\$SpecFlow_FullFramework_Runtime_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$" />
Expand Down
4 changes: 2 additions & 2 deletions Plugins/SpecFlow.Autofac.SpecFlowPlugin/SpecFlow.Autofac.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<license type="file">LICENSE.txt</license>
<tags>specflow autofac di dependency injection</tags>
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<group targetFramework=".NETFramework4.6.2">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="Autofac" version="4.0.0" />
</group>
Expand All @@ -33,7 +33,7 @@

<files>
<file src="build\**\*" target="build" />
<file src="bin\$config$\net461\SpecFlow.Autofac.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\SpecFlow.Autofac.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<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$" />

Expand Down
2 changes: 1 addition & 1 deletion Plugins/SpecFlow.Autofac.SpecFlowPlugin/build/SpecFlow.Autofac.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>

<_SpecFlow_AutofacPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">netstandard2.0</_SpecFlow_AutofacPluginFramework>
<_SpecFlow_AutofacPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net461</_SpecFlow_AutofacPluginFramework>
<_SpecFlow_AutofacPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_SpecFlow_AutofacPluginFramework>
<_SpecFlow_AutofacPluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_SpecFlow_AutofacPluginFramework)\SpecFlow.Autofac.SpecFlowPlugin.dll</_SpecFlow_AutofacPluginPath>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions ...ternalData.SpecFlowPlugin.UnitTests/SpecFlow.ExternalData.SpecFlowPlugin.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ItemGroup>
<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">
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion ...s/SpecFlow.ExternalData/SpecFlow.ExternalData.SpecFlowPlugin/SpecFlow.ExternalData.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<files>
<file src="build\**\*" target="build"/>

<file src="bin\$config$\net461\**\*" target="build\net461"/>
<file src="bin\$config$\net462\**\*" target="build\net462"/>

<file src="bin\$config$\netcoreapp3.1\*" target="build\netcoreapp3.1"/>

Expand Down
2 changes: 1 addition & 1 deletion ...low.ExternalData/SpecFlow.ExternalData.SpecFlowPlugin/build/SpecFlow.ExternalData.targets
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ExternalDataGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_ExternalDataGeneratorPluginFramework>
<_ExternalDataGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' != 'Core'">net461</_ExternalDataGeneratorPluginFramework>
<_ExternalDataGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' != 'Core'">net462</_ExternalDataGeneratorPluginFramework>

<_ExternalDataGeneratorPluginPath>$(MSBuildThisFileDirectory)$(_ExternalDataGeneratorPluginFramework)\SpecFlow.ExternalData.SpecFlowPlugin.dll</_ExternalDataGeneratorPluginPath>

Expand Down
4 changes: 2 additions & 2 deletions Plugins/SpecFlow.Windsor.SpecFlowPlugin/SpecFlow.Windsor.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<license type="file">LICENSE.txt</license>
<tags>specflow castle windsor di dependency injection</tags>
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<group targetFramework=".NETFramework4.6.2">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="Castle.Windsor" version="5.1.2" />
</group>
Expand All @@ -34,7 +34,7 @@

<files>
<file src="build\**\*" target="build" />
<file src="bin\$config$\net461\SpecFlow.Windsor.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\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$\net6.0\SpecFlow.Windsor.SpecFlowPlugin.*" target="lib\$SpecFlow_Net6_TFM$" />
Expand Down
2 changes: 1 addition & 1 deletion Plugins/SpecFlow.Windsor.SpecFlowPlugin/build/SpecFlow.Windsor.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>

<_SpecFlow_WindsorPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">netstandard2.0</_SpecFlow_WindsorPluginFramework>
<_SpecFlow_WindsorPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net461</_SpecFlow_WindsorPluginFramework>
<_SpecFlow_WindsorPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_SpecFlow_WindsorPluginFramework>
<_SpecFlow_WindsorPluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_SpecFlow_WindsorPluginFramework)\SpecFlow.Windsor.SpecFlowPlugin.dll</_SpecFlow_WindsorPluginPath>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions Plugins/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin/SpecFlow.MSTest.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<tags>specflow mstest</tags>
<copyright>$copyright$</copyright>
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<group targetFramework=".NETFramework4.6.2">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
<dependency id="MSTest.TestFramework" version="2.1.2" />
Expand All @@ -36,12 +36,12 @@

<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$\net462\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_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$\net462\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_FullFramework_Generator_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$" />
Expand Down
4 changes: 2 additions & 2 deletions Plugins/TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin/build/SpecFlow.MsTest.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<PropertyGroup>

<_SpecFlow_MsTestGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_SpecFlow_MsTestGeneratorPlugin>
<_SpecFlow_MsTestGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'">net461</_SpecFlow_MsTestGeneratorPlugin>
<_SpecFlow_MsTestGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'">net462</_SpecFlow_MsTestGeneratorPlugin>
<_SpecFlow_MsTestGeneratorPluginPath>$(MSBuildThisFileDirectory)\$(_SpecFlow_MsTestGeneratorPlugin)\TechTalk.SpecFlow.MSTest.Generator.SpecFlowPlugin.dll</_SpecFlow_MsTestGeneratorPluginPath>

<_SpecFlow_MsTestRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">netstandard2.0</_SpecFlow_MsTestRuntimePlugin>
<_SpecFlow_MsTestRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net461</_SpecFlow_MsTestRuntimePlugin>
<_SpecFlow_MsTestRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_SpecFlow_MsTestRuntimePlugin>
<_SpecFlow_MsTestRuntimePluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_SpecFlow_MsTestRuntimePlugin)\TechTalk.SpecFlow.MSTest.SpecFlowPlugin.dll</_SpecFlow_MsTestRuntimePluginPath>

<SourceSpecFlowAssemblyHooksFile Condition="'$(SourceSpecFlowAssemblyHooksFile)' == ''">$(MSBuildThisFileDirectory)MSTest.AssemblyHooks$(DefaultLanguageSourceExtension)</SourceSpecFlowAssemblyHooksFile>
Expand Down
6 changes: 3 additions & 3 deletions Plugins/TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin/SpecFlow.NUnit.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<tags>specflow nunit</tags>
<copyright>$copyright$</copyright>
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<group targetFramework=".NETFramework4.6.2">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
<dependency id="NUnit" version="3.13.1" />
Expand All @@ -36,12 +36,12 @@

<files>
<file src="build\**\*" exclude="build\*.template.*" target="build" />
<file src="bin\$config$\net461\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Core_Runtime_TFM$" />
<file src="bin\$config$\net6.0\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.*" target="lib\$SpecFlow_Net6_TFM$" />

<file src="bin\$config$\net461\TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_FullFramework_Generator_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin.dll" target="build\$SpecFlow_Core_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin.pdb" target="build\$SpecFlow_Core_Generator_TFM$" />
<file src="bin\$config$\net6.0\TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_Net6_TFM$" />
Expand Down
4 changes: 2 additions & 2 deletions Plugins/TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin/build/SpecFlow.NUnit.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<PropertyGroup>

<_SpecFlow_NUnitGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_SpecFlow_NUnitGeneratorPlugin>
<_SpecFlow_NUnitGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'">net461</_SpecFlow_NUnitGeneratorPlugin>
<_SpecFlow_NUnitGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'">net462</_SpecFlow_NUnitGeneratorPlugin>
<_SpecFlow_NUnitGeneratorPluginPath>$(MSBuildThisFileDirectory)\$(_SpecFlow_NUnitGeneratorPlugin)\TechTalk.SpecFlow.NUnit.Generator.SpecFlowPlugin.dll</_SpecFlow_NUnitGeneratorPluginPath>

<_SpecFlow_NUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">netstandard2.0</_SpecFlow_NUnitRuntimePlugin>
<_SpecFlow_NUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net461</_SpecFlow_NUnitRuntimePlugin>
<_SpecFlow_NUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_SpecFlow_NUnitRuntimePlugin>
<_SpecFlow_NUnitRuntimePluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_SpecFlow_NUnitRuntimePlugin)\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.dll</_SpecFlow_NUnitRuntimePluginPath>

<SourceSpecFlowAssemblyHooksFile Condition="'$(SourceSpecFlowAssemblyHooksFile)' == ''">$(MSBuildThisFileDirectory)NUnit.AssemblyHooks$(DefaultLanguageSourceExtension)</SourceSpecFlowAssemblyHooksFile>
Expand Down
12 changes: 6 additions & 6 deletions Plugins/TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin/SpecFlow.xUnit.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@
<tags>specflow xUnit</tags>
<copyright>$copyright$</copyright>
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<group targetFramework=".NETFramework4.6.2">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
<dependency id="xunit.core" version="2.4.0" />
<dependency id="xunit.core" version="2.4.2" />
<dependency id="Xunit.SkippableFact" version="1.4.13" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
<dependency id="xunit.core" version="2.4.0" />
<dependency id="xunit.core" version="2.4.2" />
<dependency id="Xunit.SkippableFact" version="1.4.13" />
</group>
<group targetFramework="net6.0">
<dependency id="SpecFlow" version="[$version$]" />
<dependency id="SpecFlow.Tools.MsBuild.Generation" version="[$version$]" />
<dependency id="xunit.core" version="2.4.0" />
<dependency id="xunit.core" version="2.4.2" />
<dependency id="Xunit.SkippableFact" version="1.4.13" />
</group>
</dependencies>
</metadata>

<files>
<file src="build\**\*" exclude="build\*.template.*" target="build" />
<file src="bin\$config$\net461\TechTalk.SpecFlow.xUnit.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.xUnit.SpecFlowPlugin.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.xUnit.SpecFlowPlugin.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.xUnit.SpecFlowPlugin.pdb" target="lib\$SpecFlow_Core_Runtime_TFM$" />
<file src="bin\$config$\net6.0\TechTalk.SpecFlow.xUnit.SpecFlowPlugin.*" target="lib\$SpecFlow_Net6_TFM$" />

<file src="bin\$config$\net461\TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_FullFramework_Generator_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin.dll" target="build\$SpecFlow_Core_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin.pdb" target="build\$SpecFlow_Core_Generator_TFM$" />
<file src="bin\$config$\net6.0\TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin.*" target="build\$SpecFlow_Net6_TFM$" />
Expand Down
4 changes: 2 additions & 2 deletions Plugins/TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin/build/SpecFlow.xUnit.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<PropertyGroup>

<_SpecFlow_xUnitGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' == 'Core'" >netcoreapp3.1</_SpecFlow_xUnitGeneratorPlugin>
<_SpecFlow_xUnitGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'" >net461</_SpecFlow_xUnitGeneratorPlugin>
<_SpecFlow_xUnitGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'" >net462</_SpecFlow_xUnitGeneratorPlugin>
<_SpecFlow_xUnitGeneratorPluginPath>$(MSBuildThisFileDirectory)\$(_SpecFlow_xUnitGeneratorPlugin)\TechTalk.SpecFlow.xUnit.Generator.SpecFlowPlugin.dll</_SpecFlow_xUnitGeneratorPluginPath>

<_SpecFlow_xUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">netstandard2.0</_SpecFlow_xUnitRuntimePlugin>
<_SpecFlow_xUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net461</_SpecFlow_xUnitRuntimePlugin>
<_SpecFlow_xUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_SpecFlow_xUnitRuntimePlugin>
<_SpecFlow_xUnitRuntimePluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_SpecFlow_xUnitRuntimePlugin)\TechTalk.SpecFlow.xUnit.SpecFlowPlugin.dll</_SpecFlow_xUnitRuntimePluginPath>

<SourceSpecFlowAssemblyHooksFile Condition="'$(SourceSpecFlowAssemblyHooksFile)' == ''">$(MSBuildThisFileDirectory)xUnit.AssemblyHooks$(DefaultLanguageSourceExtension)</SourceSpecFlowAssemblyHooksFile>
Expand Down
2 changes: 1 addition & 1 deletion Plugins/TechTalk.SpecFlow.xUnit.SpecFlowPlugin/TechTalk.SpecFlow.xUnit.SpecFlowPlugin.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

<PackageReference Include="xunit.core" Version="2.4.0" />
<PackageReference Include="xunit.core" Version="2.4.2" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion SpecFlow.Tools.MsBuild.Generation/SpecFlow.Tools.MsBuild.Generation.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<files>
<file src="build\**\*" target="build" />
<file src="buildMultiTargeting\**\*" target="buildMultiTargeting" />
<file src="bin\$config$\net461\*.dll" target="tasks\$SpecFlow_FullFramework_Generator_TFM$" />
<file src="bin\$config$\net462\*.dll" target="tasks\$SpecFlow_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\*.dll" target="tasks\$SpecFlow_Core_Tools_TFM$" />
<file src="bin\$config$\netcoreapp3.1\*.deps.json" target="tasks\$SpecFlow_Core_Tools_TFM$" />

Expand Down
2 changes: 1 addition & 1 deletion SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<PropertyGroup>
<_SpecFlow_TaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' And '$(_SpecFlow_TaskFolder)' == ''">netcoreapp3.1</_SpecFlow_TaskFolder>
<_SpecFlow_TaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' And '$(_SpecFlow_TaskFolder)' == ''">net461</_SpecFlow_TaskFolder>
<_SpecFlow_TaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' And '$(_SpecFlow_TaskFolder)' == ''">net462</_SpecFlow_TaskFolder>
<_SpecFlow_TaskAssembly Condition=" '$(_SpecFlow_TaskAssembly)' == '' ">..\tasks\$(_SpecFlow_TaskFolder)\SpecFlow.Tools.MsBuild.Generation.dll</_SpecFlow_TaskAssembly>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions TechTalk.SpecFlow/SpecFlow.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<tags>specflow bdd gherkin cucumber</tags>
<copyright>$copyright$</copyright>
<dependencies>
<group targetFramework="net461">
<group targetFramework="net462">
<dependency id="BoDi" version="1.5.0" />
<dependency id="Gherkin" version="19.0.3"/>
<dependency id="Cucumber.CucumberExpressions" version="16.0.0"/>
Expand All @@ -40,7 +40,7 @@
<files>
<file src="build\**\*" target="build" />

<file src="bin\$config$\net461\TechTalk.SpecFlow.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="bin\$config$\net462\TechTalk.SpecFlow.*" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />
<file src="TechTalk.SpecFlow.ExternalAnnotations.xml" target="lib\$SpecFlow_FullFramework_Runtime_TFM$" />

<file src="bin\$config$\netstandard2.0\TechTalk.SpecFlow.dll" target="lib\$SpecFlow_Core_Runtime_TFM$" />
Expand Down
2 changes: 1 addition & 1 deletion Tests/TechTalk.SpecFlow.GeneratorTests/MSBuildRelativePathParserTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class MSBuildRelativePathParserTests

public MSBuildRelativePathParserTests()
{
#if NET461
#if NET462
string assemblyLocation = GetType().Assembly.CodeBase;
#else
string assemblyLocation = GetType().Assembly.Location;
Expand Down
Loading

0 comments on commit a11a768

Please sign in to comment.