pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated the installer version number to 3.1 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3812 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 17 years ago
parent
6caf13b7fc
commit
bb413180f5
2 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/Setup/Files.wxs
  2. 18
      src/Setup/Setup.wxs

10
src/Setup/Files.wxs
Unescape View File

@ -1549,7 +1549,7 @@
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<Component Guid="5212F79E-568F-426D-AFD2-FC93914D5CE9" Id="SharpDevelopWebsiteShortcut" DiskId="1"> <Component Guid="542E5AE1-286C-4CE6-8800-F3AFBB24531D" Id="SharpDevelopWebsiteShortcut" DiskId="1">
<!-- <!--
The choice here is to either useW the IniFile element to The choice here is to either useW the IniFile element to
generate the two website shortcuts or create a generate the two website shortcuts or create a
@ -1602,8 +1602,8 @@
</Directory> </Directory>
<!-- SharpDevelop Start menu folder --> <!-- SharpDevelop Start menu folder -->
<Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="SharpDevelopProgramMenuFolder" Name="SharpDevelop 3.0"> <Directory Id="SharpDevelopProgramMenuFolder" Name="SharpDevelop 3.1">
<Component Id="SharpDevelopProgramMenuItems" Guid="AB3D8418-BD70-4EB8-8659-8ED3CEC83FEC"> <Component Id="SharpDevelopProgramMenuItems" Guid="4CD92F25-B435-4639-A9B0-FF8704791CBB">
<!-- <!--
Fix ICE 38 by adding a dummy registry key that is the key for this shortcut. Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
@ -1621,13 +1621,13 @@
</Directory> </Directory>
<!-- Desktop shortcuts --> <!-- Desktop shortcuts -->
<Directory Id="DesktopFolder" Name="Desktop"> <Directory Id="DesktopFolder" Name="Desktop">
<Component Id="DesktopFolderItems" Guid="0B7F764F-19C0-401A-889E-3A9E482CA234"> <Component Id="DesktopFolderItems" Guid="056E643A-40A3-4D29-9E43-FAC178033AD1">
<!-- <!--
Fix ICE 38 by adding a dummy registry key that is the key for this shortcut. Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
--> -->
<RegistryValue Id="SharpDevelopExeDesktopShortcutRegistryKey" Type="string" Root="HKCU" KeyPath="yes" Key="Software\SharpDevelop3" Name="DesktopShortcut" Value="1" /> <RegistryValue Id="SharpDevelopExeDesktopShortcutRegistryKey" Type="string" Root="HKCU" KeyPath="yes" Key="Software\SharpDevelop3" Name="DesktopShortcut" Value="1" />
<Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop 3.0" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" /> <Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop 3.1" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" />
</Component> </Component>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>

18
src/Setup/Setup.wxs
Unescape View File

@ -8,14 +8,14 @@
--> -->
<Product Id="*" <Product Id="*"
Name="SharpDevelop 3.0 Release Candidate" Name="SharpDevelop 3.1"
Manufacturer="ic#code" Manufacturer="ic#code"
Language="1033" Language="1033"
Codepage="1252" Codepage="1252"
UpgradeCode="757486BE-1F27-4BED-9A3B-737906728F1C" UpgradeCode="757486BE-1F27-4BED-9A3B-737906728F1C"
Version="3.0.$(var.PRODUCTBUILDVERSION)"> Version="3.1.$(var.PRODUCTBUILDVERSION)">
<Package Description="SharpDevelop 3.0.0.$(var.PRODUCTBUILDVERSION)" <Package Description="SharpDevelop 3.1.0.$(var.PRODUCTBUILDVERSION)"
InstallerVersion="300" InstallerVersion="300"
Compressed="yes"/> Compressed="yes"/>
@ -26,13 +26,13 @@
<!-- Checks for older versions --> <!-- Checks for older versions -->
<UpgradeVersion Minimum="3.0.0" <UpgradeVersion Minimum="3.0.0"
IncludeMinimum="yes" IncludeMinimum="yes"
Maximum="3.0.$(var.PRODUCTBUILDVERSION)" Maximum="3.1.$(var.PRODUCTBUILDVERSION)"
IncludeMaximum="no" IncludeMaximum="no"
Property="PREVIOUSVERSIONFOUND"/> Property="PREVIOUSVERSIONFOUND"/>
<!-- Checks for newer versions --> <!-- Checks for newer versions -->
<UpgradeVersion OnlyDetect="yes" <UpgradeVersion OnlyDetect="yes"
Property="NEWERVERSIONFOUND" Property="NEWERVERSIONFOUND"
Minimum="3.0.$(var.PRODUCTBUILDVERSION)" Minimum="3.1.$(var.PRODUCTBUILDVERSION)"
IncludeMinimum="no"/> IncludeMinimum="no"/>
</Upgrade> </Upgrade>
@ -136,7 +136,7 @@
each be a feature if the user wants to heavily customise the installation. each be a feature if the user wants to heavily customise the installation.
--> -->
<Feature Id="Complete" <Feature Id="Complete"
Title="SharpDevelop 3.0" Title="SharpDevelop 3.1"
Description="Installs SharpDevelop and registers file associations" Description="Installs SharpDevelop and registers file associations"
Level="1" Level="1"
ConfigurableDirectory="INSTALLDIR" ConfigurableDirectory="INSTALLDIR"
@ -581,7 +581,7 @@
<UIRef Id="WixUI_FeatureTree"/> <UIRef Id="WixUI_FeatureTree"/>
<!-- <!--
If a newer version of SharpDevelop 3.0 is installed show an If a newer version of SharpDevelop 3.1 is installed show an
error message. error message.
This message is not displayed immediately, the FindRelatedProducts This message is not displayed immediately, the FindRelatedProducts
@ -595,13 +595,13 @@
<!-- <!--
Display an error message if a newer version found. Display an error message if a newer version found.
Since the installer completely removes the existing SharpDevelop 3.0 Since the installer completely removes the existing SharpDevelop 3.1
downgrades would work without any problems, but for now we downgrades would work without any problems, but for now we
inform the user that a newer version already exists. inform the user that a newer version already exists.
--> -->
<Custom Action="NoDowngrade" After="FindRelatedProducts">NEWERVERSIONFOUND</Custom> <Custom Action="NoDowngrade" After="FindRelatedProducts">NEWERVERSIONFOUND</Custom>
<!-- <!--
Removes the older version of SharpDevelop 3.0, if we are upgrading, Removes the older version of SharpDevelop 3.1, if we are upgrading,
before installing the new version. before installing the new version.
Unfortunately the user is not informed of this upgrade. I think Unfortunately the user is not informed of this upgrade. I think

Write Preview
Loading…
Cancel
Save