Fix: xUnit .NET framework Reqnroll projects might not run BeforeTestR…

…un even with the fix for #146 (#152)
reqnroll · May 31, 2024 · 37b8b46 · 37b8b46
1 parent e6947b6
commit 37b8b46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # [vNext]
 
+## Bug fixes:
+
+* Fix: xUnit .NET framework Reqnroll projects might not run BeforeTestRun even with the fix for #146 (#152)
+
 # v2.0.1 - 2024-05-29
 
 ## Bug fixes:

diff --git a/Plugins/Reqnroll.xUnit.Generator.ReqnrollPlugin/build/Reqnroll.xUnit.targets b/Plugins/Reqnroll.xUnit.Generator.ReqnrollPlugin/build/Reqnroll.xUnit.targets
@@ -19,8 +19,9 @@
     <_Reqnroll_xUnitGeneratorPlugin>netstandard2.0</_Reqnroll_xUnitGeneratorPlugin>
     <_Reqnroll_xUnitGeneratorPluginPath>$(MSBuildThisFileDirectory)\$(_Reqnroll_xUnitGeneratorPlugin)\Reqnroll.xUnit.Generator.ReqnrollPlugin.dll</_Reqnroll_xUnitGeneratorPluginPath>
 
-    <_Reqnroll_xUnitRuntimePlugin>netstandard2.0</_Reqnroll_xUnitRuntimePlugin>
-    <_Reqnroll_xUnitRuntimePluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_Reqnroll_xUnitRuntimePlugin)\Reqnroll.xUnit.ReqnrollPlugin.dll</_Reqnroll_xUnitRuntimePluginPath>
+    <_Reqnroll_xUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_Reqnroll_xUnitRuntimePlugin>
+    <_Reqnroll_xUnitRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">netstandard2.0</_Reqnroll_xUnitRuntimePlugin>
+    <_Reqnroll_xUnitRuntimePluginPath>$(MSBuildThisFileDirectory)..\lib\$(_Reqnroll_xUnitRuntimePlugin)\Reqnroll.xUnit.ReqnrollPlugin.dll</_Reqnroll_xUnitRuntimePluginPath>
 
     <SourceReqnrollAssemblyHooksFile Condition="'$(SourceReqnrollAssemblyHooksFile)' == ''">$(MSBuildThisFileDirectory)xUnit.AssemblyHooks$(DefaultLanguageSourceExtension)</SourceReqnrollAssemblyHooksFile>
     <GenerateReqnrollAssemblyHooksFile Condition="'$(GenerateReqnrollAssemblyHooksFile)' == ''">true</GenerateReqnrollAssemblyHooksFile>