From e8ae58da079631b36d2468fa5f33f3a303e82d42 Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Tue, 29 Dec 2009 13:03:56 +0000
Subject: [PATCH] Change SharpDevelop version to 3.2

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5349 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../HexEditor/Project/HexEditor.addin         |  2 +-
 src/Main/GlobalAssemblyInfo.template          |  6 ++---
 src/Setup/Files.wxs                           |  4 +--
 src/Setup/Setup.wxs                           | 27 +++++++------------
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
index c7b3e169c5..f74d86f3f6 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
@@ -6,7 +6,7 @@
 	
 	<Manifest>
 		<Identity name="SiegfriedPammer.HexEditor" />
-		<Dependency addin="SharpDevelop" version="3.0"/>
+		<Dependency addin="SharpDevelop"/>
 	</Manifest>
 	
 	<Runtime>
diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template
index 62abfb0cc9..608bcb803a 100644
--- a/src/Main/GlobalAssemblyInfo.template
+++ b/src/Main/GlobalAssemblyInfo.template
@@ -20,15 +20,15 @@ using System.Reflection;
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: AssemblyCompany("ic#code")]
 [assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("2000-2009 AlphaSierraPapa")]
+[assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
 [assembly: AssemblyVersion(RevisionClass.FullVersion)]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 internal static class RevisionClass
 {
 	public const string Major = "3";
-	public const string Minor = "1";
-	public const string Build = "1";
+	public const string Minor = "2";
+	public const string Build = "0";
 	public const string Revision = "-INSERTREVISION-";
 	
 	public const string MainVersion = Major + "." + Minor;
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 17c180b4f3..a0f63dc1cc 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1704,7 +1704,7 @@
 			</Directory>
 			<!-- SharpDevelop Start menu folder -->
 			<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">
 						<!--
 							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
 					-->
 					<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>
 			</Directory>
 		</DirectoryRef>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index bb5cdf8e76..72aa6277be 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -8,14 +8,14 @@
 	-->
 
 	<Product Id="*" 
-		Name="SharpDevelop 3.1.1"
+		Name="SharpDevelop 3.2"
 		Manufacturer="ic#code"
 		Language="1033"
 		Codepage="1252"
 		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"
 			Compressed="yes"/>
 		
@@ -31,13 +31,13 @@
 			<!-- Checks for older versions -->
 			<UpgradeVersion Minimum="3.1.0"
 				IncludeMinimum="yes"
-				Maximum="3.1.$(var.PRODUCTBUILDVERSION)"
+				Maximum="3.2.$(var.PRODUCTBUILDVERSION)"
 				IncludeMaximum="no" 
 				Property="PREVIOUSVERSIONFOUND"/>
 			<!-- Checks for newer versions -->
 			<UpgradeVersion OnlyDetect="yes"
 				Property="NEWERVERSIONFOUND"
-        		Minimum="3.1.$(var.PRODUCTBUILDVERSION)"
+        		Minimum="3.2.$(var.PRODUCTBUILDVERSION)"
 				IncludeMinimum="no"/>
 		</Upgrade>
 		
@@ -141,7 +141,7 @@
 			each be a feature if the user wants to heavily customise the installation.
 		-->
 		<Feature Id="Complete"
-		         Title="SharpDevelop 3.1.1"
+		         Title="SharpDevelop 3.2"
 		         Description="Installs SharpDevelop and registers file associations"
 		         Level="1"
 		         ConfigurableDirectory="INSTALLDIR"
@@ -376,14 +376,7 @@
 				<ComponentRef Id="RegExToolkitFiles"/>
 				<ComponentRef Id="ResourceToolkitFiles"/>
 				<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="SubversionAddInDll"/>
 				<ComponentRef Id="UnitTestingAddInFiles"/>
@@ -616,7 +609,7 @@
 		<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.
 	
 			This message is not displayed immediately, the FindRelatedProducts 
@@ -631,14 +624,14 @@
 			<!--
 				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 
 				inform the user that a newer version already exists.
  			-->
 			<Custom Action="NoDowngrade" After="FindRelatedProducts">NEWERVERSIONFOUND</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.
 
 				Unfortunately the user is not informed of this upgrade. I think