Skip to content

Support for building arm64 MSIs #5688

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
NikolaMilosavljevic merged 4 commits into from
Jun 27, 2020
Merged

Support for building arm64 MSIs #5688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae464cd
Support for building arm64 MSIs
NikolaMilosavljevic Jun 16, 2020
3ea3537
Support for building arm64 MSIs
NikolaMilosavljevic Jun 16, 2020
76c52cd
Allow override of InstallerVersion property
NikolaMilosavljevic Jun 23, 2020
23290cc
Merge branch 'arm64.win' of https://github.com/NikolaMilosavljevic/ar…
NikolaMilosavljevic Jun 23, 2020
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/packaging-tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<_osSupportsWixBasedInstallers Condition="'$(OS)' != 'Windows_NT'">false</_osSupportsWixBasedInstallers>

<_osArchSupportsWixBasedInstallers>$(_osSupportsWixBasedInstallers)</_osArchSupportsWixBasedInstallers>
<_osArchSupportsWixBasedInstallers Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'">false</_osArchSupportsWixBasedInstallers>
<_osArchSupportsWixBasedInstallers Condition="'$(TargetArchitecture)' == 'arm'">false</_osArchSupportsWixBasedInstallers>

<!--
Save the project's GenerateMSI setting. It's possible the current arch of the current OS
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/windows/bundle/bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
((VersionNT &gt; v6.1) OR (VersionNT = v6.1 AND ServicePackLevel &gt;= 1))
</bal:Condition>

<?if $(var.Platform)=x64?>
<?if $(var.Platform)=x64 or $(var.Platform)=arm64?>
<bal:Condition Message="#(loc.FailureNotSupportedX86OperatingSystem)">
VersionNT64
</bal:Condition>
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/windows/product/product.common.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">

<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />

<MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/windows/variables.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<?if $(var.Platform)=x86?>
<?define Program_Files="ProgramFilesFolder"?>
<?define Win64AttributeValue=no?>
<?elseif $(var.Platform)=x64?>
<?elseif $(var.Platform)=x64 or $(var.Platform)=arm64?>
<?define Program_Files="ProgramFiles64Folder"?>
<?define Win64AttributeValue=yes?>
<?else?>
Expand Down
9 changes: 8 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/windows/wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Text="IntermediateOutputRootPath not specified" />

<PropertyGroup>
<WixVersion>3.10.4</WixVersion>
<WixVersion>3.14.0.4118</WixVersion>
<WixToolsDir>$(IntermediateOutputRootPath)WixTools.$(WixVersion)/</WixToolsDir>
<!-- Used in WiX targets to locate files. -->
<WixInstallPath>$(WixToolsDir)</WixInstallPath>
Expand Down Expand Up @@ -183,10 +183,17 @@
GetBundleWixConfiguration">
<PropertyGroup>
<OutInstallerFile Condition="'$(OutInstallerFile)' == ''">$(InstallerFile)</OutInstallerFile>
<!--
Native arm64 MSI packages require version 500 of MSI database schema, see:
https://docs.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages
-->
<InstallerVersion Condition="'$(InstallerVersion)' == '' and '$(MsiArch)' == 'arm64'">500</InstallerVersion>
<InstallerVersion Condition="'$(InstallerVersion)' == ''">200</InstallerVersion>
</PropertyGroup>

<ItemGroup>
<CandleVariables Include="MicrosoftEula" Value="$(MSBuildThisFileDirectory)eula.rtf" />
<CandleVariables Include="InstallerVersion" Value="$(InstallerVersion)" />
</ItemGroup>
</Target>

Expand Down