Merge pull request #78 from sillsdev/add-win64-support-in-makewixfordirtree

 Added MakeWixForDirTree.SetWin64

Author: tombogle

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - [SIL.BuildTasks] Added FileUpdate.FileLocalePattern (optional param) to infer a locale (e.g., for a localized release notes file) to use when doing date insertion involving month names or abbreviations.
+- [SIL.BuildTasks] Added MakeWixForDirTree.SetWin64 (optional Boolean param) to set the Win64 attribute to "yes" when building wxs file to be used in a 64-bit installer.
 
 ### Changed
 

RecreateGuidDatabase/RecreateGuidDatabase.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Markdig.Signed" Version="0.41.1" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
     <PackageReference Include="SIL.ReleaseTasks.Dogfood" Version="[2.3.3-*,)" PrivateAssets="All" />
   </ItemGroup>
 </Project>

SIL.BuildTasks.AWS/SIL.BuildTasks.AWS.csproj

@@ -12,7 +12,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Markdig.Signed" Version="0.41.1" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
     <PackageReference Include="SIL.ReleaseTasks.Dogfood" Version="[2.3.3-*,)" PrivateAssets="All" />
   </ItemGroup>
   <!-- Collect all dependencies and include them in the package itself, next to the Task assembly. -->

SIL.BuildTasks.Tests/SIL.BuildTasks.Tests.csproj

@@ -14,8 +14,8 @@
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.28" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.3.2" />

SIL.BuildTasks/MakeWixForDirTree/MakeWixForDirTree.cs

@@ -86,6 +86,11 @@ public string IgnoreRegExPattern
 		/// </summary>
 		public bool CheckOnly { get; set; }
 
+		/// <summary>
+		/// Whether to add Win64="yes" (for use in 64-bit installer).
+		/// </summary>
+		public bool SetWin64 { get; set; }
+
 		/// <summary>
 		/// Directory where the installer source (.wixproj) is located.
 		/// If provided, is used to determine relative path of the components
@@ -391,6 +396,8 @@ private void ProcessFile(XmlNode parent, string path, XmlDocument doc, IdToGuidD
 				_filesChanged = true;        // this file is new
 			else
 				elemComp.SetAttribute("Guid", guid.ToUpper());
+			if (SetWin64)
+				elemComp.SetAttribute("Win64", "yes");
 			parent.AppendChild(elemComp);
 
 			var elemFile = doc.CreateElement("File", Xmlns);

SIL.BuildTasks/SIL.BuildTasks.csproj

@@ -11,7 +11,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Markdig.Signed" Version="0.41.1" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
     <PackageReference Include="SIL.Core" Version="7.0.0" />
     <PackageReference Include="SIL.ReleaseTasks.Dogfood" Version="[2.3.3-*,)" PrivateAssets="All" />
   </ItemGroup>

SIL.ReleaseTasks.Dogfood/SIL.ReleaseTasks.Dogfood.csproj

@@ -18,7 +18,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Markdig.Signed" Version="0.41.1" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
   </ItemGroup>
   <Import Project="..\SIL.ReleaseTasks\SIL.ReleaseTasks.Common.inc" />
 </Project>

SIL.ReleaseTasks.Tests/SIL.ReleaseTasks.Tests.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Markdig.Signed" Version="0.41.1" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.28" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

SIL.ReleaseTasks/SIL.ReleaseTasks.csproj

@@ -11,7 +11,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Markdig.Signed" Version="0.41.1" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
     <PackageReference Include="SIL.ReleaseTasks.Dogfood" Version="[2.3.3-*,)" PrivateAssets="All" />
   </ItemGroup>
   <Import Project="SIL.ReleaseTasks.Common.inc" />