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

update version to 4.4

pull/51/merge
Siegfried Pammer 12 years ago
parent
c4e92eb516
commit
3a2d44b13a
4 changed files with 10 additions and 10 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. 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
Unescape View File

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

4
src/Main/GlobalAssemblyInfo.template
Unescape View File

@ -27,8 +27,8 @@ 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 = "3"; public const string Minor = "4";
public const string Build = "3"; public const string Build = "0";
public const string Revision = "$INSERTREVISION$"; public const string Revision = "$INSERTREVISION$";
public const string VersionName = null; // "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1") public const string VersionName = null; // "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1")

4
src/Setup/Files.wxs
Unescape View File

@ -1776,7 +1776,7 @@
</Directory> </Directory>
<!-- SharpDevelop Start menu folder --> <!-- SharpDevelop Start menu folder -->
<Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuFolder" Name="Programs">
<Component Id="SharpDevelopProgramMenuItems" Guid="D0C47C33-1DD1-41DF-BB48-968C7B4F7C08"> <Component Id="SharpDevelopProgramMenuItems" Guid="C75B0E33-A46E-40D7-A491-87F74999A824">
<!-- <!--
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
@ -1787,7 +1787,7 @@
</Directory> </Directory>
<!-- Desktop shortcuts --> <!-- Desktop shortcuts -->
<Directory Id="DesktopFolder" Name="Desktop"> <Directory Id="DesktopFolder" Name="Desktop">
<Component Id="DesktopFolderItems" Guid="1443FDA1-E22B-4B84-B321-F12960D3FF36"> <Component Id="DesktopFolderItems" Guid="BD777F5F-9B51-4A9D-A782-9AA12F88F260">
<!-- <!--
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

6
src/Setup/Setup.wxs
Unescape View File

@ -16,7 +16,7 @@
Manufacturer="ic#code" Manufacturer="ic#code"
Language="1033" Language="1033"
Codepage="1252" Codepage="1252"
UpgradeCode="EAB97D14-7713-4001-98E0-0414F495ECB8" UpgradeCode="98D66C2A-31EE-4264-92D5-54BD8211461C"
Version="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)"> Version="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)">
<!-- When a new major SharpDevelop version should be allowed to be installed in parallel to old versions, <!-- When a new major SharpDevelop version should be allowed to be installed in parallel to old versions,
@ -28,11 +28,11 @@
Compressed="yes"/> Compressed="yes"/>
<!-- Upgrade information --> <!-- Upgrade information -->
<Upgrade Id="EAB97D14-7713-4001-98E0-0414F495ECB8"> <Upgrade Id="98D66C2A-31EE-4264-92D5-54BD8211461C">
<!-- 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.3.0" <UpgradeVersion Minimum="4.4.0"
IncludeMinimum="yes" IncludeMinimum="yes"
Maximum="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)" Maximum="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)"
IncludeMaximum="no" IncludeMaximum="no"

Write Preview
Loading…
Cancel
Save