Merge lp:~a-schlapsi/nunit-3.0/devel into lp:~nunit-core/nunit-3.0/trunk-before-upgrade

[Andreas Schlapsi]

[Andreas Schlapsi (a-schlapsi)]

- Added unit tests and XML file for the framework to the framework installer.
- changed name of output MSI package.
- Setup dialog with GAC install options is shown for every setup type.

[Charlie Poole (charlie.poole)]

We need to use a property for the version number, to be set by the build script. You could do the same for this as you have for other properties - put them in your wxi file. Then the
build script will set the properties but leave out the include file. For NUnit 2.5, we use the NominalVersion property but we may want to use Version.

That said, I'm OK with merging this now and dealing with script integration as a separate item.

review: Approve

[lp:~a-schlapsi/nunit-3.0/devel]

11. By Andreas Schlapsi on 2009-08-18

Merged trunk.

=== modified file 'install/NUnit.Framework.Installer/Framework-NET1.1.wxs'
--- install/NUnit.Framework.Installer/Framework-NET1.1.wxs	2009-07-30 19:00:38 +0000
+++ install/NUnit.Framework.Installer/Framework-NET1.1.wxs	2009-08-01 19:54:46 +0000
@@ -30,6 +30,24 @@
 
                 </Component>
 
+                <Component Id="nunit.framework.tests.dll_net1.1" Guid="4c3d2d31-f468-4bd2-832f-19f3e500f24a">
+                    <File Id="nunit.framework.tests.dll_net1.1"
+                          DiskId="1"
+                          KeyPath="yes"
+                          Assembly="no"
+                          Source="$(var.SourceFolder)net\1.1\release\nunit.framework.tests.dll"/>
+
+                </Component>
+
+                <Component Id="nunit.framework.xml_net1.1" Guid="a657bbb7-48fd-49de-b0c9-79d143645d16">
+
+                    <File Id="nunit.framework.xml_net1.1"
+                          DiskId="1"
+                          KeyPath="yes"
+                          Source="$(var.SourceFolder)net\1.1\release\nunit.framework.xml"/>
+
+                </Component>
+
                 <Component Id="AssemblyReferenceFolder_1.1" Guid="8fa8f040-2de4-4192-82e2-a5c6f3f0f082">
                     <RegistryKey Id="R__Assemblies_1.1" Root="HKLM"
                                  Key="Software\Microsoft\.NETFramework\AssemblyFolders\NUnit [ProductVersion]"
@@ -47,6 +65,8 @@
             <Condition Level="1">NETFRAMEWORK11SDKDIR OR REMOVE</Condition>
             <ComponentRef Id="nunit.framework.dll_net1.1_dir"/>
             <ComponentRef Id="nunit.framework.dll_net1.1_gac"/>
+            <ComponentRef Id="nunit.framework.tests.dll_net1.1"/>
+            <ComponentRef Id="nunit.framework.xml_net1.1"/>
             <ComponentRef Id="AssemblyReferenceFolder_1.1"/>
         </Feature>
 

=== modified file 'install/NUnit.Framework.Installer/Framework-NET2.0.wxs'
--- install/NUnit.Framework.Installer/Framework-NET2.0.wxs	2009-07-30 19:00:38 +0000
+++ install/NUnit.Framework.Installer/Framework-NET2.0.wxs	2009-08-01 19:54:46 +0000
@@ -30,6 +30,24 @@
 
                 </Component>
 
+                <Component Id="nunit.framework.tests.dll_net2.0" Guid="4f40f59f-07de-47e6-a3ed-b4a1b71ef93a">
+                    <File Id="nunit.framework.tests.dll_net2.0"
+                          DiskId="1"
+                          KeyPath="yes"
+                          Assembly="no"
+                          Source="$(var.SourceFolder)net\2.0\release\nunit.framework.tests.dll"/>
+
+                </Component>
+
+                <Component Id="nunit.framework.xml_net2.0" Guid="79cb5e96-68f4-4002-aa04-eebc494bba89">
+
+                    <File Id="nunit.framework.xml_net2.0"
+                          DiskId="1"
+                          KeyPath="yes"
+                          Source="$(var.SourceFolder)net\2.0\release\nunit.framework.xml"/>
+
+                </Component>
+
                 <Component Id="AssemblyReferenceFolder_2.0" Guid="87667d1d-8542-41f7-99f2-b3900324d05a">
                     <RegistryKey Id="R__Assemblies_2.0"
                                  Action="createAndRemoveOnUninstall"
@@ -48,6 +66,8 @@
             <Condition Level="1">NETFRAMEWORK20SDKDIR OR REMOVE</Condition>
             <ComponentRef Id="nunit.framework.dll_net2.0_dir"/>
             <ComponentRef Id="nunit.framework.dll_net2.0_gac"/>
+            <ComponentRef Id="nunit.framework.tests.dll_net2.0"/>
+            <ComponentRef Id="nunit.framework.xml_net2.0"/>
             <ComponentRef Id="AssemblyReferenceFolder_2.0"/>
         </Feature>
         

=== modified file 'install/NUnit.Framework.Installer/NUnit.Framework.Installer.wixproj'
--- install/NUnit.Framework.Installer/NUnit.Framework.Installer.wixproj	2009-07-30 19:00:38 +0000
+++ install/NUnit.Framework.Installer/NUnit.Framework.Installer.wixproj	2009-08-01 19:54:46 +0000
@@ -5,7 +5,7 @@
     <ProductVersion>3.0</ProductVersion>
     <ProjectGuid>{b4f15755-c6ef-4864-a58e-e6384cfa73ba}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>NUnit.Framework.Installer</OutputName>
+    <OutputName>nunit.framework-2.9.1</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>

=== modified file 'install/NUnit.Framework.Installer/UserInterface.wxs'
--- install/NUnit.Framework.Installer/UserInterface.wxs	2009-07-30 19:00:38 +0000
+++ install/NUnit.Framework.Installer/UserInterface.wxs	2009-08-09 20:06:12 +0000
@@ -6,10 +6,17 @@
 
             <DialogRef Id="InstallOptionsDlg"/>
 
+            <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="InstallOptionsDlg">1</Publish>
+            <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="InstallOptionsDlg">1</Publish>
+
             <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="InstallOptionsDlg">1</Publish>
-            <Publish Dialog="InstallOptionsDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+
+            <Publish Dialog="InstallOptionsDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "InstallCustom"</Publish>
+            <Publish Dialog="InstallOptionsDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
             <Publish Dialog="InstallOptionsDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallOptionsDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallOptionsDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallOptionsDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
         </UI>
 	</Fragment>