#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:iggy@strippedcsg
275 Reggie Burnett 2011-01-31
Added BlankDisplayVersion custom action to the installation. This CA will blank the DisplayVersion registry value under uninstall so we don't see a version in Add/Remove. This will reduce user confusion when they install an older version after a new version.
modified:
Setup_Net/Product.wxs
Setup_Net/Setup_Net.wixproj
WiX_CustomAction/WiX_CustomAction.cpp
WiX_CustomAction/WiX_CustomAction.def
WiX_CustomAction/WiX_CustomAction.vcxproj
WiX_CustomAction/WiX_CustomAction.vcxproj.filters
WiX_CustomAction/WiX_CustomAction.vcxproj.user
installer-vs2010.sln
=== modified file 'Setup_Net/Product.wxs'
=== modified file 'Setup_Net/Product.wxs'
--- a/Setup_Net/Product.wxs 2011-01-28 21:51:06 +0000
+++ b/Setup_Net/Product.wxs 2011-01-31 19:39:01 +0000
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<?define ProductName="MySQL Universal Installer"?>
<?define ProductVersion="1.0.6"?>
-<?define CatalogName="mysql-5.1-gpl"?>
+<?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"
+ <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)"
+ 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="no" />
+ <UpgradeVersion OnlyDetect="no" Maximum="$(var.ProductVersion)" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="yes" />
</Upgrade>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
<Icon Id="InstallerIcon" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
@@ -32,11 +32,20 @@
<File Id="MySql.Data.dll" Name="MySql.Data.dll" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\mysql.data.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>
@@ -64,10 +73,11 @@
<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="workbench" Name="mysql-workbench-gpl-5.2.29-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.29-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.29-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.29-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="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"/>
-->
@@ -91,12 +101,19 @@
<![CDATA[Installed OR NETFRAMEWORK35]]>
</Condition>
+ <Binary Id="CustomAction.Binary" SourceFile="WiX_CustomAction.dll"/>
+
<CustomAction Id="SetLaunchApp" Property="LaunchAppPath" Value="[#WexInstaller.exe]"/>
<CustomAction Id="LaunchApp" Property="LaunchAppPath" ExeCommand="$(var.CatalogName)" Execute="deferred" Impersonate="no" Return="asyncNoWait"/>
+
+ <CustomAction Id="BlankDisplayVersion" BinaryKey="CustomAction.Binary" DllEntry="BlankDisplayVersion"
+ Execute="deferred" Return="ignore"/>
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallInitialize" />
<Custom Action="SetLaunchApp" After="PublishProduct"/>
<Custom Action="LaunchApp" After="SetLaunchApp">NOT INSTALLED OR UPGRADINGPRODUCTCODE</Custom>
+
+ <Custom Action="BlankDisplayVersion" After="PublishProduct">NOT INSTALLED OR UPGRADINGPRODUCTCODE</Custom>
</InstallExecuteSequence>
</Product>
=== modified file 'Setup_Net/Setup_Net.wixproj'
--- a/Setup_Net/Setup_Net.wixproj 2011-01-28 21:51:06 +0000
+++ b/Setup_Net/Setup_Net.wixproj 2011-01-31 19:39:01 +0000
@@ -41,10 +41,10 @@
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<PropertyGroup>
- <PreBuildEvent>copy ..\..\..\WiX_CustomAction\Release\WiX_CustomAction.dll ..\..\obj\Release</PreBuildEvent>
+ <PreBuildEvent />
</PropertyGroup>
<PropertyGroup>
- <PostBuildEvent>del ..\..\obj\Release\WiX_CustomAction.dll</PostBuildEvent>
+ <PostBuildEvent />
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
=== modified file 'WiX_CustomAction/WiX_CustomAction.cpp'
--- a/WiX_CustomAction/WiX_CustomAction.cpp 2010-08-03 20:06:03 +0000
+++ b/WiX_CustomAction/WiX_CustomAction.cpp 2011-01-31 19:39:01 +0000
@@ -7,7 +7,7 @@
// WcaIsPropertySetW() - returns TRUE if property is set
// Wide version of WcaIsPropertySet.
-WIX_CUSTOMACTION_API BOOL __stdcall WcaIsPropertySetW(__in LPWSTR szProperty)
+BOOL __stdcall WcaIsPropertySetW(__in LPWSTR szProperty)
{
DWORD cchProperty = 0;
UINT er= MsiGetPropertyW(WcaGetInstallHandle(), szProperty, L"",
@@ -22,7 +22,7 @@
// immediateName - Property name that holds the custom action data when it's run immediately.
// propertyValue - Will hold the retrieved value.
// immediateAction - Is this being run immediately? Used to update progress bar.
-WIX_CUSTOMACTION_API HRESULT __stdcall GetCAPropValue(__in LPCWSTR immediateName,
+HRESULT __stdcall GetCAPropValue(__in LPCWSTR immediateName,
__out LPWSTR *propertyValue,
__out BOOL *immediateAction)
{
@@ -58,7 +58,7 @@
return hr;
}
-WIX_CUSTOMACTION_API UINT __stdcall CALaunchApp(__in MSIHANDLE hInstall)
+UINT __stdcall CALaunchApp(__in MSIHANDLE hInstall)
{
HRESULT hr= S_OK;
HINSTANCE hi= 0;
@@ -95,3 +95,40 @@
return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : ERROR_SUCCESS);
}
+
+/*
+BlankDisplayVersion is used to blank the display version registry value for a just installed
+application.
+*/
+UINT __stdcall BlankDisplayVersion(MSIHANDLE hInstall)
+{
+ HRESULT hr = S_OK;
+ UINT er = ERROR_SUCCESS;
+ LPWSTR productCode = NULL;
+
+ hr = WcaInitialize(hInstall, "BlankDisplayVersion");
+ ExitOnFailure(hr, "Failed to initialize BlankDisplayVersion");
+
+ WcaLog(LOGMSG_STANDARD, "Initialized BlankDisplayVersion.");
+
+ hr = WcaGetProperty(TEXT("ProductCode"), &productCode);
+ ExitOnFailure(hr, "Unable to retrieve product code");
+
+ HKEY uninstallKey;
+ hr = RegOpenKey(HKEY_LOCAL_MACHINE,
+ TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), &uninstallKey);
+ ExitOnFailure(hr, "Unable to retrieve uninstall key");
+
+ HKEY productKey;
+ hr = RegOpenKey(uninstallKey, productCode, &productKey);
+ ExitOnFailure(hr, "Unable to open product key");
+
+ hr = RegDeleteValue(productKey, TEXT("DisplayVersion"));
+ ExitOnFailure(hr, "Unable to delete displayversion value");
+
+ WcaLog(LOGMSG_STANDARD, "Success in deleting display version value");
+
+LExit:
+ er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+ return WcaFinalize(er);
+}
\ No newline at end of file
=== modified file 'WiX_CustomAction/WiX_CustomAction.def'
--- a/WiX_CustomAction/WiX_CustomAction.def 2010-08-03 20:06:03 +0000
+++ b/WiX_CustomAction/WiX_CustomAction.def 2011-01-31 19:39:01 +0000
@@ -2,3 +2,4 @@
EXPORTS
CALaunchApp
+ BlankDisplayVersion
\ No newline at end of file
=== modified file 'WiX_CustomAction/WiX_CustomAction.vcxproj'
--- a/WiX_CustomAction/WiX_CustomAction.vcxproj 2010-08-03 20:06:03 +0000
+++ b/WiX_CustomAction/WiX_CustomAction.vcxproj 2011-01-31 19:39:01 +0000
@@ -11,93 +11,84 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{8B795758-E384-40C7-9BAA-12E70FFB5C71}</ProjectGuid>
+ <ProjectGuid>{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}</ProjectGuid>
+ <RootNamespace>CustomAction1</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <RootNamespace>WiX_CustomAction</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WIX_CUSTOMACTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(WIX)sdk\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>msi.lib;dutil_2010.lib;wcautil_2010.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(WIX)sdk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>Wix_CustomAction.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ModuleDefinitionFile>WiX_CustomAction.def</ModuleDefinitionFile>
+ <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>$(WIX)sdk\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WIX_CUSTOMACTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>C:\Program Files\Windows Installer XML v3.5\SDK\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>msi.lib;dutil_2010.lib;wcautil_2010.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(WIX)sdk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>WiX_CustomAction.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>C:\Program Files\Windows Installer XML v3.5\SDK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>wcautil.lib;dutil.lib;msi.lib;version.lib;Shell32.lib;Advapi32.lib;User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
- <ModuleDefinitionFile>WiX_CustomAction.def</ModuleDefinitionFile>
- <Version>1.0.0</Version>
+ <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <None Include="WiX_CustomAction.def" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="resource.h" />
- <ClInclude Include="stdafx.h" />
- <ClInclude Include="targetver.h" />
- <ClInclude Include="WiX_CustomAction.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="dllmain.cpp">
- <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeader>
- <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeader>
- </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -105,7 +96,11 @@
<ClCompile Include="WiX_CustomAction.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="WiX_CustomAction.rc" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="targetver.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="WiX_CustomAction.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
=== modified file 'WiX_CustomAction/WiX_CustomAction.vcxproj.filters'
--- a/WiX_CustomAction/WiX_CustomAction.vcxproj.filters 2010-08-03 20:06:03 +0000
+++ b/WiX_CustomAction/WiX_CustomAction.vcxproj.filters 2011-01-31 19:39:01 +0000
@@ -15,23 +15,12 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <None Include="WiX_CustomAction.def">
- <Filter>Source Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="targetver.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="WiX_CustomAction.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@@ -40,13 +29,10 @@
<ClCompile Include="WiX_CustomAction.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="dllmain.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="WiX_CustomAction.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
+ <None Include="WiX_CustomAction.def">
+ <Filter>Source Files</Filter>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
=== modified file 'WiX_CustomAction/WiX_CustomAction.vcxproj.user'
--- a/WiX_CustomAction/WiX_CustomAction.vcxproj.user 2010-08-03 20:06:03 +0000
+++ b/WiX_CustomAction/WiX_CustomAction.vcxproj.user 2011-01-31 19:39:01 +0000
@@ -1,3 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ShowAllFiles>false</ShowAllFiles>
+ </PropertyGroup>
</Project>
\ No newline at end of file
=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln 2011-01-28 21:51:06 +0000
+++ b/installer-vs2010.sln 2011-01-31 19:39:01 +0000
@@ -13,14 +13,23 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WexInstallerUpdater", "WexInstallerUpdater\WexInstallerUpdater.csproj", "{A54EF986-DFDA-45BD-A901-C908C846A02B}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Net", "Setup_Net\Setup_Net.wixproj", "{FBC6C598-EC89-49E6-8FE4-4140141761CC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E90F3B47-A980-4428-9A7C-2B1A68F9EA91} = {E90F3B47-A980-4428-9A7C-2B1A68F9EA91}
+ {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414} = {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}
+ {A54EF986-DFDA-45BD-A901-C908C846A02B} = {A54EF986-DFDA-45BD-A901-C908C846A02B}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WiX_CustomAction", "WiX_CustomAction\WiX_CustomAction.vcxproj", "{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|Win32 = Debug|Win32
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
+ Release|Win32 = Release|Win32
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -28,57 +37,79 @@
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Win32.ActiveCfg = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|x86.ActiveCfg = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|x86.Build.0 = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|Win32.ActiveCfg = Release|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|x86.ActiveCfg = Release|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|x86.Build.0 = Release|Any CPU
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Any CPU.ActiveCfg = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Any CPU.Build.0 = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Win32.ActiveCfg = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|x86.ActiveCfg = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|x86.Build.0 = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|Any CPU.ActiveCfg = Release|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|Mixed Platforms.ActiveCfg = Release|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|Mixed Platforms.Build.0 = Release|x86
+ {27F00801-BEAE-417F-9CF5-5686923F7538}.Release|Win32.ActiveCfg = Release|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|x86.ActiveCfg = Release|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Release|x86.Build.0 = Release|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Any CPU.ActiveCfg = Debug|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Any CPU.Build.0 = Debug|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|Win32.ActiveCfg = Debug|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|x86.ActiveCfg = Debug|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Debug|x86.Build.0 = Debug|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|Any CPU.ActiveCfg = Release|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|Mixed Platforms.ActiveCfg = Release|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|Mixed Platforms.Build.0 = Release|x86
+ {6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|Win32.ActiveCfg = Release|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|x86.ActiveCfg = Release|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|x86.Build.0 = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Any CPU.ActiveCfg = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Any CPU.Build.0 = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Win32.ActiveCfg = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|x86.ActiveCfg = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|x86.Build.0 = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|Any CPU.ActiveCfg = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|Mixed Platforms.ActiveCfg = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|Mixed Platforms.Build.0 = Release|x86
+ {A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|Win32.ActiveCfg = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|x86.ActiveCfg = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|x86.Build.0 = Release|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Any CPU.ActiveCfg = Debug|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Any CPU.Build.0 = Debug|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Win32.ActiveCfg = Debug|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|x86.ActiveCfg = Debug|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|x86.Build.0 = Debug|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Any CPU.ActiveCfg = Release|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Mixed Platforms.ActiveCfg = Release|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Mixed Platforms.Build.0 = Release|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Win32.ActiveCfg = Release|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|x86.ActiveCfg = Release|x86
{FBC6C598-EC89-49E6-8FE4-4140141761CC}.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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110131193901-rnzh63feruo8thc0.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (reggie.burnett:275) | Reggie Burnett | 31 Jan |
