Merge upstream changes

.gitignore

@@ -125,7 +125,7 @@ bin/
 *.scc
 
 # BinLog artifacts
-msbuild.*.ProjectImports.zip
+msbuild*ProjectImports.zip
 
 # Chutzpah Test files
 _Chutzpah*

eng/Versions.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ToolsetVersion>3.0.100-preview-009722</ToolsetVersion>
+    <ToolsetVersion>3.0.100-preview-009724</ToolsetVersion>
   </PropertyGroup>
 
   <PropertyGroup>

src/redist/targets/packaging/windows/clisdk/bundle.thm

@@ -2,7 +2,7 @@
 <Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
   <Window Width="660" Height="488" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
     <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="682079">Segoe UI</Font>
+    <Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="792068">Segoe UI</Font>
     <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
     <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
@@ -11,7 +11,7 @@
     <Text X="11" Y="11" Width="-11" Height="64" FontId="1" Visible="yes" Center="yes" DisablePrefix="yes">#(loc.Title)</Text>
 
     <Page Name="Help">
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
+        <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
         <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
         <Text X="20" Y="115" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
@@ -96,4 +96,4 @@
         <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
         <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
     </Page>
-</Theme>
+</Theme>

src/redist/targets/packaging/windows/clisdk/bundle.wxl

@@ -5,13 +5,13 @@
   <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
   <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
   <String Id="HelpHeader">Setup Help</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or
+  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]"directory"[\]] - installs, repairs, uninstalls
-   creates a complete local copy of the bundle in directory. Install is the default.
+   or creates a complete local copy of the bundle in directory. '/install' is the default.
 
-/passive | /quiet -  displays minimal UI with no prompts or displays no UI and
+/passive | /quiet - displays minimal UI with no prompts or displays no UI and
    no prompts. By default UI and all prompts are displayed.
 
-/norestart   - suppress any attempts to restart. By default UI will prompt before restart.
+/norestart - suppress any attempts to restart. By default UI will prompt before restart.
 /log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
   <String Id="HelpCloseButton">&amp;Close</String>
   <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
@@ -49,7 +49,7 @@
   <String Id="FilesInUseCancelButton">&amp;Cancel</String>
   <String Id="FirstTimeWelcomeMessage">The installation was successful
 
-The following were installed at [DOTNETHOME]
+The following were installed at: '[DOTNETHOME]'
     • .NET Core SDK [DOTNETSDKVERSION]
     • .NET Core Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]

src/redist/targets/packaging/windows/clisdk/bundle.wxs

@@ -10,25 +10,93 @@
           AboutUrl="https://dotnet.github.io/"
           Compressed="yes">
 
+    <bal:Condition Message="The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X64]&quot;">
+        WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
+    </bal:Condition>
+      
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
       <bal:WixStandardBootstrapperApplication
         LicenseFile="dummyeula.rtf"
         ShowFilesInUse="yes"
-        ShowVersion="yes"
+        ShowVersion="yes" />
-        />
 
       <PayloadGroupRef Id="DotnetCoreBAPayloads" />
     </BootstrapperApplicationRef>
 
     <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
 
-    <Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="no" />
+      <util:RegistrySearch Id="CheckSDKInstallLocation_x86"
+              Variable="SDKInstallLocationExists_x86"
+              Result="exists"
+              Root="HKLM"
+              Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk"
+              Value="InstallLocation" />
+      <util:RegistrySearch Id="SDKInstallLocation_x86"
+              After="CheckSDKInstallLocation_x86"
+              Condition="SDKInstallLocationExists_x86"
+              Variable="DOTNETHOME_X86"
+              Result="value"
+              Root="HKLM"
+              Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk"
+              Value="InstallLocation" />
+
+      <util:FileSearch Id="DotnetExeSearch_x86"
+              After="SDKInstallLocation_x86"
+              Variable="DotnetExeExists_x86"
+              Condition="NOT SDKInstallLocationExists_x86"
+              Result="exists"
+              Path="[ProgramFilesFolder]dotnet\dotnet.exe"/>
+      <util:DirectorySearch Id="DotnetExeLocation_x86"
+              After="DotnetExeSearch_x86"
+              Condition="DotnetExeExists_x86"
+              Variable="DOTNETHOME_X86"
+              Path="[ProgramFilesFolder]dotnet"/>
+      
+    <util:RegistrySearch Id="CheckSDKInstallLocation_x64"
+              Variable="SDKInstallLocationExists_x64"
+              Result="exists"
+              Root="HKLM"
+              Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk"
+              Value="InstallLocation" />
+    <util:RegistrySearch Id="SDKInstallLocation_x64"
+              After="CheckSDKInstallLocation_x64"
+              Condition="SDKInstallLocationExists_x64"
+              Variable="DOTNETHOME_X64"
+              Result="value"
+              Root="HKLM"
+              Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk"
+              Value="InstallLocation" />
+
+    <util:FileSearch Id="DotnetExeSearch_x64"
+              After="SDKInstallLocation_x64"
+              Variable="DotnetExeExists_x64"
+              Condition="NOT SDKInstallLocationExists_x64"
+              Result="exists"
+              Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
+    <util:DirectorySearch Id="DotnetExeLocation_x64"
+              After="DotnetExeSearch_x64"
+              Condition="DotnetExeExists_x64"
+              Variable="DOTNETHOME_X64"
+              Path="[ProgramFiles64Folder]dotnet"/>
+
+    <!-- 
+        When installing the SDK bundle to a custom location using the commandline parameters, it is intended that 
+        both "DOTNETHOME_X86" and "DOTNETHOME_X64" should be used on the commandline and should take this convention:
+            DOTNETHOME_X86=<InstallFolder>\x86
+            DOTNETHOME_X64=<InstallFolder>\x64
+        Example:
+            dotnet-sdk-3.0.100-alpha1-009719-win-x64.exe /install DOTNETHOME_X64="D:\dotnet\x64" DOTNETHOME_X86="D:\dotnet\x86" /log "installation.log" /quiet /norestart
+    -->
+    <Variable Name="DOTNETHOME_X86" Type="string" Value="[ProgramFilesFolder]dotnet" bal:Overridable="yes" />
+    <Variable Name="DOTNETHOME_X64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
+    <Variable Name="DOTNETHOME" Type="string" Value="[DOTNETHOME_$(var.PlatformToken)]" bal:Overridable="no" />
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
     <Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.DisplayVersion)" bal:Overridable="no" />
     <Variable Name="DOTNETRUNTIMEVERSION" Type="string" Value="$(var.DotNetRuntimeVersion)" bal:Overridable="no" />
     <Variable Name="ASPNETCOREVERSION" Type="string" Value="$(var.AspNetCoreVersion)" bal:Overridable="no" />
-
+    <Variable Name="DOTNETHOMESIMILARITYCHECKOVERRIDE" Type="string" Value="" bal:Overridable="yes" />
-    <Chain DisableSystemRestore="yes" ParallelCache="yes">
+      
+      <Chain DisableSystemRestore="yes" ParallelCache="yes">
       <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
@@ -41,9 +109,12 @@
       <MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
-       <MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
+      <MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+        <MsiProperty Name="DOTNETHOME_X86" Value="[DOTNETHOME_X86]" />
+        <MsiProperty Name="DOTNETHOME_X64" Value="[DOTNETHOME_X64]" />
         <MsiProperty Name="EXEFULLPATH" Value="[WixBundleOriginalSource]" />
+        <MsiProperty Name="ALLOWCLISDKMSIINSTALL" Value="True" />
       </MsiPackage>
       <?if $(var.Platform)=x86?>
         <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>

src/redist/targets/packaging/windows/clisdk/dotnet.wxs

@@ -4,13 +4,17 @@
   <Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
     <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
 
+    <Condition Message="$(var.ProductName) must be installed as part of an SDK bundle installation.">
+        Installed OR ALLOWCLISDKMSIINSTALL
+    </Condition>
+
     <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
 
     <MediaTemplate CabinetTemplate="dnet-{0}.cab" CompressionLevel="high" />
 
     <Feature Id="MainFeature" Title="Main Feature" Level="1">
       <ComponentGroupRef Id="InstallFiles" />
-      <ComponentGroupRef Id="AuthoredRegistryKeys"/>
+      <ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>
     </Feature>
     <Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
       <ComponentRef Id="$(var.DependencyKeyId)" />

src/redist/targets/packaging/windows/clisdk/registrykeys.wxs

@@ -2,12 +2,24 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include "Variables.wxi" ?>
   <Fragment>
-    <ComponentGroup Id="AuthoredRegistryKeys">
+    <ComponentGroup Id="AuthoredRegistryKeys_x86node">
-      <Component Id="SetupRegistry_x86" Directory="TARGETDIR" Win64="no">
+      <Component Id="SetupRegistry" Directory="TARGETDIR" Win64="no">
         <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
           <RegistryValue Action="write" Name="$(var.NugetVersion)" Type="integer" Value="1" KeyPath="yes"/>
         </RegistryKey>
       </Component>
+      <Component Id="SDKInstallLocation_x64" Directory="TARGETDIR" Win64="no">
+        <Condition>VersionNT64 AND DOTNETHOME_X64</Condition>
+        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk">
+          <RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_X64]" KeyPath="yes"/>
+        </RegistryKey>
+      </Component>
+      <Component Id="SDKInstallLocation_x86" Directory="TARGETDIR" Win64="no">
+        <Condition>DOTNETHOME_X86</Condition>
+        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk">
+          <RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_X86]" KeyPath="yes"/>
+        </RegistryKey>
+      </Component>
     </ComponentGroup>
   </Fragment>
-</Wix>
+</Wix>

src/redist/targets/packaging/windows/clisdk/variables.wxi

@@ -17,10 +17,12 @@
 
   <?define Platform   =   "$(sys.BUILDARCH)" ?>
   <?if $(var.Platform)=x86?>
+  <?define PlatformToken="X86"?>
   <?define WixQuietExec="WixQuietExec"?>
   <?define Program_Files="ProgramFilesFolder"?>
   <?define Win64AttributeValue=no?>
   <?elseif $(var.Platform)=x64?>
+  <?define PlatformToken="X64"?>
   <?define WixQuietExec="WixQuietExec64"?>
   <?define Program_Files="ProgramFiles64Folder"?>
   <?define Win64AttributeValue=yes?>