WiX: adjust the environment handling to handle dual purpose

Ensure that we properly handle the environment when installing.  When
performing a per-user install, we should modify the user's environment
variables and when performing a per-machine install, modify the system
environment variables.

Author: compnerd

platforms/Windows/bld.wxs

@@ -353,9 +353,14 @@
       </Component>
     </ComponentGroup>
 
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
-    </Component>
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="SystemEnvironmentVariables" Condition="MSIINSTALLPERUSER=0" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
+        <Environment Id="SystemPath" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
+      </Component>
+      <Component Id="UserEnvironmentVariables" Condition="MSIINSTALLPERUSER=1" Directory="INSTALLDIR" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
+        <Environment Id="UserPath" Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
+      </Component>
+    </ComponentGroup>
 
     <Feature Id="BuildTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Build Tools" Level="1" Title="Swift Build Tools">
       <ComponentGroupRef Id="binutils" />
@@ -371,7 +376,7 @@
 
       <ComponentGroupRef Id="ClangResources" />
 
-      <ComponentRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
 
     <UI>

platforms/Windows/runtime.wxs

@@ -99,9 +99,14 @@
       </Component>
     </ComponentGroup>
 
-    <Component Directory="INSTALLDIR" Id="EnvironmentVariables" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
-    </Component>
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="SystemEnvironmentVariables" Condition="MSIINSTALLPERUSER=0" Directory="INSTALLDIR" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
+        <Environment Id="SystemPath" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
+      </Component>
+      <Component Id="UserEnvironmentVariables" Condition="MSIINSTALLPERUSER=1" Directory="INSTALLDIR" Guid="b83f6521-8708-4e2d-afef-076d8cdd7528">
+        <Environment Id="UserPath" Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
+      </Component>
+    </ComponentGroup>
 
     <!-- Feature -->
     <Feature Id="SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows Runtime ($(var.ProcessorArchitecture))">
@@ -110,7 +115,7 @@
       <ComponentGroupRef Id="libdispatch" />
       <ComponentGroupRef Id="Foundation" />
 
-      <ComponentRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
 
     <Feature Id="SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities Windows ($(var.ProcessorArchitecture))" Level="1" Title="Swift Utilities Windows ($(var.ProcessorArchitecture))">

platforms/Windows/sdk.wxs

@@ -471,10 +471,16 @@
       </Component>
     </ComponentGroup>
 
-    <Component Directory="INSTALLDIR" Id="EnvironmentVariables" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
-      <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
-      <Environment Id="SDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
-    </Component>
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="SystemEnvironmentVariables" Condition="MSIINSTALLPERUSER=0" Directory="INSTALLDIR" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
+        <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
+        <Environment Id="SystemSDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
+      </Component>
+      <Component Id="UserEnvironmentVariables" Condition="MSIINSTALLPERUSER=1" Directory="INSTALLDIR" Guid="580f1edd-8744-4be8-8dd8-e519f70a91e4">
+        <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
+        <Environment Id="UserSDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="no" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
+      </Component>
+    </ComponentGroup>
 
     <!-- Features -->
     <Feature Id="SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows SDK ($(var.ProcessorArchitecture))">
@@ -502,7 +508,7 @@
 
       <ComponentGroupRef Id="SwiftShims" />
 
-      <ComponentRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
 
     <UI>