WiX: switch to per-user MSIs for the toolchain

This adjusts the toolchain MSI packaging to use per-user installs rather
than per-machine.  While per-machine scope is preferable, this allows us
to drop the requirement for Administrator rights.  Longer term, we would
want dual-purpose MSIs when we can drive that from the bootstrapper UI.

Author: compnerd

platforms/Windows/bld.wxs

@@ -6,7 +6,7 @@
       Name="Swift Build Tools"
       UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perUser">
     <SummaryInformation Description="Swift Build Tools" />
 
     <!--

platforms/Windows/cli.wxs

@@ -6,7 +6,7 @@
       Name="Swift Command Line Tools"
       UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perUser">
     <SummaryInformation Description="Swift Command Line Tools" />
 
     <Media Id="1" Cabinet="cli.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/dbg.wxs

@@ -6,7 +6,7 @@
       Name="Swift Debugging Tools"
       UpgradeCode="91d382af-1e92-44dc-a4ad-aee91c1b5160"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perUser">
     <SummaryInformation Description="Swift Debugging Tools" />
 
     <Media Id="1" Cabinet="dbg.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/ide.wxs

@@ -6,7 +6,7 @@
       Name="Swift IDE Integration Tools"
       UpgradeCode="8dd91c86-d13d-490b-b06b-9522a9cf504c"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perUser">
     <SummaryInformation Description="Swift IDE Integration Tools" />
 
     <Media Id="1" Cabinet="ide.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/runtime.wxs

@@ -6,12 +6,12 @@
       Name="Swift Windows Runtime ($(var.ProcessorArchitecture))"
       UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perUser">
     <SummaryInformation Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" />
 
     <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" CompressionLevel="high" />
 
-    <StandardDirectory Id="ProgramFiles6432Folder">
+    <StandardDirectory Id="ProgramFilesFolder">
       <Directory Id="INSTALLDIR" Name="Swift">
         <Directory Id="Runtimes" Name="Runtimes">
           <Directory Id="_" Name="$(var.ProductVersion)">

platforms/Windows/sdk.wxs

@@ -6,7 +6,7 @@
       Name="Swift Windows SDK ($(var.ProcessorArchitecture))"
       UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perUser">
     <SummaryInformation Description="Swift Windows SDK ($(var.ProcessorArchitecture))" />
 
     <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" CompressionLevel="high" />