Change version to 4.2

icsharpcode · Jul 26, 2011 · 5f66310 · 5f66310
1 parent 8496217
commit 5f66310
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template
@@ -27,10 +27,10 @@ using System.Reflection;
 internal static class RevisionClass
 {
 	public const string Major = "4";
-	public const string Minor = "1";
+	public const string Minor = "2";
 	public const string Build = "0";
 	public const string Revision = "$INSERTREVISION$";
-	public const string VersionName = "beta";
+	public const string VersionName = "alpha";
 
 	public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$";
 }
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
@@ -1690,7 +1690,7 @@
 			</Directory>
 			<!-- SharpDevelop Start menu folder -->
 			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Component Id="SharpDevelopProgramMenuItems" Guid="212A9717-E2C6-4522-AB76-9B92B7FB7FB6">
+				<Component Id="SharpDevelopProgramMenuItems" Guid="E7C5EA6C-D3D2-4567-BA9F-377D6D6BCB66">
 					<!--
 						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
@@ -1701,7 +1701,7 @@
 			</Directory>
 			<!-- Desktop shortcuts -->
 			<Directory Id="DesktopFolder" Name="Desktop">
-				<Component Id="DesktopFolderItems" Guid="03C3A248-04B0-4DE7-B4BA-C2D7275AA9FA">
+				<Component Id="DesktopFolderItems" Guid="2C49B793-F6B6-4AF9-BDD5-7C8D61270FD9">
 					<!--
 						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

diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
@@ -16,7 +16,7 @@
 		Manufacturer="ic#code"
 		Language="1033"
 		Codepage="1252"
-		UpgradeCode="53805F5D-AC04-4592-8078-6EB7164D8C15"
+		UpgradeCode="BEA7A5F1-423F-47AD-9286-6A803A844AC5"
 		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 @@
 			Compressed="yes"/>
 
 		<!-- Upgrade information -->
-		<Upgrade Id="53805F5D-AC04-4592-8078-6EB7164D8C15">
+		<Upgrade Id="BEA7A5F1-423F-47AD-9286-6A803A844AC5">
 			<!-- The UpgradeCode must be changed to allow two versions of SharpDevelop to be installed side-by-side -->
 
 			<!-- Checks for older versions -->
-			<UpgradeVersion Minimum="4.1.0"
+			<UpgradeVersion Minimum="4.2.0"
 				IncludeMinimum="yes"
 				Maximum="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)"
 				IncludeMaximum="no"