From ead57a58e1ddf5abefe6de308a8f0edbaad05ecf Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 17 Apr 2017 13:57:41 -0700
Subject: [PATCH 1/2] Removing the location option from the msi installer.

---
 packaging/windows/clisdk/bundle.thm | 11 -----------
 packaging/windows/clisdk/bundle.wxl |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm
index 9c962acdf..ac5d67618 100644
--- a/packaging/windows/clisdk/bundle.thm
+++ b/packaging/windows/clisdk/bundle.thm
@@ -31,17 +31,6 @@
         <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
         <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
     </Page>
-    <Page Name="Options">
-        <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
-
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
-        <Text X="11" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
-        <Editbox Name="FolderEditbox" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
-        <Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
-        <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
-        <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
-    </Page>
     <Page Name="FilesInUse">
         <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
 
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index c7ade785c..52c10481e 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -21,11 +21,6 @@ Ready? Set? Let's go!</String>
   <String Id="InstallOptionsButton">&amp;Options</String>
   <String Id="InstallInstallButton">&amp;Install</String>
   <String Id="InstallCloseButton">&amp;Close</String>
-  <String Id="OptionsHeader">Setup Options</String>
-  <String Id="OptionsLocationLabel">Install location:</String>
-  <String Id="OptionsBrowseButton">&amp;Browse</String>
-  <String Id="OptionsOkButton">&amp;OK</String>
-  <String Id="OptionsCancelButton">&amp;Cancel</String>
   <String Id="ProgressHeader">Setup Progress</String>
   <String Id="ProgressLabel">Processing:</String>
   <String Id="OverallProgressPackageText">Initializing...</String>

From 3464af99d4ca5b32d499425e799c00728eaaad7b Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Wed, 19 Apr 2017 17:15:32 -0700
Subject: [PATCH 2/2] The previous commit removed the location option from the
 bundle. This one removes it from the sdk msi.

---
 packaging/windows/clisdk/dotnet.wxs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packaging/windows/clisdk/dotnet.wxs b/packaging/windows/clisdk/dotnet.wxs
index 4624a144b..5b2aa1764 100644
--- a/packaging/windows/clisdk/dotnet.wxs
+++ b/packaging/windows/clisdk/dotnet.wxs
@@ -24,9 +24,6 @@
 
         <WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
 
-        <Property Id="WIXUI_INSTALLDIR" Value="DOTNETHOME"/>
-        <UIRef Id="WixUI_InstallDir" />
-
         <CustomActionRef Id="WixBroadcastEnvironmentChange" />
     </Product>
     <Fragment>