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

Set version number to 4.1

pull/2/head
Daniel Grunwald 15 years ago
parent
cc3208c5cb
commit
eb3799eaee
3 changed files with 16 additions and 16 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. 2
      src/Main/GlobalAssemblyInfo.template
  2. 6
      src/Setup/Files.wxs
  3. 24
      src/Setup/Setup.wxs

2
src/Main/GlobalAssemblyInfo.template
Unescape View File

@ -27,7 +27,7 @@ using System.Reflection;
internal static class RevisionClass internal static class RevisionClass
{ {
public const string Major = "4"; public const string Major = "4";
public const string Minor = "0"; public const string Minor = "1";
public const string Build = "0"; public const string Build = "0";
public const string Revision = "$INSERTREVISION$"; public const string Revision = "$INSERTREVISION$";

6
src/Setup/Files.wxs
Unescape View File

@ -5,7 +5,7 @@
<!-- SharpDevelop installation directory and files --> <!-- SharpDevelop installation directory and files -->
<Directory Id="ProgramFilesFolder" Name="PFiles"> <Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="SharpDevelopFolder" Name="SharpDevelop"> <Directory Id="SharpDevelopFolder" Name="SharpDevelop">
<Directory Id="INSTALLDIR" Name="4.0"> <Directory Id="INSTALLDIR" Name="4.1">
<Directory Id="BinFolder" Name="bin"> <Directory Id="BinFolder" Name="bin">
<Component Id="SharpDevelopExe" Guid="F632C62C-A4DD-4507-9678-C7DCFF4DBC8C" DiskId="1"> <Component Id="SharpDevelopExe" Guid="F632C62C-A4DD-4507-9678-C7DCFF4DBC8C" DiskId="1">
<File Id="SharpDevelop.exe" Name="SharpDevelop.exe" Source="..\..\bin\SharpDevelop.exe" Assembly=".net" AssemblyApplication="SharpDevelop.exe" AssemblyManifest="SharpDevelop.exe" KeyPath="yes"> <File Id="SharpDevelop.exe" Name="SharpDevelop.exe" Source="..\..\bin\SharpDevelop.exe" Assembly=".net" AssemblyApplication="SharpDevelop.exe" AssemblyManifest="SharpDevelop.exe" KeyPath="yes">
@ -1560,7 +1560,7 @@
http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
--> -->
<RegistryValue Id="SharpDevelopExeStartMenuShortcutRegistryKey" Root="HKCU" Type="string" KeyPath="yes" Key="Software\SharpDevelop4" Name="ProgramFilesShortcut" Value="1" /> <RegistryValue Id="SharpDevelopExeStartMenuShortcutRegistryKey" Root="HKCU" Type="string" KeyPath="yes" Key="Software\SharpDevelop4" Name="ProgramFilesShortcut" Value="1" />
<Shortcut Name="SharpDevelop 4.0" Target="[!SharpDevelop.exe]" Id="SharpDevelopExeStartMenuShortcut" WorkingDirectory="BinFolder" Icon="SharpDevelopIcon.exe" Directory="ProgramMenuFolder" /> <Shortcut Name="SharpDevelop 4.1" Target="[!SharpDevelop.exe]" Id="SharpDevelopExeStartMenuShortcut" WorkingDirectory="BinFolder" Icon="SharpDevelopIcon.exe" Directory="ProgramMenuFolder" />
</Component> </Component>
</Directory> </Directory>
<!-- Desktop shortcuts --> <!-- Desktop shortcuts -->
@ -1571,7 +1571,7 @@
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\SharpDevelop4" Name="DesktopShortcut" Value="1" /> <RegistryValue Id="SharpDevelopExeDesktopShortcutRegistryKey" Type="string" Root="HKCU" KeyPath="yes" Key="Software\SharpDevelop4" Name="DesktopShortcut" Value="1" />
<Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop 4.0" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" /> <Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop 4.1" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" />
</Component> </Component>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>

24
src/Setup/Setup.wxs
Unescape View File

@ -8,31 +8,31 @@
--> -->
<Product Id="*" <Product Id="*"
Name="SharpDevelop 4.0 Beta 4" Name="SharpDevelop 4.1"
Manufacturer="ic#code" Manufacturer="ic#code"
Language="1033" Language="1033"
Codepage="1252" Codepage="1252"
UpgradeCode="D6355909-87E1-4CC7-81EF-3057D540A103" UpgradeCode="53805F5D-AC04-4592-8078-6EB7164D8C15"
Version="4.0.$(var.PRODUCTBUILDVERSION)"> Version="4.1.$(var.PRODUCTBUILDVERSION)">
<Package Description="SharpDevelop 4.0.0.$(var.PRODUCTBUILDVERSION)" <Package Description="SharpDevelop 4.1.0.$(var.PRODUCTBUILDVERSION)"
InstallerVersion="300" InstallerVersion="300"
Compressed="yes"/> Compressed="yes"/>
<!-- Upgrade information --> <!-- Upgrade information -->
<Upgrade Id="D6355909-87E1-4CC7-81EF-3057D540A103"> <Upgrade Id="53805F5D-AC04-4592-8078-6EB7164D8C15">
<!-- The UpgradeCode must be changed to allow two versions of SharpDevelop to be installed side-by-side --> <!-- The UpgradeCode must be changed to allow two versions of SharpDevelop to be installed side-by-side -->
<!-- Checks for older versions --> <!-- Checks for older versions -->
<UpgradeVersion Minimum="4.0.0" <UpgradeVersion Minimum="4.1.0"
IncludeMinimum="yes" IncludeMinimum="yes"
Maximum="4.0.$(var.PRODUCTBUILDVERSION)" Maximum="4.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="4.0.$(var.PRODUCTBUILDVERSION)" Minimum="4.1.$(var.PRODUCTBUILDVERSION)"
IncludeMinimum="no"/> IncludeMinimum="no"/>
</Upgrade> </Upgrade>
@ -145,7 +145,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 4.0" Title="SharpDevelop 4.1"
Description="Installs SharpDevelop and registers file associations" Description="Installs SharpDevelop and registers file associations"
Level="1" Level="1"
ConfigurableDirectory="INSTALLDIR" ConfigurableDirectory="INSTALLDIR"
@ -622,7 +622,7 @@
<UIRef Id="WixUI_FeatureTree"/> <UIRef Id="WixUI_FeatureTree"/>
<!-- <!--
If a newer version of SharpDevelop 4.0 is installed show an If a newer version of SharpDevelop 4.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
@ -636,13 +636,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 4.0 Since the installer completely removes the existing SharpDevelop 4.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 4.0, if we are upgrading, Removes the older version of SharpDevelop 4.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