Updating the setup project to include an AssemblyVersion variable so that registry keys are correctly created.

This caused an issue with JumpList support because the ProductVersion lags behind the AssemblyVersion until the final release.

2 files changed, 39 insertions, 32 deletions

diff --git a/setup/WixSetup/Product.wxs b/setup/WixSetup/Product.wxs
index a5971c9178..646b84ff02 100644
--- a/setup/WixSetup/Product.wxs
+++ b/setup/WixSetup/Product.wxs
@@ -2,7 +2,7 @@
 <?define ProductShortName = "MonoDevelop" ?>

 <?define ProductVersion = "2.5.9" ?>

 <?define ProductVersionText = "2.5.9" ?>

-<?define HKCRNAME = "MonoDevelop2.5.9.0" ?>

+<?define AssemblyVersion = "2.6.0.0" ?>

 <?define Manufacturer = "Novell" ?>

 <?define UpgradeCode = "9134F74C-E7E3-471A-9833-C86FB45CD38E" ?>

 

@@ -586,82 +586,82 @@
               <File Name="Microsoft.WindowsAPICodePack.dll" Source="$(var.BuildRoot)\AddIns\Microsoft.WindowsAPICodePack.dll" />

               <File Name="Microsoft.WindowsAPICodePack.Shell.dll" Source="$(var.BuildRoot)\AddIns\Microsoft.WindowsAPICodePack.Shell.dll" />

 

-              <RegistryKey Root='HKCR' Key='$(var.HKCRNAME)' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='AppUserModelID' Value='$(var.HKCRNAME)' />

+              <RegistryKey Root='HKCR' Key='$(var.AssemblyVersion)' Action='createAndRemoveOnUninstall'>

+                <RegistryValue Type='string' Name='AppUserModelID' Value='$(var.AssemblyVersion)' />

                 <RegistryValue Type='string' Name='CurVer' Value='$(var.ProductVersion)' />

                 <RegistryValue Type='string' Name='DefaultIcon' Value='@shell32.dll,-47' />

                 <RegistryValue Type='string' Name='FriendlyTypeName' Value='@shell32.dll,-8975' />

               </RegistryKey>

 

-              <RegistryKey Root='HKCR' Key='$(var.HKCRNAME)\shell\Open\Command' Action='createAndRemoveOnUninstall'>

+              <RegistryKey Root='HKCR' Key='MonoDevelop$(var.AssemblyVersion)\shell\Open\Command' Action='createAndRemoveOnUninstall'>

                 <RegistryValue Type='string' Value='[INSTALLLOCATION]bin\monodevelop.exe %1' />

               </RegistryKey>

 

               <RegistryKey Root='HKCR' Key='.asax\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.ascx\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.ashx\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.asmx\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.asp\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.aspx\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.c\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.cc\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.cs\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.csproj\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.cxx\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.h\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.hpp\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.htm\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.html\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.hxx\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.master\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.mdp\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.sln\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.vb\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.vbproj\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

               <RegistryKey Root='HKCR' Key='.xml\OpenWithProgids' Action='createAndRemoveOnUninstall'>

-                <RegistryValue Type='string' Name='$(var.HKCRNAME)' Value='' />

+                <RegistryValue Type='string' Name='MonoDevelop$(var.AssemblyVersion)' Value='' />

               </RegistryKey>

             </Component>

           </Directory>

diff --git a/setup/WixSetup/build.js b/setup/WixSetup/build.js
index 7bb4844b28..d0d7e1c6fb 100644
--- a/setup/WixSetup/build.js
+++ b/setup/WixSetup/build.js
@@ -3,6 +3,11 @@ var MINOR_VERSION = 5;
 var POINT_VERSION = 9;

 var BUILD_VERSION = 0;

 

+var ASSEMBLY_MAJOR_VERSION = 2;

+var ASSEMBLY_MINOR_VERSION = 6;

+var ASSEMBLY_POINT_VERSION = 0;

+var ASSEMBLY_BUILD_VERSION = 0;

+

 var sh = new ActiveXObject("WScript.Shell");

 var fs = new ActiveXObject("Scripting.FileSystemObject");

 var MONO_LIBS = "C:\\Program Files\\MonoLibraries\\2.6";

@@ -10,17 +15,17 @@ var MD_DIR = "..\\..";
 var MD_EXTRAS_DIR = "..\\..\\extras";

 var PRODUCT_VERSION = "" + MAJOR_VERSION + "." + MINOR_VERSION + "." + POINT_VERSION + (BUILD_VERSION != 0 ? "." + BUILD_VERSION : "");

 var PRODUCT_VERSION_TEXT = "" + MAJOR_VERSION + "." + MINOR_VERSION + (POINT_VERSION != 0 || BUILD_VERSION != 0 ? "." + POINT_VERSION : "") + (BUILD_VERSION != 0 ? "." + BUILD_VERSION : "");

-var HKCRNAME = "MonoDevelop" + MAJOR_VERSION + "." + MINOR_VERSION + "." + POINT_VERSION + "." + BUILD_VERSION;

+var ASSEMBLY_VERSION = ASSEMBLY_MAJOR_VERSION + "." + ASSEMBLY_MINOR_VERSION + "." + ASSEMBLY_POINT_VERSION + "." + ASSEMBLY_BUILD_VERSION;

 var MONO_PRODUCT_VERSION = "" + MAJOR_VERSION + format (MINOR_VERSION, 2) + format (POINT_VERSION, 2) + format (BUILD_VERSION, 3);

 

 // Build the main solution and the windows-specific add-ins

 

 if (build ("main\\main.sln /p:Configuration=DebugWin32 /p:Platform=\"x86\"") != 0)

-	WScript.Quit (1);

+    WScript.Quit (1);

 if (build ("extras\\VersionControl.Subversion.Win32\\VersionControl.Subversion.Win32.sln") != 0)

-	WScript.Quit (1);

+    WScript.Quit(1);

 if (build ("extras\\MonoDevelop.Debugger.Win32\\MonoDevelop.Debugger.Win32.sln") != 0)

-	WScript.Quit (1);

+    WScript.Quit (1);

 

 // Copy support assemblies

 

@@ -36,6 +41,7 @@ fs.CopyFile (MONO_LIBS + "\\Mono.GetOptions.dll", "Libraries\\Mono.GetOptions.dl
 fs.CopyFile (MONO_LIBS + "\\monodoc.dll", "Libraries\\monodoc.dll");

 fs.CopyFile (MONO_LIBS + "\\Mono.Security.dll", "Libraries\\Mono.Security.dll");

 

+

 // Copy support files

 

 if (!fs.FolderExists ("ExtraFiles")) {

@@ -48,9 +54,10 @@ fs.CopyFolder ("ExtraFiles\\*", MD_DIR + "\\main\\build\\bin\\");
 

 // Set the version numbers

 

+

 regexreplace ("Product.wxs", /ProductVersionText = ".*?"/g, "ProductVersionText = \"" + PRODUCT_VERSION_TEXT + "\"");

-regexreplace ("Product.wxs", /ProductVersion = ".*?"/g, "ProductVersion = \"" + PRODUCT_VERSION + "\"");

-regexreplace ("Product.wxs", /HKCRNAME = ".*?"/g, "HKCRNAME = \"" + HKCRNAME + "\"");

+regexreplace("Product.wxs", /ProductVersion = ".*?"/g, "ProductVersion = \"" + PRODUCT_VERSION + "\"");

+regexreplace ("Product.wxs", /AssemblyVersion = ".*?"/g, "AssemblyVersion = \"" + ASSEMBLY_VERSION + "\"");

 

 // Create the updateinfo file