From: Date: January 30 2007 7:57pm
Subject: Connector/NET commit: r569 - in branches/5.0: . Installer Installer/Bitmaps
List-Archive: http://lists.mysql.com/commits/19036
X-Bug: 25928
Message-Id: <200701301857.l0UIvNLZ023279@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed:
   branches/5.0/Installer/Bitmaps/New.ico
   branches/5.0/Installer/Bitmaps/Up.ico
   branches/5.0/Installer/Bitmaps/exclamic.ico
   branches/5.0/Installer/Bitmaps/info.ico
Modified:
   branches/5.0/CHANGES
   branches/5.0/Installer/Bitmaps/bannrbmp.bmp
   branches/5.0/Installer/Bitmaps/dlgbmp.bmp
   branches/5.0/Installer/Custom.wxs
   branches/5.0/Installer/main.wxs
   branches/5.0/Installer/samples.wxs
   branches/5.0/Installer/sources.wxs
   branches/5.0/Package.build
Log:
Bug #25928 Invalid Registry Entries 

Also, moved the installer to WiX v3 and removed the extra dialog that gave options for installing into the GAC and creating the start menu items.  These things are always done now.  Also, the assembly now properly appears in the Visual Studio 2005 Add/Remove References dialog.


Modified: branches/5.0/CHANGES
===================================================================
--- branches/5.0/CHANGES	2007-01-24 14:53:45 UTC (rev 568)
+++ branches/5.0/CHANGES	2007-01-30 18:57:14 UTC (rev 569)
@@ -10,6 +10,7 @@
   Bug #25651 SELECT does not work properly when WHERE contains UTF-8 characters   
   Bug #25726 MySqlConnection throws NullReferenceException and ArgumentNullException 
   Bug #25609 MySqlDataAdapter.FillSchema 
+  Bug #25928 Invalid Registry Entries 
   
   Other changes
   -------------
@@ -17,7 +18,10 @@
   Fixed problem with parameter name hashing where the hashes were not getting updated
        or removed in certain situations.
   Fixed problem with calling stored functions when a return parameter was not given
-
+  Fixed problem that prevented use of SchemaOnly or SingleRow command behaviors with
+       sprocs or prepared statements
+  Assembly now properly appears in the Visual Studio 2005 Add/Remove Reference dialog
+  
 Version 5.0.3 12-31-2006
 
   Bugs fixed

Deleted: branches/5.0/Installer/Bitmaps/New.ico
===================================================================
(Binary files differ)

Deleted: branches/5.0/Installer/Bitmaps/Up.ico
===================================================================
(Binary files differ)

Modified: branches/5.0/Installer/Bitmaps/bannrbmp.bmp
===================================================================
(Binary files differ)

Modified: branches/5.0/Installer/Bitmaps/dlgbmp.bmp
===================================================================
(Binary files differ)

Deleted: branches/5.0/Installer/Bitmaps/exclamic.ico
===================================================================
(Binary files differ)

Deleted: branches/5.0/Installer/Bitmaps/info.ico
===================================================================
(Binary files differ)

Modified: branches/5.0/Installer/Custom.wxs
===================================================================
--- branches/5.0/Installer/Custom.wxs	2007-01-24 14:53:45 UTC (rev 568)
+++ branches/5.0/Installer/Custom.wxs	2007-01-30 18:57:14 UTC (rev 569)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <UI Id="CustomDialogs">
-      <Dialog Id="RegisterGACAndStartMenu" Width="370" Height="270" Title="$(loc.SetupTypeDlg_Title)">
+      <Dialog Id="RegisterGACAndStartMenu" Width="370" Height="270" Title="!(loc.SetupTypeDlg_Title)">
         <Control Id="Checkbox1" Type="CheckBox" X="18" Y="108" Width="348" Height="12" Property="REGISTERGAC" CheckBoxValue="1">
           <Text>Register Connector/Net in the Global Assembly Cache</Text>
         </Control>
@@ -12,7 +12,7 @@
         <Control Id="Checkbox3" Type="CheckBox" X="18" Y="156" Hidden="yes" Width="348" Height="12" Property="INTEGRATEHELP" CheckBoxValue="1">
           <Text>Integrate Help Into Visual Studio .NET</Text>
         </Control>
-        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.WixUIBack)">
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
           <Publish Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "InstallCustom"</Publish>
           <Publish Event="NewDialog" Value="SetupTypeDlg">WixUI_InstallMode = "InstallTypical"</Publish>
           <Publish Event="NewDialog" Value="SetupTypeDlg">WixUI_InstallMode = "InstallComplete"</Publish>
@@ -20,22 +20,25 @@
           <Publish Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Repair"</Publish>
           <Publish Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Remove"</Publish>
         </Control>
-        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="$(loc.WixUINext)">
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.WixUINext)">
           <Publish Event="NewDialog" Value="VerifyReadyDlg"><![CDATA[1]]></Publish>
 		</Control>
-        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.WixUICancel)">
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
           <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
         </Control>
-        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="$(loc.SetupTypeDlgBannerBitmap)" />
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.SetupTypeDlgBannerBitmap)" />
         <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
         <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Final Setup Options" />
         <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Select the options you want from the list below." />
       </Dialog>
+
+      <Publish Dialog="SetupTypeDlg" Control="Next" Event="NewDialog" Value="RegisterGACAndStartMenu">1</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="RegisterGACAndStartMenu">1</Publish>
     </UI>
 
 	<!-- link in our custom dialog -->
-	<CustomAction Id="RGSM1" Property='WixUI_SetupTypeDlg_NextTypical' Value='RegisterGACAndStartMenu' />
+<!--	<CustomAction Id="RGSM1" Property='WixUI_SetupTypeDlg_NextTypical' Value='RegisterGACAndStartMenu' />
 	<CustomAction Id="RGSM2" Property='WixUI_SetupTypeDlg_NextComplete' Value='RegisterGACAndStartMenu' />
 	<CustomAction Id="RGSM3" Property='WixUI_CustomizeDlg_Next' Value='RegisterGACAndStartMenu' />
 	<CustomAction Id="RGSM4" Property='WixUI_VerifyReadyDlg_BackCustom' Value='RegisterGACAndStartMenu' />
@@ -55,7 +58,7 @@
 		<Custom Action="RGSM7" After="RGSM6"/>
 		<Custom Action="RGSM8" After="RGSM7"/>
 		<Custom Action="RGSM9" After="RGSM8"/>
-	</InstallUISequence>
+	</InstallUISequence>-->
 	
 	</Fragment>
 </Wix>
\ No newline at end of file

Modified: branches/5.0/Installer/main.wxs
===================================================================
--- branches/5.0/Installer/main.wxs	2007-01-24 14:53:45 UTC (rev 568)
+++ branches/5.0/Installer/main.wxs	2007-01-30 18:57:14 UTC (rev 569)
@@ -1,83 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?define ProductVersion="5.0.3"?>
+<?define ProductVersion="5.0.4"?>
 <?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Product Id="7394c123-cacc-4ad2-82b8-c6992131af08" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="7394c123-cacc-4ad2-82b8-c6992131af08" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
 
-		<Package Id="2bb12bc3-ad0f-4ffe-be09-7361268baf8b" Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
+		<Package Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
 		
 		<Media Id="1" EmbedCab="yes" Cabinet="ConnectorNet.cab" CompressionLevel="high" />
 
 		<!-- Our directory structure -->
-		<Directory Id='TARGETDIR' Name='SourceDir'>
-			<Directory Id='ProgramFilesFolder' Name='PFiles'>
-				<Directory Id='CompanyDir' Name='MySQL'>
-					<Directory Id='INSTALLDIR' Name='Con$(var.ProductVersion)' LongName='$(var.ProductName)'>
-						<Directory Id='Binaries' Name='Binaries'>
-							<Directory Id='BinNet20' Name='NET20' LongName='.NET 2.0'/>
-							<Directory Id='BinNet11' Name='NET11' LongName='.NET 1.1'/>
-							<Directory Id='BinNet10' Name='NET10' LongName='.NET 1.0'/>
-							<Directory Id='Mono10' Name='MONO10' LongName='Mono 1.0'/>
-						</Directory>
-						<Directory Id='DocsDir' Name='Docs' LongName='Documentation'/>
-						<Directory Id='DriverDir' Name='Driver'/>
-						<Directory Id='SampleDir' Name='Samples'/>
-					</Directory>
-				</Directory>
-			</Directory>
-			<Directory Id="ProgramMenuFolder" Name="PMFolder">
-				<Directory Id='PMCompanyDir' Name='MySQL'>
-					<Directory Id="ShortCutDir" Name="SCutDir" LongName="$(var.ProductName)"/>
-				</Directory>
-			</Directory>
-		</Directory>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='PFiles'>
+        <Directory Id='CompanyDir' Name='MySQL'>
+          <Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
+            <Directory Id='Binaries' Name='Binaries'>
+              <Directory Id='BinNet20' Name='.NET 2.0'/>
+              <Directory Id='BinNet11' Name='.NET 1.1'/>
+              <Directory Id='BinNet10' Name='.NET 1.0'/>
+              <Directory Id='Mono10' Name='Mono 1.0'/>
+            </Directory>
+            <Directory Id='DocsDir' Name='Documentation'/>
+            <Directory Id='DriverDir' Name='Driver'/>
+            <Directory Id='SampleDir' Name='Samples'/>
+          </Directory>
+        </Directory>
+      </Directory>
 
+      <Directory Id="ProgramMenuFolder" Name="PMFolder">
+        <Directory Id='PMCompanyDir' Name='MySQL'>
+          <Directory Id="ShortCutDir" Name="$(var.ProductName)"/>
+        </Directory>
+      </Directory>
+    </Directory>
+
 		<!-- Top level junk - readme, changelog, etc -->
 		<DirectoryRef Id='INSTALLDIR'>
 			<Component Id="BaseComponents" Guid="6cbae281-be1e-4952-8a5d-cb5d1ad799a9" DiskId="1">
-				<File Id="ChangeLog" Name="CLog" LongName="CHANGES" src="..\CHANGES" />
-				<File Id="RelNotes" Name="RelNotes" LongName="Release Notes.txt" src="..\Release Notes.txt" />
+				<File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
+				<File Id="RelNotes" Name="Release Notes.txt" Source="..\Release Notes.txt" />
 				<?if $(var.IsGPL) = true ?>
-				<File Id="EXCEPTIONS" Name="EXC" LongName="EXCEPTIONS" src="..\EXCEPTIONS" DiskId="1"/>
-				<File Id="COPYING" Name="COPY" LongName="COPYING" src="..\COPYING" DiskId="1" />
+				<File Id="EXCEPTIONS" Name="EXCEPTIONS" Source="..\EXCEPTIONS" DiskId="1"/>
+				<File Id="COPYING" Name="COPYING" Source="..\COPYING" DiskId="1" />
 				<?endif?>
-				<File Id="README1" Name="README" src="..\README" DiskId="1"/>
-				<Registry Id="LocKey" Root="HKLM" Key="Software\MySQL AB\MySQL Connector/Net $(var.ProductVersion)" Name="Location" Type="string" Value="[TARGETDIR]"/>
-				<Registry Id="VerKey" Root="HKLM" Key="Software\MySQL AB\MySQL Connector/Net $(var.ProductVersion)" Name="Version" Type="string" Value="$(var.ProductVersion)"/>
+				<File Id="README1" Name="README" Source="..\README" DiskId="1"/>
+        <RegistryKey Id="MySqlKey" Root="HKLM" Action="createAndRemoveOnUninstall"
+                     Key="Software\MySQL AB\MySQL Connector/Net $(var.ProductVersion)">
+          <RegistryValue Id="Location" Name="Location" Value="[TARGETDIR]" Type="string"/>
+          <RegistryValue Id="Version" Name="Version" Value="$(var.ProductVersion)" Type="string"/>
+        </RegistryKey>
 			</Component>
 		</DirectoryRef>
 			
 		<!-- .Net 2.0 Binaries -->
 		<DirectoryRef Id='BinNet20'>
 			<Component Id="Net20" Guid="1b476514-8bcb-48a1-8b32-e477f520b450">
-				<File Id="CoreBin20" Name="MD20" LongName="MySql.Data.dll" src="..\Driver\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1"  />
-				<File Id="CoreBin20Config" Name="mdconfig" LongName="CustomAction.config" src="CustomAction.config" DiskId="1"/>
-				<Registry Id="vs80registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]bin\.NET 2.0\" />
+        <File Id="CoreBin20" Name="MySql.Data.dll"
+              Source="..\Driver\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1"/>
+				<File Id="CoreBin20Config" Name="CustomAction.config" Source="CustomAction.config" DiskId="1"/>
+        <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
+                     Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.ProductVersion)">
+          <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string" Action="write"/>
+        </RegistryKey>
 			</Component>
-			<Component Id="GAC20" DiskId="1" Guid="50ec2fb6-f33e-48b8-80da-6ee57124e9ce">
-				<Condition><![CDATA[REGISTERGAC="1"]]></Condition>
-				<File Id="CoreBin20GAC" Name="MD20" LongName="MySql.Data.dll" src="..\Driver\bin\net-2.0\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" />
-			</Component>
 		</DirectoryRef>
 
 		<!-- Start menu junk -->
 		<DirectoryRef Id='ShortCutDir'>
 			<Component Id="StartMenuComponent" Guid="0cd164ab-5f94-4ed3-a7aa-8bbf805a87a0">
-				<Condition><![CDATA[CREATESTARTMENU="1"]]></Condition>
-				<Shortcut Id="S100" Name="Docs" LongName="Documentation" 
-					Description="Complete documentation for the connector" 
-					Target="[#CoreCHM]" Directory="ShortCutDir" /> 
-				<Shortcut Id="S101" Name="Changes" LongName="ChangeLog" 
-					Description="Complete changelog for the connector" Directory="ShortCutDir" 
-					Icon="ChangeLogIcon" Target="[#ChangeLog]"/>
-				<Shortcut Id="S102" Name="Release" LongName="Release Notes" 
-					Description="Release notes" Directory="ShortCutDir" Target="[#RelNotes]"/>
+				<Shortcut Id="S100" Name="Documentation" Description="Complete documentation for the connector" 
+					Target="[DocsDir]/MySql.Data.chm" Directory="ShortCutDir" /> 
+				<Shortcut Id="S101" Name="ChangeLog" Description="Complete changelog for the connector" Directory="ShortCutDir" 
+					Icon="ChangeLogIcon" Target="[INSTALLDIR]/CHANGES"/>
+				<Shortcut Id="S102" Name="Release Notes" Description="Release notes" Directory="ShortCutDir" 
+                  Target="[INSTALLDIR]/Release Notes.txt"/>
 			</Component>
 		</DirectoryRef>		
 
 		<DirectoryRef Id='DocsDir'>
 			<Component Id="Docs" Guid="686fbf13-83a2-4f50-a002-3378328d4740">
-				<File Id="CoreCHM" Name="Docs" LongName="MySql.Data.chm" src="..\doc\MySql.Data.chm" DiskId="1" />
+				<File Id="CoreCHM" Name="MySql.Data.chm" Source="..\doc\MySql.Data.chm" DiskId="1" />
 			</Component>
 		</DirectoryRef>
 		
@@ -99,7 +100,6 @@
 				</Feature>
 				<Feature Id="FeatureNet20" Level='1' Title=".NET 2.0">
 					<ComponentRef Id="Net20"/>
-					<ComponentRef Id="GAC20"/>
 				</Feature>
 		</Feature>
 
@@ -112,12 +112,14 @@
 
 		<Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
 		<UIRef Id="WixUI_Mondo"/>
-		<UIRef Id="CustomDialogs"/>
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
+    <WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp"/>
+    <WixVariable Id="WixUIDialogBmp" Value="Bitmaps/DlgBmp.bmp"/>
 
-		<Icon Id="ChangeLogIcon" src="Bitmaps\document.ico"/>
+    <Icon Id="ChangeLogIcon" SourceFile="Bitmaps\document.ico"/>
 
 		<!-- custom actions for performing machine.config mods -->
-		<Binary Id="InstallUtil" src="InstallUtilLib.dll" />
+<!--		<Binary Id="InstallUtil" SourceFile="InstallUtilLib.dll" />
 		<CustomAction Id="CustomInstall" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" />
 		<CustomAction Id="InstallSetProp" Property="CustomInstall" Value="/installtype=notransaction /action=install /LogFile= &quot;[#CoreBin20]&quot; &quot;[#CoreBin20Config]&quot;" />
 		<CustomAction Id="CustomUninstall" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" />
@@ -129,7 +131,7 @@
 
 			<Custom Action="UninstallSetProp" After="ProcessComponents">Installed</Custom>
 			<Custom Action="CustomUninstall" After="UninstallSetProp">Installed</Custom>
-		</InstallExecuteSequence>
+		</InstallExecuteSequence>-->
   </Product>
 </Wix>
 

Modified: branches/5.0/Installer/samples.wxs
===================================================================
--- branches/5.0/Installer/samples.wxs	2007-01-24 14:53:45 UTC (rev 568)
+++ branches/5.0/Installer/samples.wxs	2007-01-30 18:57:14 UTC (rev 569)
@@ -1,36 +1,36 @@
-<?xml version="1.0"?> 
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> 
-   <Fragment Id='SamplesFragment'> 
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment Id='SamplesFragment'> 
     <DirectoryRef Id='SampleDir'> 
-		<Directory Id="TableEditor" Name="teditor" LongName="Table Editor">
+		<Directory Id="TableEditor" Name="Table Editor">
 			<Directory Id="teCS" Name="cs">
 				<Component Id="Sample1CS" Guid="22cbf994-2ffb-4c7c-8538-1f773cd8a2a5">
-					<File Id="teCS1" Name="App.ico" src="..\Samples\TableEditor\cs\App.ico" DiskId="1"/>
-					<File Id="teCS2" Name="AssInfo.cs" LongName="AssemblyInfo.cs" src="..\Samples\TableEditor\cs\AssemblyInfo.cs" DiskId="1"/>
-					<File Id="teCS3" Name="Form1.cs" src="..\Samples\TableEditor\cs\Form1.cs" DiskId="1"/>
-					<File Id="teCS4" Name="Form1.res" LongName="Form1.resx" src="..\Samples\TableEditor\cs\Form1.resx" DiskId="1"/>
-					<File Id="teCS5" Name="te.csp" LongName="TableEditor.csproj" src="..\Samples\TableEditor\cs\TableEditor.csproj" DiskId="1"/>
-					<File Id="teCS7" Name="def.bld" LongName="TableEditor.build" src="..\Samples\TableEditor\cs\TableEditor.build" DiskId="1"/>
+					<File Id="teCS1" Name="App.ico" Source="..\Samples\TableEditor\cs\App.ico" DiskId="1"/>
+					<File Id="teCS2" Name="AssemblyInfo.cs" Source="..\Samples\TableEditor\cs\AssemblyInfo.cs" DiskId="1"/>
+					<File Id="teCS3" Name="Form1.cs" Source="..\Samples\TableEditor\cs\Form1.cs" DiskId="1"/>
+					<File Id="teCS4" Name="Form1.resx" Source="..\Samples\TableEditor\cs\Form1.resx" DiskId="1"/>
+					<File Id="teCS5" Name="TableEditor.csproj" Source="..\Samples\TableEditor\cs\TableEditor.csproj" DiskId="1"/>
+					<File Id="teCS7" Name="TableEditor.build" Source="..\Samples\TableEditor\cs\TableEditor.build" DiskId="1"/>
 				</Component>
 			</Directory>
 			<Directory Id="teVB" Name="vb">
 				<Component Id="Sample1VB" Guid="72104075-eff1-4d96-b186-8b0a61e7d858">
-					<File Id="teVB2" Name="AssInfo.vb" LongName="AssemblyInfo.vb" src="..\Samples\TableEditor\vb\AssemblyInfo.vb" DiskId="1"/>
-					<File Id="teVB3" Name="Form1.vb" src="..\Samples\TableEditor\vb\Form1.vb" DiskId="1"/>
-					<File Id="teVB4" Name="Form1.res" LongName="Form1.resx" src="..\Samples\TableEditor\vb\Form1.resx" DiskId="1"/>
-					<File Id="teVB5" Name="te.vbp" LongName="TableEditor.vbproj" src="..\Samples\TableEditor\vb\TableEditor.vbproj" DiskId="1"/>
-					<File Id="teVB7" Name="te.bld" LongName="TableEditor.build" src="..\Samples\TableEditor\vb\TableEditor.build" DiskId="1"/>
+					<File Id="teVB2" Name="AssemblyInfo.vb" Source="..\Samples\TableEditor\vb\AssemblyInfo.vb" DiskId="1"/>
+					<File Id="teVB3" Name="Form1.vb" Source="..\Samples\TableEditor\vb\Form1.vb" DiskId="1"/>
+					<File Id="teVB4" Name="Form1.resx" Source="..\Samples\TableEditor\vb\Form1.resx" DiskId="1"/>
+					<File Id="teVB5" Name="TableEditor.vbproj" Source="..\Samples\TableEditor\vb\TableEditor.vbproj" DiskId="1"/>
+					<File Id="teVB7" Name="TableEditor.build" Source="..\Samples\TableEditor\vb\TableEditor.build" DiskId="1"/>
 				</Component>
 			</Directory>
 		</Directory>
       <Directory Id="Async" Name="Async">
         <Directory Id="asyncCS" Name="cs">
           <Component Id="Sample2CS" Guid="1cfb8520-6afd-4979-888b-7dfdf4728219">
-            <File Id="sample2file1" Name="App.ico" src="..\Samples\Async\cs\App.ico" DiskId="1"/>
-            <File Id="sample2file2" Name="AssInfo.cs" LongName="AssemblyInfo.cs" src="..\Samples\Async\cs\AssemblyInfo.cs" DiskId="1"/>
-            <File Id="sample2file3" Name="Form1.cs" src="..\Samples\Async\cs\Form1.cs" DiskId="1"/>
-            <File Id="sample2file4" Name="Form1.res" src="..\Samples\Async\cs\Form1.resx" DiskId="1"/>
-            <File Id="sample2file5" Name="Async.csp" LongName="Async.csproj" src="..\Samples\Async\cs\Async.csproj" DiskId="1"/>
+            <File Id="sample2file1" Name="App.ico" Source="..\Samples\Async\cs\App.ico" DiskId="1"/>
+            <File Id="sample2file2" Name="AssemblyInfo.cs" Source="..\Samples\Async\cs\AssemblyInfo.cs" DiskId="1"/>
+            <File Id="sample2file3" Name="Form1.cs" Source="..\Samples\Async\cs\Form1.cs" DiskId="1"/>
+            <File Id="sample2file4" Name="Form1.res" Source="..\Samples\Async\cs\Form1.resx" DiskId="1"/>
+            <File Id="sample2file5" Name="Async.csproj" Source="..\Samples\Async\cs\Async.csproj" DiskId="1"/>
           </Component>
         </Directory>
       </Directory>

Modified: branches/5.0/Installer/sources.wxs
===================================================================
--- branches/5.0/Installer/sources.wxs	2007-01-24 14:53:45 UTC (rev 568)
+++ branches/5.0/Installer/sources.wxs	2007-01-30 18:57:14 UTC (rev 569)
@@ -1,171 +1,171 @@
 <?xml version="1.0"?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='SourceFragment'>
     <DirectoryRef Id='DriverDir'>
       <Component Id="TopLevelSrc" Guid="0b171095-b9cb-4bab-8c0e-4b8e8247bfe0">
-        <File Id="nantFile" Name="client.bld" LongName="client.build" src="..\client.build" DiskId="1"/>
-        <File Id="m2005proj" Name="M2005.csp" LongName="MySql.Data.2005.csproj" src="..\Driver\MySql.Data.2005.csproj" DiskId="1"/>
+        <File Id="nantFile" Name="client.build" Source="..\client.build" DiskId="1"/>
+        <File Id="m2005proj" Name="MySql.Data.2005.csproj" Source="..\Driver\MySql.Data.2005.csproj" DiskId="1"/>
       </Component>
-      <Directory Id="PropertiesFolder" Name="props" LongName="Properties">
+      <Directory Id="PropertiesFolder" Name="Properties">
         <Component Id="PropSrc" DiskId="1" Guid="">
-          <File Id="file0" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\Driver\Properties\AssemblyInfo.cs" />
+          <File Id="file0" Name="AssemblyInfo.cs" Source="..\Driver\Properties\AssemblyInfo.cs" />
         </Component>
       </Directory>
-      <Directory Id="srcFolder" Name="src" LongName="Source">
+      <Directory Id="srcFolder" Name="Source">
         <Component Id="CoreSrc" DiskId="1" Guid="14ffe0b2-329f-4981-ab1c-1d099ec958fa">
-          <File Id="file1" Name="CHARSE_1.CS" LongName="CharSetMap.cs" src="..\Driver\Source\CharSetMap.cs" />
-          <File Id="file2" Name="command.cs" src="..\Driver\Source\command.cs" />
-          <File Id="file3" Name="COMMAN_1.CS" LongName="CommandBuilder.cs" src="..\Driver\Source\CommandBuilder.cs" />
-          <File Id="file4" Name="COMPRE_1.CS" LongName="CompressedStream.cs" src="..\Driver\Source\CompressedStream.cs" />
-          <File Id="file5" Name="CONNEC_1.CS" LongName="Connection.cs" src="..\Driver\Source\Connection.cs" />
-          <File Id="file6" Name="Crypt.cs" src="..\Driver\Source\Crypt.cs" />
-          <File Id="file7" Name="DATAAD_1.CS" LongName="dataadapter.cs" src="..\Driver\Source\dataadapter.cs" />
-          <File Id="file8" Name="DATARE_1.CS" LongName="datareader.cs" src="..\Driver\Source\datareader.cs" />
-          <File Id="file10" Name="Driver.cs" src="..\Driver\Source\Driver.cs" />
-          <File Id="file11" Name="EXCEPT_1.CS" LongName="Exception.cs" src="..\Driver\Source\Exception.cs" />
-          <File Id="file12" Name="Field.cs" src="..\Driver\Source\Field.cs" />
-          <File Id="file14" Name="ISSCHE_1.CS" LongName="ISSchemaProvider.cs" src="..\Driver\Source\ISSchemaProvider.cs" />
-          <File Id="file15" Name="Logger.cs" src="..\Driver\Source\Logger.cs" />
-          <File Id="file18" Name="MYSQLC_1.CS" LongName="MySqlClientFactory.cs" src="..\Driver\Source\MySqlClientFactory.cs" />
-          <File Id="file19" Name="MYSQLC_2.CS" LongName="MySqlConnectionStringBuilder.cs" src="..\Driver\Source\MySqlConnectionStringBuilder.cs" />
-          <File Id="file20" Name="MYSQLD_1.CS" LongName="MysqlDefs.cs" src="..\Driver\Source\MysqlDefs.cs" />
-          <File Id="file21" Name="MYSQLE_1.CS" LongName="MySqlError.cs" src="..\Driver\Source\MySqlError.cs" />
-          <File Id="file22" Name="MYSQLH_1.CS" LongName="MySqlHelper.cs" src="..\Driver\Source\MySqlHelper.cs" />
-          <File Id="file23" Name="MYSQLP_1.CS" LongName="MySqlPool.cs" src="..\Driver\Source\MySqlPool.cs" />
-          <File Id="file24" Name="MYSQLP_2.CS" LongName="MySqlPoolManager.cs" src="..\Driver\Source\MySqlPoolManager.cs" />
-          <File Id="file43" Name="MySqlP_3.cs" LongName="MySqlPromotableTransaction.cs" src="..\Driver\Source\MySqlPromotableTransaction.cs" />
-          <File Id="file25" Name="MYSQLS_1.CS" LongName="MySqlStream.cs" src="..\Driver\Source\MySqlStream.cs" />
-          <File Id="file26" Name="NATIVE_1.CS" LongName="NativeDriver.cs" src="..\Driver\Source\NativeDriver.cs" />
-          <File Id="file27" Name="PARAME_1.CS" LongName="parameter.cs" src="..\Driver\Source\parameter.cs" />
-          <File Id="file28" Name="PARAME_2.CS" LongName="parameter_collection.cs" src="..\Driver\Source\parameter_collection.cs" />
-          <File Id="file29" Name="PERFOR_1.CS" LongName="PerformanceMonitor.cs" src="..\Driver\Source\PerformanceMonitor.cs" />
-          <File Id="file30" Name="PREPAR_1.CS" LongName="PreparableStatement.cs" src="..\Driver\Source\PreparableStatement.cs" />
-          <File Id="file31" Name="PROCED_1.CS" LongName="ProcedureCache.cs" src="..\Driver\Source\ProcedureCache.cs" />
-          <File Id="file36" Name="RESOUR_1.RES" LongName="Resources.resx" src="..\Driver\Source\Resources.resx" />
-          <File Id="file44" Name="RESOUR_2.RES" LongName="Resources.Designer.cs" src="..\Driver\Source\Resources.Designer.cs" />
-          <File Id="file37" Name="SCHEMA_1.CS" LongName="SchemaProvider.cs" src="..\Driver\Source\SchemaProvider.cs" />
-          <File Id="file38" Name="STATEM_1.CS" LongName="Statement.cs" src="..\Driver\Source\Statement.cs" />
-          <File Id="file39" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\Driver\Source\StoredProcedure.cs" />
-          <File Id="file40" Name="TRANSA_1.CS" LongName="transaction.cs" src="..\Driver\Source\transaction.cs" />
-          <File Id="file41" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\Driver\Source\UsageAdvisor.cs" />
-          <File Id="file45" Name="Reserv_1.txt" LongName="ReservedWords.txt" src="..\Driver\Source\ReservedWords.txt"/>
-          <File Id="file46" Name="Instal_1.cs" LongName="Installer.cs" src="..\Driver\Source\Installer.cs"/>
+          <File Id="file1" Name="CharSetMap.cs" Source="..\Driver\Source\CharSetMap.cs" />
+          <File Id="file2" Name="command.cs" Source="..\Driver\Source\command.cs" />
+          <File Id="file3" Name="CommandBuilder.cs" Source="..\Driver\Source\CommandBuilder.cs" />
+          <File Id="file4" Name="CompressedStream.cs" Source="..\Driver\Source\CompressedStream.cs" />
+          <File Id="file5" Name="Connection.cs" Source="..\Driver\Source\Connection.cs" />
+          <File Id="file6" Name="Crypt.cs" Source="..\Driver\Source\Crypt.cs" />
+          <File Id="file7" Name="dataadapter.cs" Source="..\Driver\Source\dataadapter.cs" />
+          <File Id="file8" Name="datareader.cs" Source="..\Driver\Source\datareader.cs" />
+          <File Id="file10" Name="Driver.cs" Source="..\Driver\Source\Driver.cs" />
+          <File Id="file11" Name="Exception.cs" Source="..\Driver\Source\Exception.cs" />
+          <File Id="file12" Name="Field.cs" Source="..\Driver\Source\Field.cs" />
+          <File Id="file14" Name="ISSchemaProvider.cs" Source="..\Driver\Source\ISSchemaProvider.cs" />
+          <File Id="file15" Name="Logger.cs" Source="..\Driver\Source\Logger.cs" />
+          <File Id="file18" Name="MySqlClientFactory.cs" Source="..\Driver\Source\MySqlClientFactory.cs" />
+          <File Id="file19" Name="MySqlConnectionStringBuilder.cs" Source="..\Driver\Source\MySqlConnectionStringBuilder.cs" />
+          <File Id="file20" Name="MysqlDefs.cs" Source="..\Driver\Source\MysqlDefs.cs" />
+          <File Id="file21" Name="MySqlError.cs" Source="..\Driver\Source\MySqlError.cs" />
+          <File Id="file22" Name="MySqlHelper.cs" Source="..\Driver\Source\MySqlHelper.cs" />
+          <File Id="file23" Name="MySqlPool.cs" Source="..\Driver\Source\MySqlPool.cs" />
+          <File Id="file24" Name="MySqlPoolManager.cs" Source="..\Driver\Source\MySqlPoolManager.cs" />
+          <File Id="file43" Name="MySqlPromotableTransaction.cs" Source="..\Driver\Source\MySqlPromotableTransaction.cs" />
+          <File Id="file25" Name="MySqlStream.cs" Source="..\Driver\Source\MySqlStream.cs" />
+          <File Id="file26" Name="NativeDriver.cs" Source="..\Driver\Source\NativeDriver.cs" />
+          <File Id="file27" Name="parameter.cs" Source="..\Driver\Source\parameter.cs" />
+          <File Id="file28" Name="parameter_collection.cs" Source="..\Driver\Source\parameter_collection.cs" />
+          <File Id="file29" Name="PerformanceMonitor.cs" Source="..\Driver\Source\PerformanceMonitor.cs" />
+          <File Id="file30" Name="PreparableStatement.cs" Source="..\Driver\Source\PreparableStatement.cs" />
+          <File Id="file31" Name="ProcedureCache.cs" Source="..\Driver\Source\ProcedureCache.cs" />
+          <File Id="file36" Name="Resources.resx" Source="..\Driver\Source\Resources.resx" />
+          <File Id="file44" Name="Resources.Designer.cs" Source="..\Driver\Source\Resources.Designer.cs" />
+          <File Id="file37" Name="SchemaProvider.cs" Source="..\Driver\Source\SchemaProvider.cs" />
+          <File Id="file38" Name="Statement.cs" Source="..\Driver\Source\Statement.cs" />
+          <File Id="file39" Name="StoredProcedure.cs" Source="..\Driver\Source\StoredProcedure.cs" />
+          <File Id="file40" Name="transaction.cs" Source="..\Driver\Source\transaction.cs" />
+          <File Id="file41" Name="UsageAdvisor.cs" Source="..\Driver\Source\UsageAdvisor.cs" />
+          <File Id="file45" Name="ReservedWords.txt" Source="..\Driver\Source\ReservedWords.txt"/>
+          <File Id="file46" Name="Installer.cs" Source="..\Driver\Source\Installer.cs"/>
         </Component>
         <Directory Id="commonFolder" Name="Common">
           <Component Id="CommonSrc"  DiskId="1" Guid="e5726acb-91cc-4212-8d2b-594bee186f8c">
-            <File Id="file179" Name="CONTEX_1.CS" LongName="ContextString.cs" src="..\Driver\Source\common\ContextString.cs" />
-            <File Id="file180" Name="NAMEDP_1.CS" LongName="NamedPipeStream.cs" src="..\Driver\Source\common\NamedPipeStream.cs" />
-            <File Id="file181" Name="NATIVE_1.CS" LongName="NativeMethods.cs" src="..\Driver\Source\common\NativeMethods.cs" />
-            <File Id="file182" Name="Platform.cs" src="..\Driver\Source\common\Platform.cs" />
-            <File Id="file184" Name="SHA1.cs" src="..\Driver\Source\common\SHA1.cs" />
-            <File Id="file185" Name="SHARED_1.cs" LongName="SharedMemoryStream.cs" src="..\Driver\Source\common\SharedMemoryStream.cs" />
-            <File Id="file186" Name="STREAM_1.cs" LongName="StreamCreator.cs" src="..\Driver\Source\common\StreamCreator.cs" />
-            <File Id="file187" Name="Socket_1.cs" LongName="SocketStream.cs" src="..\Driver\Source\common\SocketStream.cs" />
-            <File Id="file188" Name="Version.cs" src="..\Driver\Source\common\Version.cs" />
-            <File Id="file189" Name="WinCE.cs" src="..\Driver\Source\common\WinCE.cs" />
+            <File Id="file179" Name="ContextString.cs" Source="..\Driver\Source\common\ContextString.cs" />
+            <File Id="file180" Name="NamedPipeStream.cs" Source="..\Driver\Source\common\NamedPipeStream.cs" />
+            <File Id="file181" Name="NativeMethods.cs" Source="..\Driver\Source\common\NativeMethods.cs" />
+            <File Id="file182" Name="Platform.cs" Source="..\Driver\Source\common\Platform.cs" />
+            <File Id="file184" Name="SHA1.cs" Source="..\Driver\Source\common\SHA1.cs" />
+            <File Id="file185" Name="SharedMemoryStream.cs" Source="..\Driver\Source\common\SharedMemoryStream.cs" />
+            <File Id="file186" Name="StreamCreator.cs" Source="..\Driver\Source\common\StreamCreator.cs" />
+            <File Id="file187" Name="SocketStream.cs" Source="..\Driver\Source\common\SocketStream.cs" />
+            <File Id="file188" Name="Version.cs" Source="..\Driver\Source\common\Version.cs" />
+            <File Id="file189" Name="WinCE.cs" Source="..\Driver\Source\common\WinCE.cs" />
           </Component>
         </Directory>
         <Directory Id="docSrcFolder" Name="Docs">
           <Component Id="DocsSrc" DiskId="1" Guid="9fa4a523-7578-4d1e-b682-6383c6663518">
-            <File Id="file245" Name="MYSQLC_1.XML" LongName="MySqlCommand.xml" src="..\Driver\Source\docs\MySqlCommand.xml" />
-            <File Id="file246" Name="MYSQLC_2.XML" LongName="MySqlCommandBuilder.xml" src="..\Driver\Source\docs\MySqlCommandBuilder.xml" />
-            <File Id="file247" Name="MYSQLC_3.XML" LongName="MySqlConnection.xml" src="..\Driver\Source\docs\MySqlConnection.xml" />
-            <File Id="file248" Name="MYSQLC_4.XML" LongName="MySqlConnectionStringBuilder.xml" src="..\Driver\Source\docs\MySqlConnectionStringBuilder.xml" />
-            <File Id="file249" Name="MYSQLD_1.XML" LongName="MySqlDataAdapter.xml" src="..\Driver\Source\docs\MySqlDataAdapter.xml" />
-            <File Id="file250" Name="MYSQLD_2.XML" LongName="MySqlDataReader.xml" src="..\Driver\Source\docs\MySqlDataReader.xml" />
-            <File Id="file251" Name="MYSQLE_1.XML" LongName="MySqlException.xml" src="..\Driver\Source\docs\MySqlException.xml" />
-            <File Id="file252" Name="MYSQLH_1.XML" LongName="MySqlHelper.xml" src="..\Driver\Source\docs\MySqlHelper.xml" />
-            <File Id="file253" Name="MYSQLP_1.XML" LongName="MySqlParameter.xml" src="..\Driver\Source\docs\MySqlParameter.xml" />
-            <File Id="file254" Name="MYSQLP_2.XML" LongName="MySqlParameterCollection.xml" src="..\Driver\Source\docs\MySqlParameterCollection.xml" />
-            <File Id="file255" Name="MYSQLT_1.XML" LongName="MySqlTransaction.xml" src="..\Driver\Source\docs\MySqlTransaction.xml" />
+            <File Id="file245" Name="MySqlCommand.xml" Source="..\Driver\Source\docs\MySqlCommand.xml" />
+            <File Id="file246" Name="MySqlCommandBuilder.xml" Source="..\Driver\Source\docs\MySqlCommandBuilder.xml" />
+            <File Id="file247" Name="MySqlConnection.xml" Source="..\Driver\Source\docs\MySqlConnection.xml" />
+            <File Id="file248" Name="MySqlConnectionStringBuilder.xml" Source="..\Driver\Source\docs\MySqlConnectionStringBuilder.xml" />
+            <File Id="file249" Name="MySqlDataAdapter.xml" Source="..\Driver\Source\docs\MySqlDataAdapter.xml" />
+            <File Id="file250" Name="MySqlDataReader.xml" Source="..\Driver\Source\docs\MySqlDataReader.xml" />
+            <File Id="file251" Name="MySqlException.xml" Source="..\Driver\Source\docs\MySqlException.xml" />
+            <File Id="file252" Name="MySqlHelper.xml" Source="..\Driver\Source\docs\MySqlHelper.xml" />
+            <File Id="file253" Name="MySqlParameter.xml" Source="..\Driver\Source\docs\MySqlParameter.xml" />
+            <File Id="file254" Name="MySqlParameterCollection.xml" Source="..\Driver\Source\docs\MySqlParameterCollection.xml" />
+            <File Id="file255" Name="MySqlTransaction.xml" Source="..\Driver\Source\docs\MySqlTransaction.xml" />
           </Component>
         </Directory>
         <Directory Id="typesFolder" Name="Types">
           <Component Id="TypesSrc" DiskId="1" Guid="00026aa3-136d-4379-a8e2-c12c72866890">
-            <File Id="file299" Name="MetaData.cs" src="..\Driver\Source\Types\MetaData.cs" />
-            <File Id="file300" Name="MYSQLB_1.CS" LongName="MySqlBinary.cs" src="..\Driver\Source\Types\MySqlBinary.cs" />
-            <File Id="file301" Name="MySqlBit.cs" src="..\Driver\Source\Types\MySqlBit.cs" />
-            <File Id="file302" Name="MYSQLB_2.CS" LongName="MySqlByte.cs" src="..\Driver\Source\Types\MySqlByte.cs" />
-            <File Id="file303" Name="MYSQLC_1.CS" LongName="MySqlConversionException.cs" src="..\Driver\Source\Types\MySqlConversionException.cs" />
-            <File Id="file304" Name="MYSQLD_1.CS" LongName="MySqlDateTime.cs" src="..\Driver\Source\Types\MySqlDateTime.cs" />
-            <File Id="file305" Name="MYSQLD_2.CS" LongName="MySqlDecimal.cs" src="..\Driver\Source\Types\MySqlDecimal.cs" />
-            <File Id="file306" Name="MYSQLD_3.CS" LongName="MySqlDouble.cs" src="..\Driver\Source\Types\MySqlDouble.cs" />
-            <File Id="file307" Name="MYSQLI_1.CS" LongName="MySqlInt16.cs" src="..\Driver\Source\Types\MySqlInt16.cs" />
-            <File Id="file308" Name="MYSQLI_2.CS" LongName="MySqlInt32.cs" src="..\Driver\Source\Types\MySqlInt32.cs" />
-            <File Id="file309" Name="MYSQLI_3.CS" LongName="MySqlInt64.cs" src="..\Driver\Source\Types\MySqlInt64.cs" />
-            <File Id="file310" Name="MYSQLS_1.CS" LongName="MySqlSingle.cs" src="..\Driver\Source\Types\MySqlSingle.cs" />
-            <File Id="file311" Name="MYSQLS_2.CS" LongName="MySqlString.cs" src="..\Driver\Source\Types\MySqlString.cs" />
-            <File Id="file312" Name="MYSQLT_1.CS" LongName="MySqlTime.cs" src="..\Driver\Source\Types\MySqlTime.cs" />
-            <File Id="file313" Name="MYSQLU_1.CS" LongName="MySqlUByte.cs" src="..\Driver\Source\Types\MySqlUByte.cs" />
-            <File Id="file314" Name="MYSQLU_2.CS" LongName="MySqlUInt16.cs" src="..\Driver\Source\Types\MySqlUInt16.cs" />
-            <File Id="file315" Name="MYSQLU_3.CS" LongName="MySqlUInt32.cs" src="..\Driver\Source\Types\MySqlUInt32.cs" />
-            <File Id="file316" Name="MYSQLU_4.CS" LongName="MySqlUInt64.cs" src="..\Driver\Source\Types\MySqlUInt64.cs" />
-            <File Id="file317" Name="MYSQLV_1.CS" LongName="MySqlValue.cs" src="..\Driver\Source\Types\MySqlValue.cs" />
+            <File Id="file299" Name="MetaData.cs" Source="..\Driver\Source\Types\MetaData.cs" />
+            <File Id="file300" Name="MySqlBinary.cs" Source="..\Driver\Source\Types\MySqlBinary.cs" />
+            <File Id="file301" Name="MySqlBit.cs" Source="..\Driver\Source\Types\MySqlBit.cs" />
+            <File Id="file302" Name="MySqlByte.cs" Source="..\Driver\Source\Types\MySqlByte.cs" />
+            <File Id="file303" Name="MySqlConversionException.cs" Source="..\Driver\Source\Types\MySqlConversionException.cs" />
+            <File Id="file304" Name="MySqlDateTime.cs" Source="..\Driver\Source\Types\MySqlDateTime.cs" />
+            <File Id="file305" Name="MySqlDecimal.cs" Source="..\Driver\Source\Types\MySqlDecimal.cs" />
+            <File Id="file306" Name="MySqlDouble.cs" Source="..\Driver\Source\Types\MySqlDouble.cs" />
+            <File Id="file307" Name="MySqlInt16.cs" Source="..\Driver\Source\Types\MySqlInt16.cs" />
+            <File Id="file308" Name="MySqlInt32.cs" Source="..\Driver\Source\Types\MySqlInt32.cs" />
+            <File Id="file309" Name="MySqlInt64.cs" Source="..\Driver\Source\Types\MySqlInt64.cs" />
+            <File Id="file310" Name="MySqlSingle.cs" Source="..\Driver\Source\Types\MySqlSingle.cs" />
+            <File Id="file311" Name="MySqlString.cs" Source="..\Driver\Source\Types\MySqlString.cs" />
+            <File Id="file312" Name="MySqlTime.cs" Source="..\Driver\Source\Types\MySqlTime.cs" />
+            <File Id="file313" Name="MySqlUByte.cs" Source="..\Driver\Source\Types\MySqlUByte.cs" />
+            <File Id="file314" Name="MySqlUInt16.cs" Source="..\Driver\Source\Types\MySqlUInt16.cs" />
+            <File Id="file315" Name="MySqlUInt32.cs" Source="..\Driver\Source\Types\MySqlUInt32.cs" />
+            <File Id="file316" Name="MySqlUInt64.cs" Source="..\Driver\Source\Types\MySqlUInt64.cs" />
+            <File Id="file317" Name="MySqlValue.cs" Source="..\Driver\Source\Types\MySqlValue.cs" />
           </Component>
         </Directory>
         <Directory Id="zlibFolder" Name="zlib">
           <Component Id="ZLibSrc" DiskId="1" Guid="5bf41c05-1d57-4a64-b8a6-e0bad6141317">
-            <File Id="file500" Name="Adler32.cs" src="..\Driver\Source\zlib\Adler32.cs" />
-            <File Id="file501" Name="Deflate.cs" src="..\Driver\Source\zlib\Deflate.cs" />
-            <File Id="file502" Name="InfBlo_1.cs" LongName="InfBlocks.cs" src="..\Driver\Source\zlib\InfBlocks.cs" />
-            <File Id="file503" Name="InfCodes.cs" src="..\Driver\Source\zlib\InfCodes.cs" />
-            <File Id="file504" Name="Inflate.cs" src="..\Driver\Source\zlib\Inflate.cs" />
-            <File Id="file505" Name="InfTree.cs" src="..\Driver\Source\zlib\InfTree.cs" />
-            <File Id="file506" Name="Static_1.cs" LongName="StaticTree.cs" src="..\Driver\Source\zlib\StaticTree.cs" />
-            <File Id="file507" Name="Suppor_1.cs" LongName="SupportClass.cs" src="..\Driver\Source\zlib\SupportClass.cs" />
-            <File Id="file508" Name="Tree.cs" src="..\Driver\Source\zlib\Tree.cs" />
-            <File Id="file509" Name="ZInput_1.cs" LongName="ZInputStream.cs" src="..\Driver\Source\zlib\ZInputStream.cs" />
-            <File Id="file510" Name="Zlib.cs" src="..\Driver\Source\zlib\Zlib.cs" />
-            <File Id="file511" Name="ZOutpu_1.cs" LongName="ZOutputStream.cs" src="..\Driver\Source\zlib\ZOutputStream.cs" />
-            <File Id="file512" Name="ZStream.cs" src="..\Driver\Source\zlib\ZStream.cs" />
-            <File Id="file513" Name="ZStrea_1.cs" LongName="ZStreamException.cs" src="..\Driver\Source\zlib\ZStreamException.cs" />
+            <File Id="file500" Name="Adler32.cs" Source="..\Driver\Source\zlib\Adler32.cs" />
+            <File Id="file501" Name="Deflate.cs" Source="..\Driver\Source\zlib\Deflate.cs" />
+            <File Id="file502" Name="InfBlocks.cs" Source="..\Driver\Source\zlib\InfBlocks.cs" />
+            <File Id="file503" Name="InfCodes.cs" Source="..\Driver\Source\zlib\InfCodes.cs" />
+            <File Id="file504" Name="Inflate.cs" Source="..\Driver\Source\zlib\Inflate.cs" />
+            <File Id="file505" Name="InfTree.cs" Source="..\Driver\Source\zlib\InfTree.cs" />
+            <File Id="file506" Name="StaticTree.cs" Source="..\Driver\Source\zlib\StaticTree.cs" />
+            <File Id="file507" Name="SupportClass.cs" Source="..\Driver\Source\zlib\SupportClass.cs" />
+            <File Id="file508" Name="Tree.cs" Source="..\Driver\Source\zlib\Tree.cs" />
+            <File Id="file509" Name="ZInputStream.cs" Source="..\Driver\Source\zlib\ZInputStream.cs" />
+            <File Id="file510" Name="Zlib.cs" Source="..\Driver\Source\zlib\Zlib.cs" />
+            <File Id="file511" Name="ZOutputStream.cs" Source="..\Driver\Source\zlib\ZOutputStream.cs" />
+            <File Id="file512" Name="ZStream.cs" Source="..\Driver\Source\zlib\ZStream.cs" />
+            <File Id="file513" Name="ZStreamException.cs" Source="..\Driver\Source\zlib\ZStreamException.cs" />
           </Component>
         </Directory>
       </Directory>
-      <Directory Id="TestSuite" Name="ts" LongName="TestSuite">
+      <Directory Id="TestSuite" Name="TestSuite">
         <Component Id="TestSuiteSrc" DiskId="1" Guid="54eddace-adcc-44eb-bc25-eb69cbf278d3">
-          <File Id="file402" Name="ASYNCT_1.CS" LongName="AsyncTests.cs" src="..\TestSuite\AsyncTests.cs" />
-          <File Id="file403" Name="BaseTest.cs" src="..\TestSuite\BaseTest.cs" />
-          <File Id="file404" Name="BLOBTE_1.CS" LongName="BlobTests.cs" src="..\TestSuite\BlobTests.cs" />
-          <File Id="file405" Name="CHARAC_1.CS" LongName="CharacterSetTests.cs" src="..\TestSuite\CharacterSetTests.cs" />
-          <File Id="file406" Name="COMMAN_1.CS" LongName="CommandBuilderTests.cs" src="..\TestSuite\CommandBuilderTests.cs" />
-          <File Id="file407" Name="COMMAN_2.CS" LongName="CommandTests.cs" src="..\TestSuite\CommandTests.cs" />
-          <File Id="file408" Name="CONNEC_1.CS" LongName="ConnectionTests.cs" src="..\TestSuite\ConnectionTests.cs" />
-          <File Id="file409" Name="CULTUR_1.CS" LongName="CultureTests.cs" src="..\TestSuite\CultureTests.cs" />
-          <File Id="file410" Name="CURSOR_1.CS" LongName="CursorTests.cs" src="..\TestSuite\CursorTests.cs" />
-          <File Id="file411" Name="DATAAD_1.CS" LongName="DataAdapterTests.cs" src="..\TestSuite\DataAdapterTests.cs" />
-          <File Id="file412" Name="DATARE_1.CS" LongName="DataReaderTests.cs" src="..\TestSuite\DataReaderTests.cs" />
-          <File Id="file413" Name="DATASE_1.CS" LongName="DataSetTest.cs" src="..\TestSuite\DataSetTest.cs" />
-          <File Id="file414" Name="DATATY_1.CS" LongName="DataTypeTests.cs" src="..\TestSuite\DataTypeTests.cs" />
-          <File Id="file415" Name="DATETI_1.CS" LongName="DateTimeTests.cs" src="..\TestSuite\DateTimeTests.cs" />
-          <File Id="file416" Name="EVENTT_1.CS" LongName="EventTests.cs" src="..\TestSuite\EventTests.cs" />
-          <File Id="file418" Name="EXCEPT_1.CS" LongName="ExceptionTests.cs" src="..\TestSuite\ExceptionTests.cs" />
-          <File Id="file420" Name="GETSCH_1.CS" LongName="GetSchemaTests.cs" src="..\TestSuite\GetSchemaTests.cs" />
-          <File Id="file421" Name="INTERF_1.CS" LongName="InterfaceTests.cs" src="..\TestSuite\InterfaceTests.cs" />
-          <File Id="file422" Name="LANGUA_1.CS" LongName="LanguageTests.cs" src="..\TestSuite\LanguageTests.cs" />
-          <File Id="file424" Name="MICROP_1.CS" LongName="MicroPerfTests.cs" src="..\TestSuite\MicroPerfTests.cs" />
-          <File Id="file427" Name="MYSQLD_2.CSP" LongName="MySql.Data.Tests.2005.csproj" src="..\TestSuite\MySql.Data.Tests.2005.csproj" />
-          <File Id="file428" Name="MYSQLD_3.CSP" LongName="MySql.Data.Tests.2003.csproj" src="..\TestSuite\MySql.Data.Tests.2003.csproj" />
-          <File Id="file430" Name="MYSQLH_1.CS" LongName="MySqlHelperTests.cs" src="..\TestSuite\MySqlHelperTests.cs" />
-          <File Id="file431" Name="PARAME_1.CS" LongName="ParameterTests.cs" src="..\TestSuite\ParameterTests.cs" />
-          <File Id="file432" Name="PERFMO_1.CS" LongName="PerfMonTests.cs" src="..\TestSuite\PerfMonTests.cs" />
-          <File Id="file433" Name="POOLIN_1.CS" LongName="PoolingTests.cs" src="..\TestSuite\PoolingTests.cs" />
-          <File Id="file434" Name="PREPAR_1.CS" LongName="PreparedStatements.cs" src="..\TestSuite\PreparedStatements.cs" />
-          <File Id="file435" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\TestSuite\StoredProcedure.cs" />
-          <File Id="file436" Name="STRESS_1.CS" LongName="StressTests.cs" src="..\TestSuite\StressTests.cs" />
-          <File Id="file437" Name="Syntax.cs" src="..\TestSuite\Syntax.cs" />
-          <File Id="file438" Name="THREAD_1.CS" LongName="Threading.cs" src="..\TestSuite\Threading.cs" />
-          <File Id="file439" Name="TRANSA_1.CS" LongName="Transactions.cs" src="..\TestSuite\Transactions.cs" />
-          <File Id="file440" Name="USAGEA_1.CS" LongName="UsageAdvisor.cs" src="..\TestSuite\UsageAdvisor.cs" />
-          <File Id="file441" Name="Utils.cs" src="..\TestSuite\Utils.cs" />
-          <File Id="file442" Name="Simple_1.cs" LongName="SimpleTransactions.cs" src="..\TestSuite\SimpleTransactions.cs"/>
-          <File Id="file443" Name="Timeou_1.cs" LongName="TimeoutAndCancel.cs" src="..\TestSuite\TimeoutAndCancel.cs"/>
-          <File Id="file444" Name="Syntax2.cs" src="..\TestSuite\Syntax2.cs"/>
-          <File Id="file445" Name="CONNEC_2.cs" LongName="ConnectionStringBuilder.cs" src="..\TestSuite\ConnectionStringBuilder.cs"/>
+          <File Id="file402" Name="AsyncTests.cs" Source="..\TestSuite\AsyncTests.cs" />
+          <File Id="file403" Name="BaseTest.cs" Source="..\TestSuite\BaseTest.cs" />
+          <File Id="file404" Name="BlobTests.cs" Source="..\TestSuite\BlobTests.cs" />
+          <File Id="file405" Name="CharacterSetTests.cs" Source="..\TestSuite\CharacterSetTests.cs" />
+          <File Id="file406" Name="CommandBuilderTests.cs" Source="..\TestSuite\CommandBuilderTests.cs" />
+          <File Id="file407" Name="CommandTests.cs" Source="..\TestSuite\CommandTests.cs" />
+          <File Id="file408" Name="ConnectionTests.cs" Source="..\TestSuite\ConnectionTests.cs" />
+          <File Id="file409" Name="CultureTests.cs" Source="..\TestSuite\CultureTests.cs" />
+          <File Id="file410" Name="CursorTests.cs" Source="..\TestSuite\CursorTests.cs" />
+          <File Id="file411" Name="DataAdapterTests.cs" Source="..\TestSuite\DataAdapterTests.cs" />
+          <File Id="file412" Name="DataReaderTests.cs" Source="..\TestSuite\DataReaderTests.cs" />
+          <File Id="file413" Name="DataSetTest.cs" Source="..\TestSuite\DataSetTest.cs" />
+          <File Id="file414" Name="DataTypeTests.cs" Source="..\TestSuite\DataTypeTests.cs" />
+          <File Id="file415" Name="DateTimeTests.cs" Source="..\TestSuite\DateTimeTests.cs" />
+          <File Id="file416" Name="EventTests.cs" Source="..\TestSuite\EventTests.cs" />
+          <File Id="file418" Name="ExceptionTests.cs" Source="..\TestSuite\ExceptionTests.cs" />
+          <File Id="file420" Name="GetSchemaTests.cs" Source="..\TestSuite\GetSchemaTests.cs" />
+          <File Id="file421" Name="InterfaceTests.cs" Source="..\TestSuite\InterfaceTests.cs" />
+          <File Id="file422" Name="LanguageTests.cs" Source="..\TestSuite\LanguageTests.cs" />
+          <File Id="file424" Name="MicroPerfTests.cs" Source="..\TestSuite\MicroPerfTests.cs" />
+          <File Id="file427" Name="MySql.Data.Tests.2005.csproj" Source="..\TestSuite\MySql.Data.Tests.2005.csproj" />
+          <File Id="file428" Name="MySql.Data.Tests.2003.csproj" Source="..\TestSuite\MySql.Data.Tests.2003.csproj" />
+          <File Id="file430" Name="MySqlHelperTests.cs" Source="..\TestSuite\MySqlHelperTests.cs" />
+          <File Id="file431" Name="ParameterTests.cs" Source="..\TestSuite\ParameterTests.cs" />
+          <File Id="file432" Name="PerfMonTests.cs" Source="..\TestSuite\PerfMonTests.cs" />
+          <File Id="file433" Name="PoolingTests.cs" Source="..\TestSuite\PoolingTests.cs" />
+          <File Id="file434" Name="PreparedStatements.cs" Source="..\TestSuite\PreparedStatements.cs" />
+          <File Id="file435" Name="StoredProcedure.cs" Source="..\TestSuite\StoredProcedure.cs" />
+          <File Id="file436" Name="StressTests.cs" Source="..\TestSuite\StressTests.cs" />
+          <File Id="file437" Name="Syntax.cs" Source="..\TestSuite\Syntax.cs" />
+          <File Id="file438" Name="Threading.cs" Source="..\TestSuite\Threading.cs" />
+          <File Id="file439" Name="Transactions.cs" Source="..\TestSuite\Transactions.cs" />
+          <File Id="file440" Name="UsageAdvisor.cs" Source="..\TestSuite\UsageAdvisor.cs" />
+          <File Id="file441" Name="Utils.cs" Source="..\TestSuite\Utils.cs" />
+          <File Id="file442" Name="SimpleTransactions.cs" Source="..\TestSuite\SimpleTransactions.cs"/>
+          <File Id="file443" Name="TimeoutAndCancel.cs" Source="..\TestSuite\TimeoutAndCancel.cs"/>
+          <File Id="file444" Name="Syntax2.cs" Source="..\TestSuite\Syntax2.cs"/>
+          <File Id="file445" Name="ConnectionStringBuilder.cs" Source="..\TestSuite\ConnectionStringBuilder.cs"/>
         </Component>
-        <Directory Id="TSProperties" Name="tsp" LongName="Properties">
+        <Directory Id="TSProperties" Name="Properties">
           <Component Id="TestSuitePropSrc" DiskId="1" Guid="45741f34-56c0-4186-aeb2-7218210bed7d">
-            <File Id="file401" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\TestSuite\Properties\AssemblyInfo.cs" />
+            <File Id="file401" Name="AssemblyInfo.cs" Source="..\TestSuite\Properties\AssemblyInfo.cs" />
           </Component>
         </Directory>
       </Directory>

Modified: branches/5.0/Package.build
===================================================================
--- branches/5.0/Package.build	2007-01-24 14:53:45 UTC (rev 568)
+++ branches/5.0/Package.build	2007-01-30 18:57:14 UTC (rev 569)
@@ -84,13 +84,7 @@
 		
 		<nant buildfile="staging/Client.build" target="allframeworks"/>
 
-		<!-- now build the WIX installer -->
-		<exec workingdir="staging/Installer" program="candle" commandline="-dIsGPL=${IsGPL} -dbuild=release main.wxs"/>
-		<exec workingdir="staging/Installer" program="candle" commandline="samples.wxs"/>
-		<exec workingdir="staging/Installer" program="candle" commandline="sources.wxs"/>
-		<exec workingdir="staging/Installer" program="candle" commandline="custom.wxs"/>
-		<exec workingdir="staging/Installer" program="light" 
-			commandline='main.wixobj samples.wixobj sources.wixobj custom.wixobj "${wix.dir}/WixUI.wixlib" -loc "${wix.dir}/WixUI_en-us.wxl" -out MySql.Data.msi'/>
+      <call target="MakeInstaller"/>
 
 		<zip zipfile="packages/mysql-connector-net-${ver}${postfix}.zip">
 			<fileset basedir="staging/Installer"><include name="MySql.Data.msi"/></fileset>
@@ -114,7 +108,15 @@
         </checksum>-->
 
     </target>
-    
+
+  <target name="MakeInstaller">
+    <!-- now build the WIX installer -->
+    <exec workingdir="staging/Installer" program="candle" 
+          commandline="-dIsGPL=${IsGPL} -dbuild=release main.wxs samples.wxs sources.wxs"/>
+    <exec workingdir="staging/Installer" program="light"
+			    commandline="-sval -ext WixUIExtension -cultures:en-us main.wixobj samples.wixobj sources.wixobj -out MySql.Data.msi"/>
+  </target>
+  
     <!-- verification targets -->
 	<target name="VerifyAll" depends="all">
 		<property name="licenseFile" value="gpl-banner.txt"/>