From 040e7f5d84a9cd0751328782edd273a109fb3999 Mon Sep 17 00:00:00 2001
From: Sridhar Periyasamy <sridhper@microsoft.com>
Date: Fri, 20 Nov 2015 17:44:48 -0800
Subject: [PATCH] Change the install path, registry key path and environment
 component.

Install path is now %ProgramFiles%\dotnet
Registry root is now "HKLM\SOFTWARE\dotnet\Setup"
Env variables setup is now associated with a versioned component - the
registry keys. Environment resource cannot serve as a keypath hence it is
coupled with a registry key which is the key path for the component.
---
 packaging/windows/dotnet.wxs       |  8 +++-----
 packaging/windows/envvars.wxs      | 13 -------------
 packaging/windows/generatemsi.ps1  |  8 +++-----
 packaging/windows/registrykeys.wxs | 12 +++++++-----
 4 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 packaging/windows/envvars.wxs

diff --git a/packaging/windows/dotnet.wxs b/packaging/windows/dotnet.wxs
index 6c487db9b..c3123d83e 100644
--- a/packaging/windows/dotnet.wxs
+++ b/packaging/windows/dotnet.wxs
@@ -13,7 +13,6 @@
         <MediaTemplate CompressionLevel="mszip" EmbedCab="yes"/>
         <Feature Id="MainFeature" Title="Main Feature" Level="1">
             <ComponentGroupRef Id="InstallFiles" />
-            <ComponentRef Id="SetEnvVars" />
             <ComponentGroupRef Id="AuthoredRegistryKeys"/>
         </Feature>
         <Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
@@ -25,18 +24,17 @@
         <Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" />
         <!--Property Id="ARPNOMODIFY" Value="1" /-->
 
-
         <WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
 
         <Property Id="WIXUI_INSTALLDIR" Value="DOTNETHOME"/>
         <UIRef Id="WixUI_InstallDir" />
+
+        <CustomActionRef Id="WixBroadcastEnvironmentChange" />
     </Product>
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="$(var.Program_Files)" Name="$(var.Program_Files)">
-                <Directory Id="ProgramFilesFolder.Microsoft" Name="Microsoft">
-                    <Directory Id="DOTNETHOME" Name="dotnet"/>
-                </Directory>
+                <Directory Id="DOTNETHOME" Name="dotnet"/>
             </Directory>
         </Directory>
     </Fragment>
diff --git a/packaging/windows/envvars.wxs b/packaging/windows/envvars.wxs
deleted file mode 100644
index 60ffc6648..000000000
--- a/packaging/windows/envvars.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
-  <?include "Variables.wxi" ?>
-  <Fragment>
-    <DirectoryRef Id="TARGETDIR">
-        <Component Id="SetEnvVars" Guid="{E503A496-DE1B-4646-81D4-47213B4CCFAF}">
-            <Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" />
-            <Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" />              
-        </Component>
-    </DirectoryRef>
-    <CustomActionRef Id="WixBroadcastEnvironmentChange" />
-  </Fragment>
-</Wix>
\ No newline at end of file
diff --git a/packaging/windows/generatemsi.ps1 b/packaging/windows/generatemsi.ps1
index aa0f36fdb..b0a2bef2d 100644
--- a/packaging/windows/generatemsi.ps1
+++ b/packaging/windows/generatemsi.ps1
@@ -43,7 +43,7 @@ function RunHeat
 
     Write-Host Running heat..
 
-    .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Null
+    .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
 
     if($LastExitCode -ne 0)
     {
@@ -66,10 +66,9 @@ function RunCandle
     .\candle.exe -dDotnetSrc="$inputDir" -dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" -dBuildVersion="$env:DOTNET_BUILD_VERSION" -arch x64 `
         -ext WixDependencyExtension.dll `
         "$AuthWsxRoot\dotnet.wxs" `
-        "$AuthWsxRoot\envvars.wxs" `
         "$AuthWsxRoot\provider.wxs" `
         "$AuthWsxRoot\registrykeys.wxs" `
-        $InstallFileswsx | Out-Null
+        $InstallFileswsx | Out-Host
 
     if($LastExitCode -ne 0)
     {
@@ -91,11 +90,10 @@ function RunLight
     .\light -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
         -cultures:en-us `
         dotnet.wixobj `
-        envvars.wixobj `
         provider.wixobj `
         registrykeys.wixobj `
         $InstallFilesWixobj `
-        -out $DotnetMSIOutput | Out-Null
+        -out $DotnetMSIOutput | Out-Host
 
     if($LastExitCode -ne 0)
     {
diff --git a/packaging/windows/registrykeys.wxs b/packaging/windows/registrykeys.wxs
index feac69619..89196b7b9 100644
--- a/packaging/windows/registrykeys.wxs
+++ b/packaging/windows/registrykeys.wxs
@@ -4,12 +4,14 @@
   <Fragment>
     <ComponentGroup Id="AuthoredRegistryKeys">
       <Component Directory="TARGETDIR" Guid="*" Win64="$(var.Win64AttributeValue)">
-        <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Dotnet CLI\Setup">
-      <RegistryValue Action="write" Name="Install" Type="integer" Value="1" />
-            <RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
-            <RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
+        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup">
+          <RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
+          <RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
+          <RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
         </RegistryKey>
-      </Component>      
+        <Environment Id="E_PATH" Name="PATH" Value="[DOTNETHOME]bin" Permanent="no" Part="last" Action="set" System="yes" />
+        <Environment Id="E_DOTNET_HOME" Name="DOTNET_HOME" Value="[DOTNETHOME]" Permanent="no" Part="all" Action="set" System="yes" />
+      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>
\ No newline at end of file