Setup updated for 4.0

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3394 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Setup/Files.wxs

@@ -5,7 +5,7 @@
 			<!-- SharpDevelop installation directory and files -->
 			<Directory Id="ProgramFilesFolder" Name="PFiles">
 				<Directory Id="SharpDevelopFolder" Name="SharpDevelop">
-					<Directory Id="INSTALLDIR" Name="3.0">
+					<Directory Id="INSTALLDIR" Name="4.0">
 						<Directory Id="BinFolder" Name="bin">
 							<Component Id="SharpDevelopExe" Guid="F632C62C-A4DD-4507-9678-C7DCFF4DBC8C" DiskId="1">
 								<File Id="SharpDevelop.exe" Name="SharpDevelop.exe" Source="..\..\bin\SharpDevelop.exe" Assembly=".net" AssemblyApplication="SharpDevelop.exe" AssemblyManifest="SharpDevelop.exe" KeyPath="yes">
@@ -1651,7 +1651,7 @@
 			</Directory>
 			<!-- SharpDevelop Start menu folder -->
 			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Directory Id="SharpDevelopProgramMenuFolder" Name="SharpDevelop 3.0">
+				<Directory Id="SharpDevelopProgramMenuFolder" Name="SharpDevelop 4.0">
 					<Component Id="SharpDevelopProgramMenuItems" Guid="AB3D8418-BD70-4EB8-8659-8ED3CEC83FEC">
 						<!--
 							Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
@@ -1676,7 +1676,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.0" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" />
+					<Shortcut Id="SharpDevelopExeDesktopShortcut" Directory="DesktopFolder" Target="[!SharpDevelop.exe]" Name="SharpDevelop 4.0" Icon="SharpDevelopIcon.exe" WorkingDirectory="BinFolder" />
 				</Component>
 			</Directory>
 		</DirectoryRef>

src/Setup/Setup.wxs

@@ -8,14 +8,14 @@
 	-->
 
 	<Product Id="*" 
-		Name="SharpDevelop 3.0 Beta 2"
+		Name="SharpDevelop 4.0 Alpha"
 		Manufacturer="ic#code"
 		Language="1033"
 		Codepage="1252"
 		UpgradeCode="757486BE-1F27-4BED-9A3B-737906728F1C"
-		Version="3.0.$(var.PRODUCTBUILDVERSION)">
+		Version="4.0.$(var.PRODUCTBUILDVERSION)">
 
-		<Package Description="SharpDevelop 3.0.0.$(var.PRODUCTBUILDVERSION)"
+		<Package Description="SharpDevelop 4.0.0.$(var.PRODUCTBUILDVERSION)"
 			InstallerVersion="300"
 			Compressed="yes"/>
 		
@@ -24,15 +24,15 @@
 			<!-- The UpgradeCode must be changed to allow two versions of SharpDevelop to be installed side-by-side -->
 			
 			<!-- Checks for older versions -->
-			<UpgradeVersion Minimum="3.0.0"
+			<UpgradeVersion Minimum="4.0.0"
 				IncludeMinimum="yes"
-				Maximum="3.0.$(var.PRODUCTBUILDVERSION)"
+				Maximum="4.0.$(var.PRODUCTBUILDVERSION)"
 				IncludeMaximum="no" 
 				Property="PREVIOUSVERSIONFOUND"/>
 			<!-- Checks for newer versions -->
 			<UpgradeVersion OnlyDetect="yes"
 				Property="NEWERVERSIONFOUND"
-        		Minimum="3.0.$(var.PRODUCTBUILDVERSION)"
+        		Minimum="4.0.$(var.PRODUCTBUILDVERSION)"
 				IncludeMinimum="no"/>
 		</Upgrade>
 		
@@ -136,7 +136,7 @@
 			each be a feature if the user wants to heavily customise the installation.
 		-->
 		<Feature Id="Complete"
-		         Title="SharpDevelop 3.0"
+		         Title="SharpDevelop 4.0"
 		         Description="Installs SharpDevelop and registers file associations"
 		         Level="1"
 		         ConfigurableDirectory="INSTALLDIR"
@@ -588,7 +588,7 @@
 		<UIRef Id="WixUI_FeatureTree"/>
 		
 		<!--
-			If a newer version of SharpDevelop 3.0 is installed show an
+			If a newer version of SharpDevelop 4.0 is installed show an
 			error message.
 	
 			This message is not displayed immediately, the FindRelatedProducts 
@@ -602,13 +602,13 @@
 			<!--
 				Display an error message if a newer version found.
 				
-				Since the installer completely removes the existing SharpDevelop 3.0
+				Since the installer completely removes the existing SharpDevelop 4.0
 				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>
 			<!--
-				Removes the older version of SharpDevelop 3.0, if we are upgrading,
+				Removes the older version of SharpDevelop 4.0, if we are upgrading,
 				before installing the new version.
 
 				Unfortunately the user is not informed of this upgrade. I think

src/Setup/SharpDevelop.Setup.wixproj.user

@@ -1,6 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SetupProductBuildVersion>2960</SetupProductBuildVersion>
-    <DefineConstants>PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
-  </PropertyGroup>
-</Project>