| List: | Commits | « Previous MessageNext Message » | |
| From: | rburnett | Date: | February 15 2007 11:22pm |
| Subject: | Connector/NET commit: r590 - in branches/5.0: . Installer Installer/Binary | ||
| View as plain text | |||
Added: branches/5.0/Installer/Binary/ branches/5.0/Installer/Binary/InstallUtilLib.dll branches/5.0/Installer/Binary/MSVBDPCADLL.ibd branches/5.0/Installer/Binary/VSDNETCFG.ibd Modified: branches/5.0/CHANGES branches/5.0/Installer/main.wxs branches/5.0/Package.build Log: Bug #26430 Will not install under Vista Had to fix how the custom actions were being called and added the execute="deferred" element and impersonate="no" Modified: branches/5.0/CHANGES =================================================================== --- branches/5.0/CHANGES 2007-02-13 22:19:00 UTC (rev 589) +++ branches/5.0/CHANGES 2007-02-15 22:22:42 UTC (rev 590) @@ -15,7 +15,8 @@ Bug #25906 Typo makes GetSchema with DataTypes collection throw an exception Bug #25907 DataType Column of DataTypes collection does'nt contain the correct CLR Datatype Bug #25950 DataSourceInformation collection contains incorrect values - + Bug #26430 Will not install under Vista + Other changes ------------- Return parameters created with DeriveParameters now have the name RETURN_VALUE Added: branches/5.0/Installer/Binary/InstallUtilLib.dll =================================================================== (Binary files differ) Property changes on: branches/5.0/Installer/Binary/InstallUtilLib.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/5.0/Installer/Binary/MSVBDPCADLL.ibd =================================================================== (Binary files differ) Property changes on: branches/5.0/Installer/Binary/MSVBDPCADLL.ibd ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/5.0/Installer/Binary/VSDNETCFG.ibd =================================================================== --- branches/5.0/Installer/Binary/VSDNETCFG.ibd 2007-02-13 22:19:00 UTC (rev 589) +++ branches/5.0/Installer/Binary/VSDNETCFG.ibd 2007-02-15 22:22:42 UTC (rev 590) @@ -0,0 +1,186 @@ +<?xml version="1.0"?> +<configuration> + <startup><supportedRuntime version="v2.0.50727"/></startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705"> + <dependentAssembly> + <assemblyIdentity name="Accessibility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="cscompmgd" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="CustomMarshalers" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="IEExecRemote" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="IEHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="IIEHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="ISymWrapper" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.JScript" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.VisualBasic.Compatibility.Data" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.VisualBasic.Compatibility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.VisualBasic" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.VisualBasic.Vsa" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.VisualC" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Vsa" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Vsa.Vb.CodeDOMProcessor" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft_VsaVb" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="mscorcfg" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Configuration.Install" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Data" publicKeyToken="b77a5c561934e089" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Design" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.DirectoryServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Drawing.Design" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.EnterpriseServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Management" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Messaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Runtime.Remoting" publicKeyToken="b77a5c561934e089" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Runtime.Serialization.Formatters.Soap" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Security" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.ServiceProcess" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Mobile" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.RegularExpressions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Services" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Windows.Forms" publicKeyToken="b77a5c561934e089" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Xml" publicKeyToken="b77a5c561934e089" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="vjscor" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="VJSharpCodeProvider" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="vjslib" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="vjslibcw" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="vjswfc" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="VJSWfcBrowserStubLib" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="vjswfccw" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="vjswfchtml" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/> + </dependentAssembly> + </assemblyBinding></runtime></configuration> Modified: branches/5.0/Installer/main.wxs =================================================================== --- branches/5.0/Installer/main.wxs 2007-02-13 22:19:00 UTC (rev 589) +++ branches/5.0/Installer/main.wxs 2007-02-15 22:22:42 UTC (rev 590) @@ -45,7 +45,7 @@ <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="Location" Name="Location" Value="[INSTALLDIR]" Type="string"/> <RegistryValue Id="Version" Name="Version" Value="$(var.ProductVersion)" Type="string"/> </RegistryKey> </Component> @@ -56,7 +56,7 @@ <Component Id="Net20" Guid="1b476514-8bcb-48a1-8b32-e477f520b450"> <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"/> +<!-- <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"/> @@ -90,14 +90,6 @@ <Feature Id="SupportedAssemblies" Level="1" Title="Supported Frameworks" ConfigurableDirectory="INSTALLDIR" Absent="disallow" Description="Frameworks that will be supported."> - <Feature Id="FeatureNet10" Level='0' Title=".NET 1.0"> - <!--<ComponentRef Id="Net10"/>--> - <!--<ComponentRef Id="GACFiles10"/>--> - </Feature> - <Feature Id="FeatureNet11" Level='0' Title=".NET 1.1"> - <!--<ComponentRef Id="Net11"/>--> - <!--<ComponentRef Id="GACFiles11"/>--> - </Feature> <Feature Id="FeatureNet20" Level='1' Title=".NET 2.0"> <ComponentRef Id="Net20"/> </Feature> @@ -118,20 +110,34 @@ <Icon Id="ChangeLogIcon" SourceFile="Bitmaps\document.ico"/> - <!-- custom actions for performing machine.config mods --> -<!-- <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= "[#CoreBin20]" "[#CoreBin20Config]"" /> - <CustomAction Id="CustomUninstall" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" /> - <CustomAction Id="UninstallSetProp" Property="CustomUninstall" Value="/installtype=notransaction /action=uninstall /LogFile= "[#CoreBin20]" "[#CoreBin20Config]"" /> + <!-- custom actions for machine.config mods --> + <Binary Id="InstallUtil" SourceFile="Binary\InstallUtilLib.dll" /> + <Binary Id="MSVBDPCADLL" SourceFile="Binary\MSVBDPCADLL.ibd" /> + <Binary Id="VSDNETCFG" SourceFile="Binary\VSDNETCFG.ibd" /> - <InstallExecuteSequence> - <Custom Action="InstallSetProp" After="InstallFiles">NOT Installed</Custom> - <Custom Action="CustomInstall" After="InstallSetProp">NOT Installed</Custom> + <CustomAction Id="SetPrereqs" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" Impersonate="no" /> + <CustomAction Id="MyCASetProp" Property="InstallCA" Impersonate="no" + Value="/installtype=notransaction /action=install /LogFile= "[#CoreBin20]" "[VSDFxConfigFile]""/> + <CustomAction Id="InstallCA" BinaryKey="InstallUtil" DllEntry="ManagedInstall" + Execute="deferred" Impersonate="no"/> - <Custom Action="UninstallSetProp" After="ProcessComponents">Installed</Custom> - <Custom Action="CustomUninstall" After="UninstallSetProp">Installed</Custom> - </InstallExecuteSequence>--> + <CustomAction Id="SetPrereqs1" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" Impersonate="no"/> + <CustomAction Id="MyCAUnSetProp" Property="RemoveCA" Impersonate="no" + Value="/installtype=notransaction /action=uninstall /LogFile= "[#CoreBin20]" "[VSDFxConfigFile]""/> + <CustomAction Id="RemoveCA" BinaryKey="InstallUtil" DllEntry="ManagedInstall" + Execute="deferred" Impersonate="no" /> + + <InstallExecuteSequence> + <!-- Install code --> + <Custom Action="SetPrereqs" After="InstallFiles"/> + <Custom Action="MyCASetProp" After="SetPrereqs">NOT Installed</Custom> + <Custom Action="InstallCA" After="MyCASetProp">NOT Installed</Custom> + + <!-- UnInstall code --> + <Custom Action="SetPrereqs1" Before="RemoveFiles">Installed</Custom> + <Custom Action="MyCAUnSetProp" After="SetPrereqs1">Installed</Custom> + <Custom Action="RemoveCA" After="MyCAUnSetProp">Installed</Custom> + </InstallExecuteSequence> </Product> </Wix> Modified: branches/5.0/Package.build =================================================================== --- branches/5.0/Package.build 2007-02-13 22:19:00 UTC (rev 589) +++ branches/5.0/Package.build 2007-02-15 22:22:42 UTC (rev 590) @@ -9,7 +9,7 @@ <include name="Driver/MySql.Data.2005.csproj"/> <include name="Driver/Properties/**"/> <include name="Driver/Source/**"/> - <include name="installer/*"/> + <include name="installer/**"/> <include name="testsuite/**"/> <include name="Client.build"/> <include name="CHANGES"/>
| Thread | ||
|---|---|---|
| • Connector/NET commit: r590 - in branches/5.0: . Installer Installer/Binary | rburnett | 15 Feb |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.478 sec. using MySQL 5.1.14-beta-log