Skip to content

Commit 179a276

Browse files
borisonekenobiborisonekenobi
committed
Changes:
Installer no longer has license agreement Installer has a checkbox to choose whether shortcut should be installed
1 parent 8adce5e commit 179a276

File tree

7 files changed

+177
-5
lines changed

7 files changed

+177
-5
lines changed

‎.vs/imageResizer/v17/.suo‎

14.5 KB
Binary file not shown.

‎imageResizer/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("6.1.0")]
35-
[assembly: AssemblyFileVersion("6.1.0")]
34+
[assembly: AssemblyVersion("6.2.0")]
35+
[assembly: AssemblyFileVersion("6.2.0")]

‎imageResizerInstaller/InstallerUI_InstallDir.wxs‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3+
4+
5+
6+
<!--
7+
First-time install dialog sequence:
8+
- WixUI_WelcomeDlg
9+
- WixUI_LicenseAgreementDlg
10+
- WixUI_InstallDirDlg
11+
- WixUI_VerifyReadyDlg
12+
- WixUI_DiskCostDlg
13+
Maintenance dialog sequence:
14+
- WixUI_MaintenanceWelcomeDlg
15+
- WixUI_MaintenanceTypeDlg
16+
- WixUI_InstallDirDlg
17+
- WixUI_VerifyReadyDlg
18+
Patch dialog sequence:
19+
- WixUI_WelcomeDlg
20+
- WixUI_VerifyReadyDlg
21+
-->
22+
23+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
24+
<Fragment>
25+
<UI Id="InstallerUI_InstallDir">
26+
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
27+
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
28+
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
29+
30+
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
31+
<Property Id="WixUI_Mode" Value="InstallDir" />
32+
33+
<DialogRef Id="BrowseDlg" />
34+
<DialogRef Id="DiskCostDlg" />
35+
<DialogRef Id="ErrorDlg" />
36+
<DialogRef Id="FatalError" />
37+
<DialogRef Id="FilesInUse" />
38+
<DialogRef Id="MsiRMFilesInUse" />
39+
<DialogRef Id="PrepareDlg" />
40+
<DialogRef Id="ProgressDlg" />
41+
<DialogRef Id="ResumeDlg" />
42+
<DialogRef Id="UserExit" />
43+
44+
<Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
45+
<Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
46+
47+
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
48+
49+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallerUI_InstallDirDlg">NOT Installed</Publish>
50+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
51+
52+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
53+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
54+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
55+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
56+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
57+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
58+
<Publish Dialog="InstallerUI_InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
59+
60+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallerUI_InstallDirDlg" Order="1">NOT Installed</Publish>
61+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
62+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
63+
64+
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
65+
66+
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
67+
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
68+
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
69+
70+
<Property Id="ARPNOMODIFY" Value="1" />
71+
</UI>
72+
73+
<UIRef Id="WixUI_Common" />
74+
</Fragment>
75+
</Wix>

‎imageResizerInstaller/InstallerUI_InstallDirDlg.wxs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3+
4+
5+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
6+
<Fragment>
7+
<UI>
8+
<Dialog Id="InstallerUI_InstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
9+
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
10+
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
11+
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
12+
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
13+
</Control>
14+
15+
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
16+
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
17+
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
18+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
19+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
20+
21+
<Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
22+
<Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
23+
<Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
24+
25+
<Control Id="InstallShortcutCheckbox" Type="CheckBox" X="20" Y="140" Width="200" Height="17" Property="INSTALLSHORTCUT" CheckBoxValue="1" Text="Create a desktop shortcut" />
26+
</Dialog>
27+
</UI>
28+
</Fragment>
29+
</Wix>

‎imageResizerInstaller/Product.wxs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<Product Id="*" Name="imageResizer" Language="1033" Version="6.1.0" Manufacturer="Boris Vasilev" UpgradeCode="d5f843f3-27cf-45a2-acd7-1ad08d67fe61">
3+
<Product Id="*" Name="imageResizer" Language="1033" Version="6.2.0" Manufacturer="Boris Vasilev" UpgradeCode="d5f843f3-27cf-45a2-acd7-1ad08d67fe61">
44
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
55

66
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@@ -10,6 +10,10 @@
1010
<ComponentGroupRef Id="ProductComponents" />
1111
<ComponentRef Id="imageResizerShortcut" />
1212
</Feature>
13+
14+
<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\license.rtf" />
15+
16+
<Property Id="INSTALLSHORTCUT" Secure="yes"/>
1317
</Product>
1418

1519
<Fragment>
@@ -19,6 +23,7 @@
1923
</Directory>
2024
<Directory Id="DesktopFolder" Name="Desktop">
2125
<Component Id="imageResizerShortcut" Guid="*">
26+
<Condition>INSTALLSHORTCUT</Condition>
2227
<Shortcut Id="imageResizerShortcutShortcut"
2328
Name="Image Resizer"
2429
Description="Resizer for your images"
@@ -34,8 +39,9 @@
3439
</Component>
3540
</Directory>
3641
</Directory>
37-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
38-
<UIRef Id="WixUI_InstallDir" />
42+
43+
<UIRef Id="InstallerUI_InstallDir" />
44+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
3945
</Fragment>
4046

4147
<Fragment>

‎imageResizerInstaller/imageResizerInstaller.wixproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
2121
</PropertyGroup>
2222
<ItemGroup>
23+
<Compile Include="InstallerUI_InstallDir.wxs" />
24+
<Compile Include="InstallerUI_InstallDirDlg.wxs" />
2325
<Compile Include="Product.wxs" />
2426
</ItemGroup>
2527
<ItemGroup>
@@ -38,6 +40,9 @@
3840
<Name>WixUIExtension</Name>
3941
</WixExtension>
4042
</ItemGroup>
43+
<ItemGroup>
44+
<Content Include="license.rtf" />
45+
</ItemGroup>
4146
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
4247
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
4348
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

‎imageResizerInstaller/license.rtf‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
test
2+
test
3+
test
4+
test
5+
test
6+
test
7+
test
8+
test
9+
test
10+
test
11+
test
12+
test
13+
test
14+
test
15+
test
16+
test
17+
test
18+
test
19+
test
20+
test
21+
test
22+
test
23+
test
24+
test
25+
test
26+
test
27+
test
28+
test
29+
test
30+
test
31+
test
32+
test
33+
test
34+
test
35+
test
36+
test
37+
test
38+
test
39+
test
40+
test
41+
test
42+
test
43+
test
44+
test
45+
test
46+
test
47+
test
48+
test
49+
test
50+
test
51+
test
52+
test
53+
test
54+
test
55+
test
56+
test
57+
test

0 commit comments

Comments
 (0)