GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Make license a link in the MSI (#8846) · PowerShell/PowerShell@51ff0e3

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • assets
    • Product.wxs
    • files.wxs
    • ps_black_32x32.ico
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎assets/Product.wxs‎

Copy file name to clipboardExpand all lines: assets/Product.wxs
+26-21Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<WixVariable Id="WixUIBannerBmp" Value="assets\WixUIBannerBmp.bmp" />
4545
<WixVariable Id="WixUIDialogBmp" Value="assets\WixUIDialogBmp.bmp" />
4646
<WixVariable Id="WixUIExclamationIco" Value="assets\WixUIInfoIco.bmp" />
47-
<WixVariable Id="WixUIInfoIco" Value="assets\WixUIInfoIco.bmp" />
47+
<WixVariable Id="WixUIInfoIco" Value="assets\ps_black_32x32.ico" />
4848
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Open $(env.ProductName)" />
4949
<!-- Default value of Checkbox of starting PowerShell after installation -->
5050
<Property Id="WixShellExecTarget" Value="[$(var.ProductDirectoryName)]pwsh.exe"/>
@@ -80,17 +80,19 @@
8080
</InstallExecuteSequence>
8181
<UI>
8282
<Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
83-
<Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(env.ProductName)">
83+
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="yes" Text="!(loc.ExitDialogBitmap)" />
84+
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" TabSkip="yes" />
85+
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" TabSkip="yes" />
86+
<!-- divider between check boxes and button row -->
87+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes" />
88+
<!-- Button row -->
89+
<!-- Checkbox to allow starting PowerShell after the installation (in UI mode only) -->
90+
<Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(env.ProductName)" >
8491
<Condition Action="show">NOT Installed</Condition>
8592
</Control>
93+
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
8694
<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
8795
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
88-
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
89-
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
90-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
91-
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
92-
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
93-
<!-- Checkbox to allow starting PowerShell after the installation (in UI mode only) -->
9496
</Dialog>
9597
<InstallUISequence>
9698
<Show Dialog="MyExitDialog" OnExit="success" />
@@ -246,22 +248,29 @@
246248
<Property Id="REGISTER_MANIFEST" Value="1" />
247249
<Property Id="ADD_PATH" Value="1" />
248250
<Dialog Id="ExplorerContextMenuDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
251+
<!-- Banner -->
252+
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="yes" Text="!(loc.InstallDirDlgBannerBitmap)"/>
253+
<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" />
254+
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Initialization and Customization" TabSkip="yes" />
255+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" TabSkip="yes" />
249256
<!-- If the checkboxes are defined first, then they are first in the tab order and can be ticked and unticked using the spacebar -->
250257
<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"/>
251258
<Control Id="RegisterManifestCheckBox" Type="CheckBox" X="20" Y="80" Width="290" Height="17" Property="REGISTER_MANIFEST" CheckBoxValue="0" Text="Register Windows Event Logging Manifest"/>
252259
<Control Id="EnablePSRemotingCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="17" Property="ENABLE_PSREMOTING" CheckBoxValue="0" Text="Enable $(var.ProductName) remoting"/>
253260
<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"/>
261+
<Control Id="LicenseLink" Type="Hyperlink" X="20" Y="190" Width="214" Height="17">
262+
<Text><![CDATA[<a href="https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt">The application is distributed under the MIT license.</a>]]></Text>
263+
</Control>
264+
<Control Id="TpnLink" Type="Hyperlink" X="20" Y="210" Width="290" Height="17">
265+
<Text><![CDATA[<a href="https://github.com/PowerShell/PowerShell/blob/master/ThirdPartyNotices.txt">Please review the ThirdPartyNotices.txt</a>]]></Text>
266+
</Control>
267+
<!-- divider and bottom buttons -->
268+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>
254269
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"/>
255270
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Cancel="yes" Default="yes" Text="!(loc.WixUINext)"/>
256271
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
257272
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
258273
</Control>
259-
260-
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Optional Actions"/>
261-
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Initialization and Customization"/>
262-
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)"/>
263-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/>
264-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>
265274
</Dialog>
266275
</UI>
267276
</Fragment>
@@ -272,7 +281,6 @@
272281
<!--
273282
First-time install dialog sequence:
274283
- WixUI_WelcomeDlg
275-
- WixUI_LicenseAgreementDlg
276284
- WixUI_InstallDirDlg
277285
- ExplorerContextMenuDialog
278286
- WixUI_VerifyReadyDlg
@@ -310,16 +318,13 @@
310318
<Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
311319
<Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
312320

313-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
321+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
314322
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
315323

316-
<Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
317-
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
318-
319-
<Publish Dialog="ExplorerContextMenuDialog" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
324+
<Publish Dialog="ExplorerContextMenuDialog" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
320325
<Publish Dialog="ExplorerContextMenuDialog" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
321326

322-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
327+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
323328
<Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
324329
<Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
325330
<Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
Collapse file

‎assets/files.wxs‎

Copy file name to clipboardExpand all lines: assets/files.wxs
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,6 +1863,9 @@
18631863
<Component Id="cmp9B83A74D65192F635590641BFEF9F840" Guid="{BCE9433B-3470-4EFE-B735-081B17B5C82B}">
18641864
<File Id="fil0D65BAB239F3AF9916D653C31460B0A6" KeyPath="yes" Source="$(env.ProductSourcePath)\assets\Powershell_av_colors.ico" />
18651865
</Component>
1866+
<Component Id="cmpA5AD020C2A054BD299EA1D2439947B22" Guid="{35a82a3b-0b5b-472a-adba-77c68d978d16}">
1867+
<File Id="filFB936E0529C9496EA8132112A5C60E63" KeyPath="yes" Source="$(env.ProductSourcePath)\assets\ps_black_32x32.ico" />
1868+
</Component>
18661869
</Directory>
18671870
<Directory Id="dirC93D10F1DE914404E3248A7E28901CDC" Name="cs">
18681871
<Component Id="cmp8CAF71174AEF09BEBBC46FBC901FF5DD" Guid="{29FD7D9F-CB72-4DF5-B1BC-5DDD110E35BB}">
@@ -2824,6 +2827,7 @@
28242827
<ComponentRef Id="cmp51F4B23B87C6428B81ABAA8E8C913B99" />
28252828
<ComponentRef Id="cmpE4A3A9C6EBE34E9AAF4EB02937545542" />
28262829
<ComponentRef Id="cmp5297F3A0CC784D5FB179A2C5128882BA" />
2830+
<ComponentRef Id="cmpA5AD020C2A054BD299EA1D2439947B22" />
28272831
</ComponentGroup>
28282832
</Fragment>
28292833
</Wix>
Collapse file

‎assets/ps_black_32x32.ico‎

Copy file name to clipboard
4.37 KB
Binary file not shown.

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.