Merge pull request #413 from compnerd/62-installer

WiX: restructure the Windows installer

Author: shahmishal

platforms/Windows/Directory.Build.props

@@ -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>
 
@@ -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>
 

platforms/Windows/Directory.Build.targets

@@ -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>
 

platforms/Windows/SideBySideUpgradeStrategy.props

@@ -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'">
@@ -64,8 +59,8 @@
       DbgUpgradeCode=$(DbgUpgradeCode);
       IdeUpgradeCode=$(IdeUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);
-      WindowsSDKUpgradeCode=$(WindowsSDKUpgradeCode);
-      AndroidSDKUpgradeCode=$(AndroidSDKUpgradeCode);
+      AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
+      WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
     </DefineConstants>
   </PropertyGroup>
 </Project>

platforms/Windows/bld/bld.wixproj

@@ -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>
@@ -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>