Browse Source

Set version number to 4.3.

pull/24/head
Daniel Grunwald 13 years ago
parent
commit
3e697f8582
  1. 6
      src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs
  2. 4
      src/Main/GlobalAssemblyInfo.template
  3. 4
      src/Setup/Files.wxs
  4. 6
      src/Setup/Setup.wxs

6
src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs

@ -96,11 +96,11 @@ namespace ICSharpCode.Core @@ -96,11 +96,11 @@ namespace ICSharpCode.Core
}
if (reference.Name == "SharpDevelop") {
// HACK: SD 4.1 AddIns work with SharpDevelop 4.2
// HACK: SD 4.1/4.2 AddIns work with SharpDevelop 4.3
// Because some 4.1 AddIns restrict themselves to SD 4.1, we extend the
// supported SD range.
if (reference.maximumVersion == new Version("4.1")) {
reference.maximumVersion = new Version("4.2");
if (reference.maximumVersion == new Version("4.1") || reference.maximumVersion == new Version("4.2")) {
reference.maximumVersion = new Version("4.3");
}
}
}

4
src/Main/GlobalAssemblyInfo.template

@ -27,10 +27,10 @@ using System.Reflection; @@ -27,10 +27,10 @@ using System.Reflection;
internal static class RevisionClass
{
public const string Major = "4";
public const string Minor = "2";
public const string Minor = "3";
public const string Build = "0";
public const string Revision = "$INSERTREVISION$";
public const string VersionName = null;
public const string VersionName = "alpha";
public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$";
}

4
src/Setup/Files.wxs

@ -1917,7 +1917,7 @@ @@ -1917,7 +1917,7 @@
</Directory>
<!-- SharpDevelop Start menu folder -->
<Directory Id="ProgramMenuFolder" Name="Programs">
<Component Id="SharpDevelopProgramMenuItems" Guid="E7C5EA6C-D3D2-4567-BA9F-377D6D6BCB66">
<Component Id="SharpDevelopProgramMenuItems" Guid="D0C47C33-1DD1-41DF-BB48-968C7B4F7C08">
<!--
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
@ -1928,7 +1928,7 @@ @@ -1928,7 +1928,7 @@
</Directory>
<!-- Desktop shortcuts -->
<Directory Id="DesktopFolder" Name="Desktop">
<Component Id="DesktopFolderItems" Guid="2C49B793-F6B6-4AF9-BDD5-7C8D61270FD9">
<Component Id="DesktopFolderItems" Guid="1443FDA1-E22B-4B84-B321-F12960D3FF36">
<!--
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

6
src/Setup/Setup.wxs

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
Manufacturer="ic#code"
Language="1033"
Codepage="1252"
UpgradeCode="BEA7A5F1-423F-47AD-9286-6A803A844AC5"
UpgradeCode="EAB97D14-7713-4001-98E0-0414F495ECB8"
Version="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)">
<!-- When a new major SharpDevelop version should be allowed to be installed in parallel to old versions,
@ -28,11 +28,11 @@ @@ -28,11 +28,11 @@
Compressed="yes"/>
<!-- Upgrade information -->
<Upgrade Id="BEA7A5F1-423F-47AD-9286-6A803A844AC5">
<Upgrade Id="EAB97D14-7713-4001-98E0-0414F495ECB8">
<!-- The UpgradeCode must be changed to allow two versions of SharpDevelop to be installed side-by-side -->
<!-- Checks for older versions -->
<UpgradeVersion Minimum="4.2.0"
<UpgradeVersion Minimum="4.3.0"
IncludeMinimum="yes"
Maximum="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)"
IncludeMaximum="no"

Loading…
Cancel
Save