Skip to content

Commit c857388

Browse files
emoachtemoacht
committed
Increment version to 1.6.1
1 parent e4fe53d commit c857388

File tree

4 files changed

+92
-92
lines changed

4 files changed

+92
-92
lines changed

‎Source/HelloSwitcher.Core/Properties/AssemblyInfo.cs‎

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

‎Source/HelloSwitcher.Service/Properties/AssemblyInfo.cs‎

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

‎Source/HelloSwitcher/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.6.0.0")]
55-
[assembly: AssemblyFileVersion("1.6.0.0")]
54+
[assembly: AssemblyVersion("1.6.1.0")]
55+
[assembly: AssemblyFileVersion("1.6.1.0")]
5656
[assembly: Guid("24aba232-090c-4c0e-8568-27e13b281fab")]

‎Source/Installer/Product.wxs‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<Product Id="*" Name="Hello Switcher" Manufacturer="emoacht" Version="1.6.0"
4-
Language="1033" Codepage="1252" UpgradeCode="{9043B009-DD4C-460D-9295-5B312A5E8948}">
5-
<Package Id="*" InstallerVersion="500" Compressed="yes"
6-
InstallScope="perMachine" InstallPrivileges="elevated"
7-
Description="Installer for Hello Switcher"/>
3+
<Product Id="*" Name="Hello Switcher" Manufacturer="emoacht" Version="1.6.1"
4+
Language="1033" Codepage="1252" UpgradeCode="{9043B009-DD4C-460D-9295-5B312A5E8948}">
5+
<Package Id="*" InstallerVersion="500" Compressed="yes"
6+
InstallScope="perMachine" InstallPrivileges="elevated"
7+
Description="Installer for Hello Switcher"/>
88

9-
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
10-
<MediaTemplate EmbedCab="yes"/>
9+
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
10+
<MediaTemplate EmbedCab="yes"/>
1111

12-
<!-- UI -->
13-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
14-
<UI>
15-
<UIRef Id="WixUI_InstallDir"/>
16-
<UIRef Id="WixUI_ErrorProgressText"/>
12+
<!-- UI -->
13+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
14+
<UI>
15+
<UIRef Id="WixUI_InstallDir"/>
16+
<UIRef Id="WixUI_ErrorProgressText"/>
1717

18-
<!-- Skip License Agreement Dialog -->
19-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
20-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
21-
</UI>
22-
<WixVariable Id="WixUIBannerBmp" Value="Resources\banner.png"/>
23-
<WixVariable Id="WixUIDialogBmp" Value="Resources\dialog.png"/>
18+
<!-- Skip License Agreement Dialog -->
19+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
20+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
21+
</UI>
22+
<WixVariable Id="WixUIBannerBmp" Value="Resources\banner.png"/>
23+
<WixVariable Id="WixUIDialogBmp" Value="Resources\dialog.png"/>
2424

25-
<Directory Id="TARGETDIR" Name="SourceDir">
26-
<!-- Program Files -->
27-
<Directory Id="ProgramFilesFolder">
28-
<Directory Id="INSTALLDIR" Name="$(var.HelloSwitcher.ProjectName)"/>
29-
</Directory>
25+
<Directory Id="TARGETDIR" Name="SourceDir">
26+
<!-- Program Files -->
27+
<Directory Id="ProgramFilesFolder">
28+
<Directory Id="INSTALLDIR" Name="$(var.HelloSwitcher.ProjectName)"/>
29+
</Directory>
3030

31-
<!-- Program Menu -->
32-
<Directory Id="ProgramMenuFolder"/>
31+
<!-- Program Menu -->
32+
<Directory Id="ProgramMenuFolder"/>
3333

34-
<!-- Common AppData -->
35-
<Directory Id="CommonAppDataFolder">
36-
<Directory Id="ApplicationCommonAppDataFolder" Name="$(var.HelloSwitcher.ProjectName)"/>
37-
</Directory>
38-
</Directory>
34+
<!-- Common AppData -->
35+
<Directory Id="CommonAppDataFolder">
36+
<Directory Id="ApplicationCommonAppDataFolder" Name="$(var.HelloSwitcher.ProjectName)"/>
37+
</Directory>
38+
</Directory>
3939

40-
<DirectoryRef Id="INSTALLDIR">
41-
<Component Id="MainExecutable" Guid="{CC02306D-3B7D-4A1B-8A6E-A49D245B59B0}">
42-
<File Id="MainExecutable"
43-
Source="$(var.HelloSwitcher.TargetPath)" Name="$(var.HelloSwitcher.TargetFileName)" KeyPath="yes"/>
44-
</Component>
40+
<DirectoryRef Id="INSTALLDIR">
41+
<Component Id="MainExecutable" Guid="{CC02306D-3B7D-4A1B-8A6E-A49D245B59B0}">
42+
<File Id="MainExecutable"
43+
Source="$(var.HelloSwitcher.TargetPath)" Name="$(var.HelloSwitcher.TargetFileName)" KeyPath="yes"/>
44+
</Component>
4545

46-
<Component Id="BehaviorsLibrary" Guid="{D21BCBC4-1E50-462C-A878-AD7AEB8ADF42}">
47-
<File Id="BehaviorsLibrary"
48-
Source="$(var.HelloSwitcher.TargetDir)" Name="Microsoft.Xaml.Behaviors.dll" KeyPath="yes"/>
49-
</Component>
46+
<Component Id="BehaviorsLibrary" Guid="{D21BCBC4-1E50-462C-A878-AD7AEB8ADF42}">
47+
<File Id="BehaviorsLibrary"
48+
Source="$(var.HelloSwitcher.TargetDir)" Name="Microsoft.Xaml.Behaviors.dll" KeyPath="yes"/>
49+
</Component>
5050

51-
<Component Id="CoreLibrary" Guid="{B44779A2-925F-4F75-BB3A-351856A21DD1}">
52-
<File Id="CoreLibrary"
53-
Source="$(var.HelloSwitcher.TargetDir)" Name="$(var.HelloSwitcher.TargetName).Core.dll" KeyPath="yes"/>
54-
</Component>
51+
<Component Id="CoreLibrary" Guid="{B44779A2-925F-4F75-BB3A-351856A21DD1}">
52+
<File Id="CoreLibrary"
53+
Source="$(var.HelloSwitcher.TargetDir)" Name="$(var.HelloSwitcher.TargetName).Core.dll" KeyPath="yes"/>
54+
</Component>
5555

56-
<Component Id="ServiceExecutable" Guid="{7D3E895B-90A0-4DBF-8E68-D2190B8696D9}">
57-
<File Id="ServiceExecutable"
58-
Source="$(var.HelloSwitcher.TargetDir)" Name="$(var.HelloSwitcher.TargetName).Service.exe" KeyPath="yes"/>
59-
</Component>
60-
</DirectoryRef>
56+
<Component Id="ServiceExecutable" Guid="{7D3E895B-90A0-4DBF-8E68-D2190B8696D9}">
57+
<File Id="ServiceExecutable"
58+
Source="$(var.HelloSwitcher.TargetDir)" Name="$(var.HelloSwitcher.TargetName).Service.exe" KeyPath="yes"/>
59+
</Component>
60+
</DirectoryRef>
6161

62-
<!-- Shortcut in Program Menu -->
63-
<DirectoryRef Id="ProgramMenuFolder">
64-
<Component Id="ApplicationShortcut" Guid="{0DE8B585-52BF-477E-93D7-0FA6A11B785E}">
65-
<Shortcut Id="ApplicationProgramMenuShortcut" Name="Hello Switcher"
66-
Target="[#MainExecutable]" WorkingDirectory="INSTALLDIR"
67-
Icon="AppIcon.exe" IconIndex="0">
68-
<ShortcutProperty Key="System.AppUserModel.ID" Value="[ProductName]"/>
69-
</Shortcut>
70-
<RegistryValue Root="HKCU" Key="Software\[ProductName]"
71-
Name="ApplicationShortcut" Type="integer" Value="1" KeyPath="yes"/>
72-
</Component>
73-
</DirectoryRef>
62+
<!-- Shortcut in Program Menu -->
63+
<DirectoryRef Id="ProgramMenuFolder">
64+
<Component Id="ApplicationShortcut" Guid="{0DE8B585-52BF-477E-93D7-0FA6A11B785E}">
65+
<Shortcut Id="ApplicationProgramMenuShortcut" Name="Hello Switcher"
66+
Target="[#MainExecutable]" WorkingDirectory="INSTALLDIR"
67+
Icon="AppIcon.exe" IconIndex="0">
68+
<ShortcutProperty Key="System.AppUserModel.ID" Value="[ProductName]"/>
69+
</Shortcut>
70+
<RegistryValue Root="HKCU" Key="Software\[ProductName]"
71+
Name="ApplicationShortcut" Type="integer" Value="1" KeyPath="yes"/>
72+
</Component>
73+
</DirectoryRef>
7474

75-
<!-- Working Folder in Common AppData -->
76-
<DirectoryRef Id="ApplicationCommonAppDataFolder">
77-
<Component Id="ApplicationWorkingFolder" Guid="{B98FBE95-351B-491E-B4D2-BB3571164B92}">
78-
<RemoveFile Id="ApplicationCommonAppDataFiles" Directory="ApplicationCommonAppDataFolder" Name="*.*" On="uninstall"/>
79-
<RemoveFolder Id="ApplicationCommonAppDataFolder" On="uninstall"/>
80-
<RegistryValue Root="HKCU" Key="Software\[ProductName]"
81-
Name="ApplicationWorkingFolder" Type="integer" Value="1" KeyPath="yes"/>
82-
</Component>
83-
</DirectoryRef>
75+
<!-- Working Folder in Common AppData -->
76+
<DirectoryRef Id="ApplicationCommonAppDataFolder">
77+
<Component Id="ApplicationWorkingFolder" Guid="{B98FBE95-351B-491E-B4D2-BB3571164B92}">
78+
<RemoveFile Id="ApplicationCommonAppDataFiles" Directory="ApplicationCommonAppDataFolder" Name="*.*" On="uninstall"/>
79+
<RemoveFolder Id="ApplicationCommonAppDataFolder" On="uninstall"/>
80+
<RegistryValue Root="HKCU" Key="Software\[ProductName]"
81+
Name="ApplicationWorkingFolder" Type="integer" Value="1" KeyPath="yes"/>
82+
</Component>
83+
</DirectoryRef>
8484

85-
<Icon Id="AppIcon.exe" SourceFile="$(var.HelloSwitcher.TargetPath)"/>
86-
<Property Id="ARPPRODUCTICON" Value="AppIcon.exe"/>
85+
<Icon Id="AppIcon.exe" SourceFile="$(var.HelloSwitcher.TargetPath)"/>
86+
<Property Id="ARPPRODUCTICON" Value="AppIcon.exe"/>
8787

88-
<Feature Id="ProductFeature" Level="1">
89-
<ComponentRef Id="MainExecutable"/>
90-
<ComponentRef Id="BehaviorsLibrary"/>
91-
<ComponentRef Id="CoreLibrary"/>
92-
<ComponentRef Id="ServiceExecutable"/>
93-
<ComponentRef Id="ApplicationShortcut"/>
94-
<ComponentRef Id="ApplicationWorkingFolder"/>
95-
</Feature>
88+
<Feature Id="ProductFeature" Level="1">
89+
<ComponentRef Id="MainExecutable"/>
90+
<ComponentRef Id="BehaviorsLibrary"/>
91+
<ComponentRef Id="CoreLibrary"/>
92+
<ComponentRef Id="ServiceExecutable"/>
93+
<ComponentRef Id="ApplicationShortcut"/>
94+
<ComponentRef Id="ApplicationWorkingFolder"/>
95+
</Feature>
9696

97-
<!-- Uninstall Service -->
98-
<CustomAction Id="UninstallService" Directory="TARGETDIR" Execute="deferred" Impersonate="no" Return="ignore"
99-
ExeCommand="[INSTALLDIR]$(var.HelloSwitcher.TargetFileName) /uninstall"/>
100-
<InstallExecuteSequence>
101-
<Custom Action="UninstallService" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
102-
</InstallExecuteSequence>
103-
</Product>
97+
<!-- Uninstall Service -->
98+
<CustomAction Id="UninstallService" Directory="TARGETDIR" Execute="deferred" Impersonate="no" Return="ignore"
99+
ExeCommand="[INSTALLDIR]$(var.HelloSwitcher.TargetFileName) /uninstall"/>
100+
<InstallExecuteSequence>
101+
<Custom Action="UninstallService" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
102+
</InstallExecuteSequence>
103+
</Product>
104104
</Wix>

0 commit comments

Comments
 (0)