From 07c3931758dc141a44c04b64a92f2a99cb4c4152 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@microsoft.com>
Date: Tue, 20 Nov 2018 12:02:03 -0800
Subject: [PATCH] #3697 - override default install location

---
 .../Windows/SharedFramework/Product.wxs       | 24 +++++++++----------
 .../SharedFramework/SharedFramework.wixproj   |  2 +-
 .../Windows/SharedFrameworkLib/Library.wxs    |  6 +++++
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs
index c97b12e5c4..2a71da323a 100644
--- a/src/Installers/Windows/SharedFramework/Product.wxs
+++ b/src/Installers/Windows/SharedFramework/Product.wxs
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)"
+    <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)"
              Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+        <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallFinalize" />
+        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallFinalize" />
         <Media Id="1" Cabinet="$(var.Cabinet)" CompressionLevel="high" EmbedCab="$(var.EmbedCab)" />
 
         <WixVariable Id="WixUILicenseRtf" Value="$(var.files)\eula.rtf" />
@@ -13,7 +13,7 @@
         <FeatureRef Id="FT_DepProvider" />
         <FeatureRef Id="FT_AspNetCoreSharedFramework" />
         <FeatureRef Id="FT_ProductInfo" />
-	</Product>
+    </Product>
 
     <?ifdef PFilesFolder?>
     <?undef PFilesFolder?>
@@ -27,15 +27,15 @@
     <?error Invalid Platform ($(var.Platform))?>
     <?endif?>
 
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.PFilesFolder)">
-                <Directory Id="DotNetFolder" Name="dotnet">
+    <Fragment>
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="$(var.PFilesFolder)">
+                <Directory Id="DOTNETHOME" Name="dotnet">
                     <Directory Id="SharedFolder" Name="shared" />
                 </Directory>
-			</Directory>
-		</Directory>
-	</Fragment>
+            </Directory>
+        </Directory>
+    </Fragment>
 
     <Fragment>
         <Feature Id="FT_AspNetCoreSharedFramework" Absent="allow" Description="!(loc.FT_AspNetCoreSharedFrameworkDescription)" Display="2" Level="1" Title="!(loc.FT_AspNetCoreSharedFrameworkTitle)">
@@ -73,7 +73,7 @@
 
             <Component Id="C_ProductInstallDir">
                 <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework" Root="HKLM">
-                    <RegistryValue Name="InstallDir" Type="string" Value="[DotNetFolder]" />
+                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
                 </RegistryKey>
             </Component>
         </DirectoryRef>
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index 5dd1ce6809..e2689d09d5 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -42,7 +42,7 @@
     <HarvestDirectory Include="$(HarvestSource)">
       <SuppressRootDirectory>true</SuppressRootDirectory>
       <ComponentGroupName>CG_AspNetCoreSharedFramework</ComponentGroupName>
-      <DirectoryRefId>DotNetFolder</DirectoryRefId>
+      <DirectoryRefId>DOTNETHOME</DirectoryRefId>
       <PreprocessorVariable>var.AspNetCoreSharedFrameworkSource</PreprocessorVariable>
     </HarvestDirectory>
   </ItemGroup>
diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
index e3a367a7e4..707e6238ad 100644
--- a/src/Installers/Windows/SharedFrameworkLib/Library.wxs
+++ b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
@@ -7,10 +7,15 @@
             <?ifdef SharedFrameworkInstallCondition?>
             <?undef SharedFrameworkInstallCondition?>
             <?endif?>
+            <?ifdef DotNetHome?>
+            <?undef DotNetHome?>
+            <?endif?>
             <?if $(var.Platform)=x86?>
             <?define SharedFrameworkInstallCondition=(NOT OPT_NO_SHAREDFX) AND (NOT OPT_NO_X86)?>
+            <?define DotNetHome=DOTNETHOME_X86?>
             <?elseif $(var.Platform)=x64?>
             <?define SharedFrameworkInstallCondition=VersionNT64 AND (NOT OPT_NO_SHAREDFX)?>
+            <?define DotNetHome=DOTNETHOME_X64?>
             <?endif?>
 
             <?define SourceFile=$(var.BinPath)\aspnetcore-runtime-$(var.PackageVersion)-win-$(var.Platform).msi?>
@@ -21,6 +26,7 @@
                         Visible="no"
                         Vital="yes"
                         InstallCondition="$(var.SharedFrameworkInstallCondition)">
+                <MsiProperty Name="DOTNETHOME" Value="[$(var.DotNetHome)]" />
                 <Payload Name="sfx_$(var.Platform).cab" SourceFile="$(var.BinPath)\sfx_$(var.Platform).cab"/>
             </MsiPackage>
         </PackageGroup>