From fbd798491e122a8513c37dbe3337d740be38fd7f Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Sat, 24 Feb 2007 12:25:47 +0000
Subject: [PATCH] Installer now checks that .NET 3.0 is installed. Changed
 feature title to SharpDevelop 3.0. Changed the default product code and
 package code guids in the .user file.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2394 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 src/Setup/Setup.wxs                       | 22 ++++++++++++++--------
 src/Setup/SharpDevelop.Setup.wixproj.user |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 0267e2a6f5..549862b303 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -40,16 +40,22 @@
 			so they never block the user from repairing, patching, or 
 			uninstalling the package after it has been installed. 
 
-			For	example the user could do something odd like uninstall .NET 2.0
+			For example the user could do something odd like uninstall .NET 3.0
  			and then run the msi to uninstall SharpDevelop. Without the 
 			"Installed OR" this would not be allowed.
 		-->
 		<!--
-			Check for .NET 2.0 
-			http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/msinetassemblysupport.asp
+			Check for .NET 3.0 
+			http://msdn2.microsoft.com/en-us/library/aa480198.aspx#netfx30_topic14
+
+			Note that SharpDevelop 3.0 will eventually use WiX 3.0 where the
+			NETFRAMEWORK30 property is already defined.
 		-->
-		<Condition Message="This setup requires the .NET Framework 2.0 or higher.">
-			Installed OR MsiNetAssemblySupport &gt;= "2.0.50727"
+		<Property Id="NETFRAMEWORK30">
+			<RegistrySearch Id="NetFramework30" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup" Name="InstallSuccess" Type="raw" />
+		</Property>
+		<Condition Message="This setup requires the .NET Framework 3.0 to be installed.">
+			Installed OR NETFRAMEWORK30
 		</Condition>
 		
 		<!--
@@ -134,7 +140,7 @@
 			each be a feature if the user wants to heavily customise the installation.
 		-->
 		<Feature Id="Complete"
-		         Title="SharpDevelop 2.1"
+		         Title="SharpDevelop 3.0"
 		         Description="Installs SharpDevelop and registers file associations"
 		         Level="1"
 		         ConfigurableDirectory="INSTALLDIR"
@@ -491,13 +497,13 @@
 			<!--
 				Display an error message if a newer version found.
 				
-				Since the installer completely removes the existing SharpDevelop 2.1
+				Since the installer completely removes the existing SharpDevelop 3.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 2.1, if we are upgrading,
+				Removes the older version of SharpDevelop 3.0, if we are upgrading,
 				before installing the new version.
 
 				Unfortunately the user is not informed of this upgrade. I think
diff --git a/src/Setup/SharpDevelop.Setup.wixproj.user b/src/Setup/SharpDevelop.Setup.wixproj.user
index 99c9f3adff..be629ad1bf 100644
--- a/src/Setup/SharpDevelop.Setup.wixproj.user
+++ b/src/Setup/SharpDevelop.Setup.wixproj.user
@@ -1,8 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SetupProductBuildVersion>1</SetupProductBuildVersion>
-    <SetupProductCodeGuid>A0AB2551-A579-42D3-9A90-D6424B3AC2CD</SetupProductCodeGuid>
-    <SetupPackageCodeGuid>DFC87BE9-A5A6-434D-97BA-F34BB1C1C1A7</SetupPackageCodeGuid>
+    <SetupProductCodeGuid>B6389F87-D46B-40AB-AD76-CFF21B0A97BD</SetupProductCodeGuid>
+    <SetupPackageCodeGuid>F6FC71BB-8BCB-4C61-8562-E0813199DECD</SetupPackageCodeGuid>
    <DefineConstants>PACKAGECODEGUID=$(SetupPackageCodeGuid);PRODUCTCODEGUID=$(SetupProductCodeGuid);PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
   </PropertyGroup>
 </Project>
\ No newline at end of file