Skip to content
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

WiX: restructure the Windows installer #406

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5,210 −2,440
Open

WiX: restructure the Windows installer #406

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
26 changes: 4 additions & 22 deletions platforms/Windows/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,6 @@

<Import Project="$(USERNAME).props" Condition="Exists('$(USERNAME).props')" />

<PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
<PLATFORM_ROOT>$(PLATFORM_ROOT_X86)</PLATFORM_ROOT>
<SDK_ROOT>$(SDK_ROOT_X86)</SDK_ROOT>
</PropertyGroup>

<PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
<PLATFORM_ROOT>$(PLATFORM_ROOT_AMD64)</PLATFORM_ROOT>
<SDK_ROOT>$(SDK_ROOT_AMD64)</SDK_ROOT>
</PropertyGroup>

<PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
<PLATFORM_ROOT>$(PLATFORM_ROOT_ARM)</PLATFORM_ROOT>
<SDK_ROOT>$(SDK_ROOT_ARM)</SDK_ROOT>
</PropertyGroup>

<PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
<PLATFORM_ROOT>$(PLATFORM_ROOT_ARM64)</PLATFORM_ROOT>
<SDK_ROOT>$(SDK_ROOT_ARM64)</SDK_ROOT>
</PropertyGroup>

<PropertyGroup>
<DefaultCompressionLevel Condition="'$(DefaultCompressionLevel)' == ''">$(PackageCompressionLevel)</DefaultCompressionLevel>

Expand All @@ -100,8 +80,10 @@
IsBundleCompressed=$(IsBundleCompressed);
ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
SDK_ROOT=$(SDK_ROOT);
PLATFORM_ROOT=$(PLATFORM_ROOT);
ImageRoot=$(ImageRoot);
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
WindowsRuntimeX64=$(WindowsRuntimeX64);
WindowsRuntimeX86=$(WindowsRuntimeX86);
</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'sdk' AND '$(MSBuildProjectName)' != 'rtllib' AND '$(MSBuildProjectName)' != 'rtlmsm'">
<ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'rtllib' AND '$(MSBuildProjectName)' != 'rtlmsm'">
<ProjectReference Include="$(MSBuildThisFileDirectory)shared\shared.wixproj" />
</ItemGroup>

Expand Down
13 changes: 4 additions & 9 deletions platforms/Windows/SideBySideUpgradeStrategy.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@
<DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
<IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
<RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
<WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{443F4D7F-38F3-47C8-9BEE-37FEB01D13C8}</WindowsSDKUpgradeCode>
<WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{762D10FE-EBE5-4554-BB78-FB13A4A487E3}</WindowsSDKUpgradeCode>
<WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{9749D9E6-E860-4FF6-9E8A-525270F471A3}</WindowsSDKUpgradeCode>
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{485f88f4-9342-48cb-853a-12da885a5818}</AndroidSDKUpgradeCode>
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{0838ee60-5d4a-4832-b844-73dad6eb1cc1}</AndroidSDKUpgradeCode>
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm' ">{1269a926-3528-4ab7-b4d6-386d5c3f903a}</AndroidSDKUpgradeCode>
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{d889349b-0000-4600-a04a-93602525d5db}</AndroidSDKUpgradeCode>
<AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
<WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
</PropertyGroup>

<PropertyGroup Condition="'$(MajorMinorProductVersion)' == '0.0'">
Expand Down Expand Up @@ -60,8 +55,8 @@
DbgUpgradeCode=$(DbgUpgradeCode);
IdeUpgradeCode=$(IdeUpgradeCode);
RtlUpgradeCode=$(RtlUpgradeCode);
WindowsSDKUpgradeCode=$(WindowsSDKUpgradeCode);
AndroidSDKUpgradeCode=$(AndroidSDKUpgradeCode);
AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
</DefineConstants>
</PropertyGroup>
</Project>
13 changes: 6 additions & 7 deletions platforms/Windows/bld/bld.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<PropertyGroup>
<DefineConstants>
$(DefineConstants);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
_USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
_USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
WORKAROUND_MIMALLOC_ISSUE_997=$(WORKAROUND_MIMALLOC_ISSUE_997);
</DefineConstants>
</PropertyGroup>
Expand All @@ -14,21 +13,21 @@
</ItemGroup>

<ItemGroup>
<HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\clang">
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
<ComponentGroupName>ClangResources</ComponentGroupName>
<DirectoryRefId>_usr_lib_clang</DirectoryRefId>
<PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_CLANG</PreprocessorVariable>
<PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
<SuppressRootDirectory>true</SuppressRootDirectory>
</HarvestDirectory>
</ItemGroup>

<ItemGroup>
<HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
<ComponentGroupName>SwiftClangResources</ComponentGroupName>
<DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
<PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
<PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
<SuppressRootDirectory>true</SuppressRootDirectory>
Expand Down
Loading