List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:February 10 2011 7:36pm
Subject:bzr commit into wex-installer-1.0 branch (reggie.burnett:329)
View as plain text  
#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:iggy@stripped95y

  329 Reggie Burnett	2011-02-10
      - Added new C# custom action MYSQLCA
      - fixed Logger to add a default Sourceswitch.  This allows logging to happen without an app.config

    added:
      MySQLCA/
      MySQLCA/CustomAction.config
      MySQLCA/CustomAction.cs
      MySQLCA/MySQLCA.csproj
      MySQLCA/Properties/
      MySQLCA/Properties/AssemblyInfo.cs
    modified:
      Setup/Product.wxs
      StandardPlugins/StandardPlugins.csproj
      WexInstaller.Core/Logger.cs
      WexInstaller.Core/WexInstaller.Core.csproj
      WexInstaller/WexInstaller.csproj
      installer-vs2010.sln
=== added directory 'MySQLCA'
=== added file 'MySQLCA/CustomAction.config'
=== added directory 'MySQLCA'
=== added file 'MySQLCA/CustomAction.config'
--- a/MySQLCA/CustomAction.config	1970-01-01 00:00:00 +0000
+++ b/MySQLCA/CustomAction.config	2011-02-10 19:36:56 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup useLegacyV2RuntimeActivationPolicy="true">
+
+        <!--
+          Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
+          the custom action should run on. If no versions are specified, the chosen version of the runtime
+          will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
+
+          WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
+          problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
+          only the version(s) of the .NET Framework runtime that you have tested against.
+
+          Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
+
+          In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies 
+          by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
+
+          For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
+        -->
+
+        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v2.0.50727"/>
+
+    </startup>
+
+    <!--
+      Add additional configuration settings here. For more information on application config files,
+      see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
+    -->
+
+</configuration>

=== added file 'MySQLCA/CustomAction.cs'
--- a/MySQLCA/CustomAction.cs	1970-01-01 00:00:00 +0000
+++ b/MySQLCA/CustomAction.cs	2011-02-10 19:36:56 +0000
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Deployment.WindowsInstaller;
+using System.Windows.Forms;
+using System.IO;
+using System.Diagnostics;
+
+namespace MySQLCA
+{
+    public class CustomActions
+    {
+        [CustomAction]
+        public static ActionResult LaunchApp(Session session)
+        {
+            session.Log("Begin LaunchApp");
+
+            try
+            {
+                string[] arguments = GetCustomActionDataArguments(session);
+
+                if (arguments == null || arguments.Length != 1)
+                {
+                    session.Log("Error retrieving app to launch");
+                    return ActionResult.Failure;
+                }
+                ProcessStartInfo psi = new ProcessStartInfo();
+                psi.FileName = arguments[0];
+                psi.Arguments = "mysql-5.5-gpl";
+                Process.Start(psi);
+            }
+            catch (Exception ex)
+            {
+                session.Log(ex.Message);
+                return ActionResult.Failure;
+            }
+
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult DeleteFiles(Session session)
+        {
+            session.Log("Begin DeleteFiles");
+
+            try
+            {
+                string[] arguments = GetCustomActionDataArguments(session);
+
+                if (arguments == null || arguments.Length != 2)
+                {
+                    session.Log("Error retrieving directories to delete");
+                    return ActionResult.Failure;
+                }
+                Directory.Delete(arguments[0], true);
+                Directory.Delete(arguments[1], true);
+            }
+            catch (Exception ex)
+            {
+                session.Log(ex.Message);
+                return ActionResult.Failure;
+            }
+
+            return ActionResult.Success;
+        }
+
+        private static string[] GetCustomActionDataArguments(Session session)
+        {
+            string[] keys = new string[session.CustomActionData.Keys.Count];
+            session.CustomActionData.Keys.CopyTo(keys, 0);
+            return keys[0].Split(',');
+        }
+    }
+}

=== added file 'MySQLCA/MySQLCA.csproj'
--- a/MySQLCA/MySQLCA.csproj	1970-01-01 00:00:00 +0000
+++ b/MySQLCA/MySQLCA.csproj	2011-02-10 19:36:56 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MySQLCA</RootNamespace>
+    <AssemblyName>MySQLCA</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.Deployment.WindowsInstaller" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomAction.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="CustomAction.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(WixCATargetsPath)" />
+  <PropertyGroup>
+    <PostBuildEvent>copy $(TargetDir)\MySQLCA.CA.dll $(SolutionDir)\Setup\MySQLCA.CA.dll</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

=== added directory 'MySQLCA/Properties'
=== added file 'MySQLCA/Properties/AssemblyInfo.cs'
--- a/MySQLCA/Properties/AssemblyInfo.cs	1970-01-01 00:00:00 +0000
+++ b/MySQLCA/Properties/AssemblyInfo.cs	2011-02-10 19:36:56 +0000
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MySQLCA")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MySQLCA")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ad43cdd8-6d18-4aed-8695-e4f10cef7f7e")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

=== modified file 'Setup/Product.wxs'
--- a/Setup/Product.wxs	2011-02-09 23:58:01 +0000
+++ b/Setup/Product.wxs	2011-02-10 19:36:56 +0000
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?define ProductName="MySQL Universal Installer"?>
-<?define ProductVersion="1.0.7"?>
-<?define CatalogName="mysql-5.1-gpl"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
+<?define ProductVersion="1.0.7.0"?>
+<?define CatalogName="mysql-5.5-gpl"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  
+
   <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)"
-           Manufacturer="Oracle" 
+           Manufacturer="Oracle"
            UpgradeCode="87973E15-B594-4EC5-B80F-6BBF4623E7C4">
     <Package InstallerVersion="200" Compressed="yes" />
     <Upgrade Id="87973E15-B594-4EC5-B80F-6BBF4623E7C4">
       <UpgradeVersion OnlyDetect="no" Minimum="$(var.ProductVersion)" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
       <UpgradeVersion OnlyDetect="no" Maximum="$(var.ProductVersion)" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="yes" />
     </Upgrade>
+
     <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
     <Icon Id="InstallerIcon.exe" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
     <Property Id="ARPPRODUCTICON" Value="InstallerIcon.exe"/>
@@ -27,27 +28,13 @@
                 <Shortcut Id="mainShortcut" Directory="ShortCutDir" Advertise="yes" Icon="InstallerIcon.exe"
                           Name="MySQL Universal Installer" WorkingDirectory="INSTALLLOCATION"/>
               </File>
-              <File Id="WexInstallerUpdater.exe" Name="WexInstallerUpdater.exe" 
+              <File Id="WexInstallerUpdater.exe" Name="WexInstallerUpdater.exe"
                     Source="$(var.ProjectDir)..\WexInstallerUpdater\bin\$(var.Configuration)\WexInstallerUpdater.exe"/>
               <File Id="MySql.Data.dll" Name="MySql.Data.dll" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\mysql.data.dll"/>
               <File Id="WexInstaller.Core.dll" Name="WexInstaller.Core.dll" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\wexinstaller.core.dll"/>
               <File Id="StandardPlugins.dll" Name="StandardPlugins.dll" Source="$(var.ProjectDir)..\StandardPlugins\bin\$(var.Configuration)\standardplugins.dll"/>
               <RemoveFolder Id="DeleteShortcutFolder1" Directory="PMCompanyDir" On="uninstall" />
               <RemoveFolder Id="DeleteShortcutFolder2" Directory="ShortCutDir" On="uninstall" />
-              <Registry Action="remove" Root="HKLM" 
-                        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayVersion"/>
-            </Component>
-            <Component Id="C_RemoveFiles" Guid="973F9091-5868-4D4D-A9E9-AC854D2591F3">
-              <Condition>NOT UPGRADINGPRODUCTCODE</Condition>
-              <!-- remove program files folder -->
-              <RemoveFile Id="WexInstallRemoveFiles" Directory="INSTALLLOCATION" On="uninstall" Name="*.*"/>
-              <RemoveFolder Id="WexInstallRemoveFolder" Directory="INSTALLLOCATION" On="uninstall"/>
-              <!-- remove cache folder -->
-              <RemoveFile Id="WexRemoveCacheFiles" Directory="ProductCache" On="uninstall" Name="*.*"/>
-              <RemoveFolder Id="WexRemoveCacheFolder" Directory="ProductCache" On="uninstall"/>
-              <!-- remove programdata files/folder -->
-              <RemoveFile Id="WexRemoveDataFiles" Directory="UniversalInstaller" On="uninstall" Name="*.*"/>
-              <RemoveFolder Id="WexRemoveDataFolder" Directory="UniversalInstaller" On="uninstall"/>
             </Component>
           </Directory>
         </Directory>
@@ -76,17 +63,15 @@
                 <util:XmlFile Id="SetProductCachePath" Action="setValue" ElementPath="//ProductCachePath" Value="[ProductCache]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="1" />
                 <util:XmlFile Id="SetInstallationRoot" Action="setValue" ElementPath="//InstallationRoot" Value="[INSTALLLOCATION]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="2" />
                 <util:XmlFile Id="SetProductCode" Action="setValue" ElementPath="//ProductCode" Value="[ProductCode]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="3" />
-                <File Id="server" Name="mysql-5.1.54-win32.msi" Source="ProductCache\mysql-5.1.54-win32.msi"/>
+                <!--<File Id="server" Name="mysql-5.1.54-win32.msi" Source="ProductCache\mysql-5.1.54-win32.msi"/>-->
+                <!--<File Id="server" Name="mysql-5.5.8-win32.msi" Source="ProductCache\mysql-5.5.8-win32.msi"/>
                 <File Id="workbench" Name="mysql-workbench-gpl-5.2.31a-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.31a-win32.msi"/>
-                
                 <File Id="connector_odbc" Name="mysql-connector-odbc-5.1.6-win32.msi" Source="ProductCache\mysql-connector-odbc-5.1.6-win32.msi"/>
-                <File Id="connector_cpp" Name="mysql-connector-c++-1.0.5-win32.msi" Source="ProductCache\mysql-connector-c++-1.0.5-win32.msi"/>
+                <File Id="connector_cpp" Name="mysql-connector-c++-1.0.5-win32.msi" Source="ProductCache\mysql-connector-c++-1.0.5-win32.msi"/>-->
                 <File Id="connector_c" Name="mysql-connector-c-6.0.2-win32.msi" Source="ProductCache\mysql-connector-c-6.0.2-win32.msi"/>
-
-                <File Id="examples" Name="mysql-examples-5.1.0.msi" Source="ProductCache\mysql-examples-5.1.0.msi"/>
-
+                <!--<File Id="examples" Name="mysql-examples-5.1.0.msi" Source="ProductCache\mysql-examples-5.1.0.msi"/>
                 <File Id="universion_docs" Name="mysql-universal-installer-document-bundle-1.0.0.0.msi" 
-                      Source="ProductCache\mysql-universal-installer-document-bundle-1.0.0.0.msi"/>
+                      Source="ProductCache\mysql-universal-installer-document-bundle-1.0.0.0.msi"/>-->
               </Component>
             </Directory>
           </Directory>
@@ -99,21 +84,28 @@
       <ComponentRef Id="WexInstaller.exe" />
       <ComponentRef Id="ConfigFiles" />
       <ComponentRef Id="Products" />
-      <ComponentRef Id="C_RemoveFiles"/>
     </Feature>
-    
+
     <PropertyRef Id="NETFRAMEWORK35"/>
     <Condition Message="This application requires .NET Framework 3.5. Please install the .NET Framework then run this installer again.">
       <![CDATA[Installed OR NETFRAMEWORK35]]>
     </Condition>
 
+    <Binary Id="MySQLCA" SourceFile="MySQLCA.CA.dll"/>
+
+    <CustomAction Id="DeleteFiles" BinaryKey="MySQLCA" DllEntry="DeleteFiles" Execute="deferred" Impersonate="no" Return="ignore"/>
+    <CustomAction Id="DeleteFiles.SetProperty" Return="check" Property="DeleteFiles" Value="[INSTALLLOCATION],[UniversalInstaller]"/>
+
     <CustomAction Id="SetLaunchApp" Property="LaunchAppPath" Value="[#WexInstaller.exe]"/>
-    <CustomAction Id="LaunchApp" Property="LaunchAppPath" ExeCommand="$(var.CatalogName)" Execute="deferred" Impersonate="no" Return="asyncNoWait"/>
+    <CustomAction Id="LaunchApp" Property="LaunchAppPath" ExeCommand="" Execute="deferred" Impersonate="no" Return="asyncNoWait"/>
 
     <InstallExecuteSequence>
       <RemoveExistingProducts After="InstallInitialize" />
       <Custom Action="SetLaunchApp" After="PublishProduct"/>
-      <Custom Action="LaunchApp" After="SetLaunchApp">NOT INSTALLED OR UPGRADINGPRODUCTCODE</Custom>
+      <Custom Action="LaunchApp" After="SetLaunchApp">NOT(REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE)</Custom>
+      
+      <Custom Action="DeleteFiles.SetProperty" Before="InstallFinalize">REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE</Custom>
+      <Custom Action="DeleteFiles" After="DeleteFiles.SetProperty">REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE</Custom>
     </InstallExecuteSequence>
 
   </Product>

=== modified file 'StandardPlugins/StandardPlugins.csproj'
--- a/StandardPlugins/StandardPlugins.csproj	2011-02-09 17:35:42 +0000
+++ b/StandardPlugins/StandardPlugins.csproj	2011-02-10 19:36:56 +0000
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mysql.data">

=== modified file 'WexInstaller.Core/Logger.cs'
--- a/WexInstaller.Core/Logger.cs	2011-02-08 21:28:42 +0000
+++ b/WexInstaller.Core/Logger.cs	2011-02-10 19:36:56 +0000
@@ -12,6 +12,8 @@
 
         static Logger()
         {
+            source.Switch = new SourceSwitch("sourceSwitch");
+            source.Switch.Level = SourceLevels.All;
             listener = new LoggerListener();
             source.Listeners.Add(listener);
         }

=== modified file 'WexInstaller.Core/WexInstaller.Core.csproj'
--- a/WexInstaller.Core/WexInstaller.Core.csproj	2011-02-09 17:35:42 +0000
+++ b/WexInstaller.Core/WexInstaller.Core.csproj	2011-02-10 19:36:56 +0000
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WexInstaller.Core</RootNamespace>
     <AssemblyName>WexInstaller.Core</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

=== modified file 'WexInstaller/WexInstaller.csproj'
--- a/WexInstaller/WexInstaller.csproj	2011-02-09 17:35:42 +0000
+++ b/WexInstaller/WexInstaller.csproj	2011-02-10 19:36:56 +0000
@@ -44,6 +44,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -53,6 +54,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -300,7 +302,6 @@
     <EmbeddedResource Include="RemovePanels\RemoveProgress.resx">
       <DependentUpon>RemoveProgress.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="app.config" />
     <None Include="app.manifest" />
     <None Include="Design.cd" />
   </ItemGroup>

=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln	2011-02-10 01:24:59 +0000
+++ b/installer-vs2010.sln	2011-02-10 19:36:56 +0000
@@ -23,6 +23,10 @@
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Web", "Setup\Setup_Web.wixproj", "{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WiX_CustomAction", "WiX_CustomAction\WiX_CustomAction.vcxproj", "{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySQLCA", "MySQLCA\MySQLCA.csproj", "{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -92,6 +96,7 @@
 		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Debug|x86.Build.0 = Debug|Any CPU
 		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Release|Any CPU.Build.0 = Release|Any CPU

 		{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -116,6 +121,7 @@
 		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Debug|x86.Build.0 = Debug|Any CPU
 		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -146,6 +152,30 @@
 		{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|Win32.ActiveCfg = Release|x86
 		{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|x86.ActiveCfg = Release|x86
 		{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|x86.Build.0 = Release|x86
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Win32.Build.0 = Debug|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|x86.ActiveCfg = Debug|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Any CPU.ActiveCfg = Release|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Win32.ActiveCfg = Release|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Win32.Build.0 = Release|Win32
+		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|x86.ActiveCfg = Release|Win32
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Win32.ActiveCfg = Debug|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|x86.ActiveCfg = Debug|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|x86.Build.0 = Debug|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Release|Any CPU.ActiveCfg = Release|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Release|Win32.ActiveCfg = Release|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Release|x86.ActiveCfg = Release|x86
+		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110210193656-wku5va80ba5le13b.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:329) Reggie Burnett10 Feb