From 62224cf5c909c6b9ea09eeb0bcf29021091e7665 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 18 Feb 2022 17:22:11 -0600
Subject: Create RequiresNativeWixAssets property.

---
 src/wix/Directory.Build.targets                    | 39 ++++++++++++++++++++++
 .../WixToolsetTest.BuildTasks.csproj               |  7 +---
 .../WixToolsetTest.Core.Native.csproj              |  7 +---
 .../WixToolsetTest.CoreIntegration.csproj          |  7 +---
 .../WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj   |  7 +---
 src/wix/wix/wix.csproj                             | 35 +------------------
 6 files changed, 44 insertions(+), 58 deletions(-)
 create mode 100644 src/wix/Directory.Build.targets

diff --git a/src/wix/Directory.Build.targets b/src/wix/Directory.Build.targets
new file mode 100644
index 00000000..d3c60a1e
--- /dev/null
+++ b/src/wix/Directory.Build.targets
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project>
+  <Import Project="..\Directory.Build.targets" />
+
+  <ItemGroup Condition=" '$(RequiresNativeWixAssets)'=='true' and ('$(TargetFrameworkIdentifier)'=='.NETFramework' or '$(RuntimeIdentifier)'!='' ) ">
+    <!-- Copy the x64 binaries when there is no RuntimeIdentifier since we've standardized on VS2022 (which is 64-bit) -->
+    <None Include="$(MSBuildThisFileDirectory)wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
+    <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
+
+    <None Include="$(MSBuildThisFileDirectory)wixnative\Win32\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
+    <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(RequiresNativeWixAssets)'=='true' and '$(TargetFrameworkIdentifier)'!='.NETFramework' and '$(RuntimeIdentifier)'=='' ">
+    <NativeLibrary Include="$(MSBuildThisFileDirectory)wixnative\ARM64\mergemod.dll" RuntimeIdentifier="win-arm64" />
+    <NativeLibrary Include="$(MSBuildThisFileDirectory)wixnative\x64\mergemod.dll" RuntimeIdentifier="win-x64" />
+    <NativeLibrary Include="$(MSBuildThisFileDirectory)wixnative\Win32\mergemod.dll" RuntimeIdentifier="win-x86" />
+    <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.exe" RuntimeIdentifier="win-arm64" />
+    <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" RuntimeIdentifier="win-x64" />
+    <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" RuntimeIdentifier="win-x86" />
+
+    <!--
+      This PackageReference is required so the RuntimeTargetsCopyLocalItems have a package (any package would
+      do, WixToolset.Data is as good as any) to "attach" themselves to.
+    -->
+    <PackageReference Include="WixToolset.Data" />
+
+    <RuntimeTargetsCopyLocalItems Include="@(NativeLibrary)" 
+                                  AssetType="native"
+                                  DestinationSubDirectory="runtimes\%(RuntimeIdentifier)\native\" 
+                                  NuGetPackageId="WixToolset.Data"
+                                  RuntimeIdentifier="%(RuntimeIdentifier)"
+                                  />
+    <None Include="@(RuntimeTargetsCopyLocalItems)" 
+          Link="%(DestinationSubDirectory)\%(FileName)%(Extension)" 
+          CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+</Project>
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 936fa4b9..4ae0f4a8 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -8,6 +8,7 @@
     <DebugType>embedded</DebugType>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SignOutput>false</SignOutput>
+    <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,12 +23,6 @@
     <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />
   </ItemGroup>
 
-  <!-- Copy the x64 binaries for unittests since we've standardized on VS2022 (which is 64-bit only) -->
-  <ItemGroup>
-    <None Include="..\..\wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" />
     <PackageReference Include="WixBuildTools.TestSupport" />
diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
index 44772187..66273be7 100644
--- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
@@ -7,18 +7,13 @@
     <IsPackable>false</IsPackable>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SignOutput>false</SignOutput>
+    <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <!-- Copy the x64 binaries for unittests since we've standardized on VS2022 (which is 64-bit only) -->
-  <ItemGroup>
-    <None Include="..\..\wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" />
   </ItemGroup>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index b84b1ed3..996858d1 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -7,18 +7,13 @@
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
     <SignOutput>false</SignOutput>
+    <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <!-- Copy the x64 binaries for unittests since we've standardized on VS2022 (which is 64-bit only) -->
-  <ItemGroup>
-    <None Include="..\..\wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\WixToolset.Core\WixToolset.Core.csproj" />
     <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
diff --git a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
index 44999f3d..5a6f6ad1 100644
--- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
@@ -8,18 +8,13 @@
     <DebugType>embedded</DebugType>
     <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
     <SignOutput>false</SignOutput>
+    <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <!-- Copy the x64 binaries for unittests since we've standardized on VS2022 (which is 64-bit only) -->
-  <ItemGroup>
-    <None Include="..\..\wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />
   </ItemGroup>
diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj
index a7df91f6..ec583475 100644
--- a/src/wix/wix/wix.csproj
+++ b/src/wix/wix/wix.csproj
@@ -14,6 +14,7 @@
     <ApplicationManifest>wix.exe.manifest</ApplicationManifest>
     <RollForward>Major</RollForward>
     <NuspecBasePath>$(OutputPath)publish\wix\</NuspecBasePath>
+    <RequiresNativeWixAssets Condition=" '$(NCrunch)'=='' ">true</RequiresNativeWixAssets>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,38 +25,4 @@
     <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'=='.NETFramework' and '$(NCrunch)'=='' ">
-    <!-- Copy the x64 binaries when there is no RuntimeIdentifier since we've standardized on VS2022 (which is 64-bit only) -->
-    <None Include="..\wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
-    <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
-
-    <None Include="..\wixnative\Win32\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
-    <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' and '$(NCrunch)'=='' ">
-    <NativeLibrary Include="..\wixnative\ARM64\mergemod.dll" RuntimeIdentifier="win-arm64" />
-    <NativeLibrary Include="..\wixnative\x64\mergemod.dll" RuntimeIdentifier="win-x64" />
-    <NativeLibrary Include="..\wixnative\Win32\mergemod.dll" RuntimeIdentifier="win-x86" />
-    <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.exe" RuntimeIdentifier="win-arm64" />
-    <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" RuntimeIdentifier="win-x64" />
-    <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" RuntimeIdentifier="win-x86" />
-
-    <!--
-      This PackageReference is required so the RuntimeTargetsCopyLocalItems have a package (any package would
-      do, WixToolset.Data is as good as any) to "attach" themselves to.
-    -->
-    <PackageReference Include="WixToolset.Data" />
-
-    <RuntimeTargetsCopyLocalItems Include="@(NativeLibrary)" 
-                                  AssetType="native"
-                                  DestinationSubDirectory="runtimes\%(RuntimeIdentifier)\native\" 
-                                  NuGetPackageId="WixToolset.Data"
-                                  RuntimeIdentifier="%(RuntimeIdentifier)"
-                                  />
-    <None Include="@(RuntimeTargetsCopyLocalItems)" 
-          Link="%(DestinationSubDirectory)\%(FileName)%(Extension)" 
-          CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
-- 
cgit v1.2.3-55-g6feb