adding .msi to release folder; improving .NET framework version validation; adding validate-windows-install-msi nant target; fixing some MsiVal2 errors and warnings

Author: Vlad Ionescu

default.build

@@ -56,6 +56,7 @@
   <property name="release.version.dir" value="${release.dir}/v${fullversion}"/>
   <property name="release.src.zip" value="${nameversion}.zip" />
   <property name="web.url" value="http://stage.rabbitmq.com/" />
+  <property name="release.msi" value="${release.version.dir}/rabbitmq-dotnet-client-${fullversion}.msi" />
 
   <target name="clean" description="remove all generated files"
 	      depends="clean-base,clean-wcf,clean-wix,stamp" />
@@ -584,7 +585,7 @@
     </exec>
   </target>
 
-  <target name="build-windows-install-msi" description="create windows installer file. This requires the .dll to be signed" >
+  <target name="build-windows-install-msi" description="create windows installer file. This requires the .dll to be signed">
     <call target="build-windows-install-msm" />
     <if test="${(not file::up-to-date(wix.product.src, wix.product.target))}">
       <delete file="${wix.product.target}" failonerror="false" />
@@ -609,5 +610,14 @@
         <arg value="-loc" />
         <arg value="${wix.localization}" />
     </exec>
+    <copy file="${wix.dotnet.client.msi}" tofile="${release.msi}" />
+  </target>
+  
+  <target name="validate-windows-install-msi" description="validate created windows installer file. Note: This will always output succeed. Check printed warnings and errors.">
+    <exec program="MsiVal2.exe">
+      <arg value="${wix.dotnet.client.msi}" />
+      <arg value="lib/darice.cub" />
+      <arg value="-f" />
+    </exec>
   </target>
 </project>

lib/darice.cub

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
     <Module Id='DotNetClientModule' Guid='97DB49A3-B75E-4AE1-B01A-DFC8E335F866' Language='1033' Codepage='1252' Version='@VERSION@'>
-        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='LShift Ltd.' InstallerVersion='101' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='LShift Ltd.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
         <Directory Id='TARGETDIR' Name='SourceDir'>
             <Component Id='ClientLibrary' Guid='06543EE8-DED2-4C1C-826E-6AAE0B403AF3'>
@@ -38,7 +38,9 @@
                 </Directory>
 
                 <Component Id='ExamplesShortcut' Guid='19A73961-DFC6-47BC-AC46-77B7562D7B91'>
-                    <Shortcut Id='ExamplesShortcut' Directory='DOTNET_CLIENT_MENU_DIR' Name='Examples' LongName='Examples folder' />
+                    <CreateFolder>
+                        <Shortcut Id='ExamplesShortcut' Directory='DOTNET_CLIENT_MENU_DIR' Name='Examples' LongName='Examples folder' />
+                    </CreateFolder>
                 </Component>
             </Directory>
 

src/wix/dotnet-client-merge-module.wxs.in

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-    <Product Name='RabbitMQ .NET Client @VERSION@' Id='23B1A788-647D-4414-B1C6-028DAC04F761' Language='1033' Codepage='1252' Version='@VERSION@' Manufacturer='LShift Ltd.'>
-        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client 1.6.0 for .NET 2.0' Manufacturer='LShift Ltd.' InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+    <Product Name='RabbitMQ .NET Client @VERSION@' Id='23B1A788-647D-4414-B1C6-028DAC04F761' Language='1033' Codepage='1252' Version='@VERSION@' Manufacturer='LShift Ltd.' UpgradeCode='904A1129-A675-44F9-9FBD-5CE979698179'>
+        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client 1.6.0 for .NET 2.0' Manufacturer='LShift Ltd.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
         <Condition Message="You need to be an administrator to install this product.">
-            Privileged AND AdminUser
+            Privileged
         </Condition>
-        <Condition Message=".NET Framework missing">
-            MsiNetAssemblySupport
+        <Condition Message='This setup requires the .NET Framework 2.0 or higher.'>
+            <![CDATA[MsiNetAssemblySupport >= "2.0.50727"]]>
         </Condition>
 
         <Media Id='1' Cabinet='DNClnt.cab' EmbedCab='yes' />