From 51ff0e3e5effb436bd167ce0fd47949199a77f6a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 8 Feb 2019 14:02:27 -0800
Subject: [PATCH] Make license a link in the MSI (#8846)

---
 assets/Product.wxs        |  47 +++++++++++++++++++++-----------------
 assets/files.wxs          |   4 ++++
 assets/ps_black_32x32.ico | Bin 0 -> 4470 bytes
 3 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 assets/ps_black_32x32.ico

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 1350a30fa4..8d462fa834 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -44,7 +44,7 @@
     <WixVariable Id="WixUIBannerBmp" Value="assets\WixUIBannerBmp.bmp" />
     <WixVariable Id="WixUIDialogBmp" Value="assets\WixUIDialogBmp.bmp" />
     <WixVariable Id="WixUIExclamationIco" Value="assets\WixUIInfoIco.bmp" />
-    <WixVariable Id="WixUIInfoIco" Value="assets\WixUIInfoIco.bmp" />
+    <WixVariable Id="WixUIInfoIco" Value="assets\ps_black_32x32.ico" />
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Open $(env.ProductName)" />
     <!-- Default value of Checkbox of starting PowerShell after installation -->
     <Property Id="WixShellExecTarget" Value="[$(var.ProductDirectoryName)]pwsh.exe"/>
@@ -80,17 +80,19 @@
     </InstallExecuteSequence>
     <UI>
       <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
-        <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(env.ProductName)">
+        <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="yes" Text="!(loc.ExitDialogBitmap)" />
+        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" TabSkip="yes" />
+        <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" TabSkip="yes" />
+        <!-- divider between check boxes and button row -->
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"  />
+        <!-- Button row -->
+        <!-- Checkbox to allow starting PowerShell after the installation (in UI mode only) -->
+        <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(env.ProductName)" >
           <Condition Action="show">NOT Installed</Condition>
         </Control>
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
         <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
-        <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
-        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
-        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-        <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
-        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
-        <!-- Checkbox to allow starting PowerShell after the installation (in UI mode only) -->
       </Dialog>
       <InstallUISequence>
           <Show Dialog="MyExitDialog" OnExit="success" />
@@ -246,22 +248,29 @@
     <Property Id="REGISTER_MANIFEST" Value="1" />
     <Property Id="ADD_PATH" Value="1" />
     <Dialog Id="ExplorerContextMenuDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
+      <!-- Banner -->
+      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="yes" Text="!(loc.InstallDirDlgBannerBitmap)"/>
+      <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Optional Actions" TabSkip="yes" />
+      <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Initialization and Customization" TabSkip="yes" />
+      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" TabSkip="yes" />
       <!-- If the checkboxes are defined first, then they are first in the tab order and can be ticked and unticked using the spacebar -->
       <Control Id="AddToPathCheckBox" Type="CheckBox" X="20" Y="60" Width="290" Height="17" Property="ADD_PATH" CheckBoxValue="0" Text="Add $(var.ProductName) to Path Environment Variable"/>
       <Control Id="RegisterManifestCheckBox" Type="CheckBox" X="20" Y="80" Width="290" Height="17" Property="REGISTER_MANIFEST" CheckBoxValue="0" Text="Register Windows Event Logging Manifest"/>
       <Control Id="EnablePSRemotingCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="17" Property="ENABLE_PSREMOTING" CheckBoxValue="0" Text="Enable $(var.ProductName) remoting"/>
       <Control Id="ContextMenuOpenPowerShell" Type="CheckBox" X="20" Y="120" Width="290" Height="17" Property="ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL" CheckBoxValue="0" Text="Add '$(var.ExplorerContextSubMenuDialogText)' context menus to Explorer"/>
+      <Control Id="LicenseLink" Type="Hyperlink" X="20" Y="190" Width="214" Height="17">
+        <Text><![CDATA[<a href="https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt">The application is distributed under the MIT license.</a>]]></Text>
+      </Control>
+      <Control Id="TpnLink" Type="Hyperlink" X="20" Y="210" Width="290" Height="17">
+        <Text><![CDATA[<a href="https://github.com/PowerShell/PowerShell/blob/master/ThirdPartyNotices.txt">Please review the ThirdPartyNotices.txt</a>]]></Text>
+      </Control>
+      <!-- divider and bottom buttons -->
+      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>    
       <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"/>
       <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Cancel="yes" Default="yes" Text="!(loc.WixUINext)"/>
       <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
         <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
       </Control>
-
-      <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Optional Actions"/>
-      <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Initialization and Customization"/>
-      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)"/>
-      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/>
-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>        
     </Dialog>
   </UI>
 </Fragment>
@@ -272,7 +281,6 @@
       <!--
       First-time install dialog sequence:
       - WixUI_WelcomeDlg
-      - WixUI_LicenseAgreementDlg
       - WixUI_InstallDirDlg
       - ExplorerContextMenuDialog
       - WixUI_VerifyReadyDlg
@@ -310,16 +318,13 @@
       <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
       <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
 
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
       <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
 
-      <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
-
-      <Publish Dialog="ExplorerContextMenuDialog" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+      <Publish Dialog="ExplorerContextMenuDialog" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
       <Publish Dialog="ExplorerContextMenuDialog" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
 
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
       <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
       <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
       <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
diff --git a/assets/files.wxs b/assets/files.wxs
index 516d24626a..7841e2a04b 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -1863,6 +1863,9 @@
         <Component Id="cmp9B83A74D65192F635590641BFEF9F840" Guid="{BCE9433B-3470-4EFE-B735-081B17B5C82B}">
           <File Id="fil0D65BAB239F3AF9916D653C31460B0A6" KeyPath="yes" Source="$(env.ProductSourcePath)\assets\Powershell_av_colors.ico" />
         </Component>
+        <Component Id="cmpA5AD020C2A054BD299EA1D2439947B22" Guid="{35a82a3b-0b5b-472a-adba-77c68d978d16}">
+          <File Id="filFB936E0529C9496EA8132112A5C60E63" KeyPath="yes" Source="$(env.ProductSourcePath)\assets\ps_black_32x32.ico" />
+        </Component>
       </Directory>
       <Directory Id="dirC93D10F1DE914404E3248A7E28901CDC" Name="cs">
         <Component Id="cmp8CAF71174AEF09BEBBC46FBC901FF5DD" Guid="{29FD7D9F-CB72-4DF5-B1BC-5DDD110E35BB}">
@@ -2824,6 +2827,7 @@
       <ComponentRef Id="cmp51F4B23B87C6428B81ABAA8E8C913B99" />
       <ComponentRef Id="cmpE4A3A9C6EBE34E9AAF4EB02937545542" />
       <ComponentRef Id="cmp5297F3A0CC784D5FB179A2C5128882BA" />
+      <ComponentRef Id="cmpA5AD020C2A054BD299EA1D2439947B22" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/assets/ps_black_32x32.ico b/assets/ps_black_32x32.ico
new file mode 100644
index 0000000000000000000000000000000000000000..59e83ef8d61d3efc4238534898195689aa7fc897
GIT binary patch
literal 4470
zcmeH}Urbw79LK+~Yb^+r3l1o~?9|@M?WI6jM=6!UV5JBY3yjiHTWYyoPnK-aY;MK`
zlj&RxW(&qGTe283Gc?h-ESbro(Jaf%wk(oNADqTNQ6G48nJ+x!IR}U=5w{oOgZ-xG
z{(j%{x%b@W{LVc&KmiJ2w}VA9J~9LKzytmc>vQow*1B2a_X$ZWL0k*im9@vELYPew
z%1Vk*{)7pYrDjygB~YF$LG{)OJXKW+wZ?*mZI!5Z5O^HbXmHrzRjbfeZ$&_>L5E(8
zW|xX4w+^q%4qvkifkp?~wl|^Et7BJl9l|Z!(C;M(?{K2G&5cmI2N9nG(RK~dU^60J
zJ22u`5$kvwqn(YI=&VO#rwh;Z_>tb#fUzDgM#CL=KJ3M0zaPngXOIcGks0d1Kwk*M
zgMEk(b|V%YKr$Lade10~@d);&#<6cQh69;6UfjPAhxhNrkwY)x)q@9c_~k>GK5`Jp
zreDFEM_<ER$ByFdH>NRj{B@k1IgWQu%;4SG6F7Tn7UxdS;_R8zICth0&d<Gv`SWv_
ze}4`i%wNFAA6~$vi=W`~rHi=o>1BNW*%e&<@(WzQb`@V;zlNJPZs7K<oA~<nEi5c7
z;M;HR;O^b;@Z%5P<CmX*!tcNRip9l6+`IP&?%)3tOG`^wUS3{TtbCfEfz6qL6#aK?
zHcw7IyQ;pmM8y7BPW-X)c8grjB+LBAqJ_J1=AtV+U?ogetBoi;Vb_&t4Tu4fJql3?
z2?S&oRHD>z)mT~T%J2auM-`{0x-+?`gE*be-G*UI8R-DgR1z0F<<xbpF-B>sRnZ#8
zIA&bcH4@=GmGx=5t~U<lXf~v%jV&#{rj{n%<MF6L!D&!s#^Vf5QW|p;og*R5XYl9g
zpvh!1vsO7mX(m`K9QUTuq~LKA+o<_&{n$=}<{}l`F<($14GTV1EirA`A{9#86O<;r
z+%h8-b_$+rllW*{Qbi<3jn-8!wPyMIX~<MmRAd&-R60Rv2luSQyfrQOSn=QL%h3_b
znk^j@JY7?^s*-Sy?yg#MWyQUMXIok6xGdc{I$mdC8Lyu#m$4G@_0?su%2umY?#j`)
zgC%Q{T~mS&%e<_$!7NR<iBhZBNG+?f&88@E!BcfaRY}00DW6ScnVmIaCqz{S1vh-G
zSM8%|zp6S}rg6&>jRXZ}CDL@Qsn^fLI_av<5bJ-4l}-2XIzJ$fry(hL#!u}3B;tEP
zaB3vt6MNQa)l6ho-p}S>Bdt8Y5f$^hF=XUn&u`AI^5~=H&nfwH%A>EA{GI>T8F<(}
Zw%I&?PRXBB^5>L|j~bi({r%Vb-d}C%`m6u|

literal 0
HcmV?d00001