From d15eee054bfb6e1f7ab6107170cd0ddd1b914f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1sp=C3=A1r=20Nagy?= <gaspar.nagy@gmail.com>
Date: Fri, 31 May 2024 16:07:18 +0200
Subject: [PATCH] Fix: Building a Reqnroll project on macOS ARM64 architecture
 (eg MacBook M1) fails (#152) (#153)

---
 .gitignore                                     |  2 --
 CHANGELOG.md                                   |  1 +
 ...lData.ReqnrollPlugin.IntegrationTest.csproj | 11 +----------
 ...erify.ReqnrollPlugin.IntegrationTest.csproj |  9 +--------
 .../Reqnroll.Tools.MsBuild.Generation.tasks    | 11 ++---------
 Tests/Reqnroll.Specs/Reqnroll.Specs.csproj     | 13 +------------
 ...oll.Tools.MsBuild.Generation.OwnTests.props | 18 ++++++++++++++++++
 ...oll.Tools.MsBuild.Generation.OwnTests.tasks | 16 ++++++++++++++++
 8 files changed, 40 insertions(+), 41 deletions(-)
 create mode 100644 Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props
 create mode 100644 Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.tasks

diff --git a/.gitignore b/.gitignore
index 35d83bac2..e5440cfd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -367,8 +367,6 @@ Reqnroll.sln.GhostDoc.xml
 Features.Generated/
 GitExtensions.settings.backup
 
-/Installer/NuGetPackages/Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.targets
-/Installer/NuGetPackages/Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.props
 /Tests/Reqnroll.MsBuildNetSdk.IntegrationTests/Features/dummy.feature.cs
 *.feature.cs
 *.AssemblyHooks.cs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28791d08d..5a1cf4199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Bug fixes:
 
+* Fix: Building a Reqnroll project on macOS ARM64 architecture (eg MacBook M1) fails (#152)
 * Fix: xUnit .NET framework Reqnroll projects might not run BeforeTestRun even with the fix for #146 (#152)
 
 # v2.0.1 - 2024-05-29
diff --git a/Plugins/Reqnroll.ExternalData/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj b/Plugins/Reqnroll.ExternalData/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj
index abf210a9a..6e8850747 100644
--- a/Plugins/Reqnroll.ExternalData/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj
+++ b/Plugins/Reqnroll.ExternalData/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj
@@ -1,7 +1,7 @@
 <Project>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="..\..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.props" />
+  <Import Project="..\..\..\Tests\Reqnroll.Specs\build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -23,11 +23,6 @@
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
-  <PropertyGroup>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(Reqnroll_Core_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' != 'Core'">$(Reqnroll_FullFramework_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-  </PropertyGroup>
-
   <Target Name="PreBuild">
     <MSBuild Projects="..\..\..\Reqnroll.Tools.MsBuild.Generation\Reqnroll.Tools.MsBuild.Generation.csproj" ContinueOnError="false" Properties="TargetFramework=$(_Reqnroll_Needed_MSBuildGenerator)" />
     <MSBuild Projects="..\Reqnroll.ExternalData.ReqnrollPlugin\Reqnroll.ExternalData.ReqnrollPlugin.csproj" ContinueOnError="false" Properties="TargetFramework=netstandard2.0" />
@@ -37,10 +32,6 @@
     <ReqnrollGeneratorPlugins Include="$(MSBuildThisFileDirectory)..\Reqnroll.ExternalData.ReqnrollPlugin\bin\$(Configuration)\netstandard2.0\Reqnroll.ExternalData.ReqnrollPlugin.dll" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_Reqnroll_TaskAssembly>..\..\Reqnroll.Tools.MsBuild.Generation\bin\$(Configuration)\$(_Reqnroll_Needed_MSBuildGenerator)\tasks\Reqnroll.Tools.MsBuild.Generation.dll</_Reqnroll_TaskAssembly>
-  </PropertyGroup>
-
   <Import Project="..\..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.targets" />
   <!-- has to be before the PropertyGroup change-->
   <PropertyGroup>
diff --git a/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.csproj b/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.csproj
index fb0f900c3..af2dbacef 100644
--- a/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.csproj
+++ b/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.csproj
@@ -1,7 +1,7 @@
 <Project>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="..\..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.props" />
+  <Import Project="..\..\..\Tests\Reqnroll.Specs\build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -30,9 +30,6 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(Reqnroll_Core_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' != 'Core'">$(Reqnroll_FullFramework_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-
     <_VerifyGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_VerifyGeneratorPluginFramework>
     <_VerifyGeneratorPluginFramework Condition=" '$(MSBuildRuntimeType)' != 'Core'">net462</_VerifyGeneratorPluginFramework>
   </PropertyGroup>
@@ -52,10 +49,6 @@
     <Folder Include="Features\" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_Reqnroll_TaskAssembly>..\..\Reqnroll.Tools.MsBuild.Generation\bin\$(Configuration)\$(_Reqnroll_Needed_MSBuildGenerator)\tasks\Reqnroll.Tools.MsBuild.Generation.dll</_Reqnroll_TaskAssembly>
-  </PropertyGroup>
-
   <Import Project="..\..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.targets" />
   <!-- has to be before the PropertyGroup change-->
   <PropertyGroup>
diff --git a/Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.tasks b/Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.tasks
index 00eea34f0..fd8426526 100644
--- a/Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.tasks
+++ b/Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.tasks
@@ -1,13 +1,6 @@
 <Project>
-  <!-- Using `TaskHostFactory` ensures that the task assembly will not be locked
-       at the end of the build. If it's omitted, that can cause build failures
-       in subsequent builds because the task assembly can't be written by the
-       next build.
-
-       Reference: https://learn.microsoft.com/en-us/visualstudio/msbuild/how-to-configure-targets-and-tasks?view=vs-2022#task-factories
-  -->
-  <UsingTask TaskName="Reqnroll.Tools.MsBuild.Generation.GenerateFeatureFileCodeBehindTask" AssemblyFile="$(_Reqnroll_TaskAssembly)" TaskFactory="TaskHostFactory" />
-  <UsingTask TaskName="Reqnroll.Tools.MsBuild.Generation.ReplaceTokenInFileTask" AssemblyFile="$(_Reqnroll_TaskAssembly)" TaskFactory="TaskHostFactory" />
+  <UsingTask TaskName="Reqnroll.Tools.MsBuild.Generation.GenerateFeatureFileCodeBehindTask" AssemblyFile="$(_Reqnroll_TaskAssembly)" />
+  <UsingTask TaskName="Reqnroll.Tools.MsBuild.Generation.ReplaceTokenInFileTask" AssemblyFile="$(_Reqnroll_TaskAssembly)" />
 
   <PropertyGroup>
     <_ReqnrollTasksImported>true</_ReqnrollTasksImported>
diff --git a/Tests/Reqnroll.Specs/Reqnroll.Specs.csproj b/Tests/Reqnroll.Specs/Reqnroll.Specs.csproj
index 708f43139..7d8ef45d3 100644
--- a/Tests/Reqnroll.Specs/Reqnroll.Specs.csproj
+++ b/Tests/Reqnroll.Specs/Reqnroll.Specs.csproj
@@ -1,7 +1,7 @@
 <Project>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="../../Reqnroll.Tools.MsBuild.Generation/build/Reqnroll.Tools.MsBuild.Generation.props" />
+  <Import Project="build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -56,13 +56,6 @@
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
-  <PropertyGroup>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(Reqnroll_Core_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' != 'Core'">$(Reqnroll_FullFramework_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-  </PropertyGroup>
-
-
-
   <Target Name="WriteNuGetVersion" AfterTargets="GetBuildVersion" BeforeTargets="BeforeCompile" Condition="$(DesignTimeBuild) != 'true' OR '$(BuildingProject)' == 'true'">
     <ReplaceTextInFileTask InputFile="$(ProjectDir)\\NuGetPackageVersion.template.cs" OutputFile="$(ProjectDir)\\NuGetPackageVersion.cs" TextToReplace="NUGET_VERSION" TextToReplaceWith="$(PackageVersion)" WriteOnlyWhenChanged="true" />
 
@@ -80,10 +73,6 @@
     <ReqnrollGeneratorPlugins Include="$(MSBuildThisFileDirectory)..\..\Plugins\Reqnroll.xUnit.Generator.ReqnrollPlugin\bin\$(Configuration)\netstandard2.0\Reqnroll.xUnit.Generator.ReqnrollPlugin.dll" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_Reqnroll_TaskAssembly>..\..\Reqnroll.Tools.MsBuild.Generation\bin\$(Configuration)\$(_Reqnroll_Needed_MSBuildGenerator)\tasks\Reqnroll.Tools.MsBuild.Generation.dll</_Reqnroll_TaskAssembly>
-  </PropertyGroup>
-
   <Import Project="..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.targets" /> <!-- has to be before the PropertyGroup change-->
   <PropertyGroup>
     <BuildDependsOn>
diff --git a/Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props b/Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props
new file mode 100644
index 000000000..e10d3f487
--- /dev/null
+++ b/Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.props
@@ -0,0 +1,18 @@
+<Project TreatAsLocalProperty="TaskFolder;TaskAssembly">
+
+  <PropertyGroup>
+    <_ReqnrollTasksImported>true</_ReqnrollTasksImported>
+  </PropertyGroup>
+
+  <Import Project="../../../Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.props" />
+
+  <PropertyGroup>
+    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(Reqnroll_Core_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
+    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' != 'Core'">$(Reqnroll_FullFramework_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_Reqnroll_TaskAssembly>$(MSBuildThisFileDirectory)../../../Reqnroll.Tools.MsBuild.Generation/bin/$(Configuration)/$(_Reqnroll_Needed_MSBuildGenerator)/tasks/Reqnroll.Tools.MsBuild.Generation.dll</_Reqnroll_TaskAssembly>
+  </PropertyGroup>
+  <Import Project="Reqnroll.Tools.MsBuild.Generation.OwnTests.tasks" Condition="'$(_ReqnrollTasksOwnTestImported)' =='' " />
+
+</Project>
diff --git a/Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.tasks b/Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.tasks
new file mode 100644
index 000000000..3f2d25ad9
--- /dev/null
+++ b/Tests/Reqnroll.Specs/build/Reqnroll.Tools.MsBuild.Generation.OwnTests.tasks
@@ -0,0 +1,16 @@
+<Project>
+  <!-- Using `TaskHostFactory` ensures that the task assembly will not be locked
+       at the end of the build. If it's omitted, that can cause build failures
+       in subsequent builds because the task assembly can't be written by the
+       next build.
+
+       Reference: https://learn.microsoft.com/en-us/visualstudio/msbuild/how-to-configure-targets-and-tasks?view=vs-2022#task-factories
+  -->
+  <UsingTask TaskName="Reqnroll.Tools.MsBuild.Generation.GenerateFeatureFileCodeBehindTask" AssemblyFile="$(_Reqnroll_TaskAssembly)" TaskFactory="TaskHostFactory" />
+  <UsingTask TaskName="Reqnroll.Tools.MsBuild.Generation.ReplaceTokenInFileTask" AssemblyFile="$(_Reqnroll_TaskAssembly)" TaskFactory="TaskHostFactory" />
+
+  <PropertyGroup>
+    <_ReqnrollTasksImported>true</_ReqnrollTasksImported>
+    <_ReqnrollTasksOwnTestImported>true</_ReqnrollTasksOwnTestImported>
+  </PropertyGroup>
+</Project>
\ No newline at end of file