Skip to content

Added MakeWixForDirTree.SetWin64 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
Merged

Added MakeWixForDirTree.SetWin64 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion RecreateGuidDatabase/RecreateGuidDatabase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion SIL.BuildTasks.AWS/SIL.BuildTasks.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down
4 changes: 2 additions & 2 deletions SIL.BuildTasks.Tests/SIL.BuildTasks.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
7 changes: 7 additions & 0 deletions SIL.BuildTasks/MakeWixForDirTree/MakeWixForDirTree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion SIL.BuildTasks/SIL.BuildTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SIL.ReleaseTasks.Dogfood/SIL.ReleaseTasks.Dogfood.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion SIL.ReleaseTasks.Tests/SIL.ReleaseTasks.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.ReleaseTasks/SIL.ReleaseTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading