Skip to content

WiX: package the VC redist as part of the installation #251

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
Oct 18, 2023
Merged

WiX: package the VC redist as part of the installation #251

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
4 changes: 4 additions & 0 deletions platforms/Windows/bundle/installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<PropertyGroup>
<OutputType>Bundle</OutputType>
<DefaultCompressionLevel>$(BundleCompressionLevel)</DefaultCompressionLevel>
<VSMajorVersion Condition=" '$(VSVersion)' != '' ">$(VSVersion.Split('.')[0])</VSMajorVersion>
<VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
<DefineConstants>
$(DefineConstants);
VCRedistInstaller=$(VCRedistInstaller);
VCRedistDownloadUrl=$(VCRedistDownloadUrl);
INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
</DefineConstants>
Expand Down
10 changes: 10 additions & 0 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@
-->

<Chain>
<?if $(VCRedistInstaller) != ""?>
<BundlePackage
SourceFile="$(VCRedistInstaller)"
InstallCondition="OptionsInstallRtl"
Permanent="yes"
InstallArguments="/install /quiet /norestart"
DownloadUrl="$(VCRedistDownloadUrl)">
</BundlePackage>
<?endif?>

<MsiPackage
SourceFile="!(bindpath.rtl)\rtl.msi"
InstallCondition="OptionsInstallRtl"
Expand Down