The SharpDevelop setup project now always creates a setup package called SharpDevelop.msi without any version information in the filename. The build server script bootstrap.build is now responsible for renaming the setup package filename so it contains version information.

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

src/Setup/SharpDevelop.Setup.wixproj

@@ -7,6 +7,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNamespace>SharpDevelop.Setup</RootNamespace>
     <ProjectGuid>{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}</ProjectGuid>
+    <OutputName>SharpDevelop</OutputName>
     <OutputPath>bin\</OutputPath>
     <WarningLevel>0</WarningLevel>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

src/Setup/SharpDevelop.Setup.wixproj.user

@@ -1,9 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SetupProductBuildVersion>2035</SetupProductBuildVersion>
-    <SetupProductCodeGuid>91D535F9-0EB3-4C12-BE79-3DC17D4EA9A8</SetupProductCodeGuid>
-    <SetupPackageCodeGuid>9D95DFA7-F496-4482-9830-059797D3D678</SetupPackageCodeGuid>
-    <OutputName>SharpDevelop2_2.1.0.$(SetupProductBuildVersion)</OutputName>
-    <DefineConstants>PACKAGECODEGUID=$(SetupPackageCodeGuid);PRODUCTCODEGUID=$(SetupProductCodeGuid);PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
+    <SetupProductBuildVersion>1</SetupProductBuildVersion>
+    <SetupProductCodeGuid>A0AB2551-A579-42D3-9A90-D6424B3AC2CD</SetupProductCodeGuid>
+    <SetupPackageCodeGuid>DFC87BE9-A5A6-434D-97BA-F34BB1C1C1A7</SetupPackageCodeGuid>
+   <DefineConstants>PACKAGECODEGUID=$(SetupPackageCodeGuid);PRODUCTCODEGUID=$(SetupProductCodeGuid);PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
   </PropertyGroup>
 </Project>

src/Setup/SharpDevelop.Setup.wixproj.user.template

@@ -3,7 +3,6 @@
     <SetupProductBuildVersion>$INSERTPRODUCTBUILDVERSION$</SetupProductBuildVersion>
     <SetupProductCodeGuid>$INSERTPRODUCTCODEGUID$</SetupProductCodeGuid>
     <SetupPackageCodeGuid>$INSERTPACKAGECODEGUID$</SetupPackageCodeGuid>
-    <OutputName>SharpDevelop2_2.1.0.$(SetupProductBuildVersion)</OutputName>
     <DefineConstants>PACKAGECODEGUID=$(SetupPackageCodeGuid);PRODUCTCODEGUID=$(SetupProductCodeGuid);PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
   </PropertyGroup>
 </Project>

src/Setup/buildSetup.bat

@@ -1,4 +1,4 @@
-del "bin\SharpDevelop*.msi"
+del "bin\SharpDevelop.msi"
 "..\Tools\UpdateSetupInfo\bin\UpdateSetupInfo.exe"
 %windir%\microsoft.net\framework\v2.0.50727\msbuild SharpDevelop.Setup.sln "/p:SharpDevelopBinPath=%CD%\..\..\bin"
 @IF %ERRORLEVEL% NEQ 0 PAUSE