Browse Source

Change SharpDevelop version to 3.2

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5349 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Matt Ward 16 years ago
parent
commit
e8ae58da07
  1. 2
      src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
  2. 6
      src/Main/GlobalAssemblyInfo.template
  3. 4
      src/Setup/Files.wxs
  4. 27
      src/Setup/Setup.wxs

2
src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin

@ -6,7 +6,7 @@
<Manifest> <Manifest>
<Identity name="SiegfriedPammer.HexEditor" /> <Identity name="SiegfriedPammer.HexEditor" />
<Dependency addin="SharpDevelop" version="3.0"/> <Dependency addin="SharpDevelop"/>
</Manifest> </Manifest>
<Runtime> <Runtime>

6
src/Main/GlobalAssemblyInfo.template

@ -20,15 +20,15 @@ using System.Reflection;
[assembly: System.Runtime.InteropServices.ComVisible(false)] [assembly: System.Runtime.InteropServices.ComVisible(false)]
[assembly: AssemblyCompany("ic#code")] [assembly: AssemblyCompany("ic#code")]
[assembly: AssemblyProduct("SharpDevelop")] [assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("2000-2009 AlphaSierraPapa")] [assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
[assembly: AssemblyVersion(RevisionClass.FullVersion)] [assembly: AssemblyVersion(RevisionClass.FullVersion)]
[assembly: NeutralResourcesLanguage("en-US")] [assembly: NeutralResourcesLanguage("en-US")]
internal static class RevisionClass internal static class RevisionClass
{ {
public const string Major = "3"; public const string Major = "3";
public const string Minor = "1"; public const string Minor = "2";
public const string Build = "1"; public const string Build = "0";
public const string Revision = "-INSERTREVISION-"; public const string Revision = "-INSERTREVISION-";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;

4
src/Setup/Files.wxs

@ -1704,7 +1704,7 @@
</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.1"> <Directory Id="SharpDevelopProgramMenuFolder" Name="SharpDevelop 3.2">
<Component Id="SharpDevelopProgramMenuItems" Guid="4CD92F25-B435-4639-A9B0-FF8704791CBB"> <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.
@ -1729,7 +1729,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\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.1" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" /> <Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop 3.2" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" />
</Component> </Component>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>

27
src/Setup/Setup.wxs

@ -8,14 +8,14 @@
--> -->
<Product Id="*" <Product Id="*"
Name="SharpDevelop 3.1.1" Name="SharpDevelop 3.2"
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.1.$(var.PRODUCTBUILDVERSION)"> Version="3.2.$(var.PRODUCTBUILDVERSION)">
<Package Description="SharpDevelop 3.1.1.$(var.PRODUCTBUILDVERSION)" <Package Description="SharpDevelop 3.2.0.$(var.PRODUCTBUILDVERSION)"
InstallerVersion="300" InstallerVersion="300"
Compressed="yes"/> Compressed="yes"/>
@ -31,13 +31,13 @@
<!-- Checks for older versions --> <!-- Checks for older versions -->
<UpgradeVersion Minimum="3.1.0" <UpgradeVersion Minimum="3.1.0"
IncludeMinimum="yes" IncludeMinimum="yes"
Maximum="3.1.$(var.PRODUCTBUILDVERSION)" Maximum="3.2.$(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.1.$(var.PRODUCTBUILDVERSION)" Minimum="3.2.$(var.PRODUCTBUILDVERSION)"
IncludeMinimum="no"/> IncludeMinimum="no"/>
</Upgrade> </Upgrade>
@ -141,7 +141,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.1.1" Title="SharpDevelop 3.2"
Description="Installs SharpDevelop and registers file associations" Description="Installs SharpDevelop and registers file associations"
Level="1" Level="1"
ConfigurableDirectory="INSTALLDIR" ConfigurableDirectory="INSTALLDIR"
@ -376,14 +376,7 @@
<ComponentRef Id="RegExToolkitFiles"/> <ComponentRef Id="RegExToolkitFiles"/>
<ComponentRef Id="ResourceToolkitFiles"/> <ComponentRef Id="ResourceToolkitFiles"/>
<ComponentRef Id="SearchAndReplaceFiles"/> <ComponentRef Id="SearchAndReplaceFiles"/>
<!--
<ComponentRef Id="SharpQueryDll"/>
<ComponentRef Id="SharpQueryInteropMSDASCDll"/>
<ComponentRef Id="SharpDevelopReportsCoreDll"/>
<ComponentRef Id="SharpDevelopReportsAddInDll"/>
<ComponentRef Id="PdfSharpDll"/>
<ComponentRef Id="PdfSharpDeResources"/>
-->
<ComponentRef Id="StartPageAddInFiles"/> <ComponentRef Id="StartPageAddInFiles"/>
<ComponentRef Id="SubversionAddInDll"/> <ComponentRef Id="SubversionAddInDll"/>
<ComponentRef Id="UnitTestingAddInFiles"/> <ComponentRef Id="UnitTestingAddInFiles"/>
@ -616,7 +609,7 @@
<UIRef Id="WixUI_FeatureTree"/> <UIRef Id="WixUI_FeatureTree"/>
<!-- <!--
If a newer version of SharpDevelop 3.1 is installed show an If a newer version of SharpDevelop 3.2 is installed show an
error message. error message.
This message is not displayed immediately, the FindRelatedProducts This message is not displayed immediately, the FindRelatedProducts
@ -631,14 +624,14 @@
<!-- <!--
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.1 Since the installer completely removes the existing SharpDevelop 3.2
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>
<Custom Action="UpgradeNotPossible" After="FindRelatedProducts">OLDVERSIONFOUND</Custom> <Custom Action="UpgradeNotPossible" After="FindRelatedProducts">OLDVERSIONFOUND</Custom>
<!-- <!--
Removes the older version of SharpDevelop 3.1, if we are upgrading, Removes the older version of SharpDevelop 3.2, 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

Loading…
Cancel
Save