#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped
382 Reggie Burnett 2011-03-23
small change to make sure WexInstaller is built before StandardPlugins so our post build event will work
modified:
StandardPlugins/StandardPlugins.csproj
installer.sln
=== modified file 'StandardPlugins/StandardPlugins.csproj'
=== modified file 'StandardPlugins/StandardPlugins.csproj'
--- a/StandardPlugins/StandardPlugins.csproj 2011-03-23 22:14:21 +0000
+++ b/StandardPlugins/StandardPlugins.csproj 2011-03-23 22:21:20 +0000
@@ -133,7 +133,8 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>copy $(TargetPath) $(SolutionDir)\WexInstaller\bin\$(ConfigurationName)\$(TargetFileName)
+ <PostBuildEvent>
+copy $(TargetPath) $(SolutionDir)\WexInstaller\bin\$(ConfigurationName)\$(TargetFileName)
copy $(TargetPath) $(SolutionDir)\WexCmd\bin\$(ConfigurationName)\$(TargetFileName)
copy $(TargetDir)\mysql.data.dll $(SolutionDir)\WexInstaller\bin\$(ConfigurationName)\mysql.data.dll</PostBuildEvent>
</PropertyGroup>
=== modified file 'installer.sln'
--- a/installer.sln 2011-03-23 22:14:21 +0000
+++ b/installer.sln 2011-03-23 22:21:20 +0000
@@ -4,7 +4,6 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WexInstaller", "WexInstaller\WexInstaller.csproj", "{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}"
ProjectSection(ProjectDependencies) = postProject
{27F00801-BEAE-417F-9CF5-5686923F7538} = {27F00801-BEAE-417F-9CF5-5686923F7538}
- {C471DBDA-2AFA-4EA3-970A-795133F1FE1A} = {C471DBDA-2AFA-4EA3-970A-795133F1FE1A}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestService", "UnitTestService\UnitTestService.csproj", "{27F00801-BEAE-417F-9CF5-5686923F7538}"
@@ -14,6 +13,10 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WexInstallerUpdater", "WexInstallerUpdater\WexInstallerUpdater.csproj", "{A54EF986-DFDA-45BD-A901-C908C846A02B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardPlugins", "StandardPlugins\StandardPlugins.csproj", "{C471DBDA-2AFA-4EA3-970A-795133F1FE1A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414} = {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}
+ {92E2DA5A-2AA4-4475-A20A-910661A55A78} = {92E2DA5A-2AA4-4475-A20A-910661A55A78}
+ EndProjectSection
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Examples 5.1", "Examples\Examples 5.1.wixproj", "{13190F97-5D72-4949-A77A-500A57DA44BB}"
EndProject
@@ -60,6 +63,7 @@
{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|Any CPU.Build.0 = 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
@@ -166,6 +170,7 @@
{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|Any CPU.Build.0 = 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
@@ -179,6 +184,7 @@
{57913AF9-D535-4B13-A088-8DF74FD47A53}.Debug|x86.ActiveCfg = Debug|x86
{57913AF9-D535-4B13-A088-8DF74FD47A53}.Debug|x86.Build.0 = Debug|x86
{57913AF9-D535-4B13-A088-8DF74FD47A53}.Release|Any CPU.ActiveCfg = Release|x86
+ {57913AF9-D535-4B13-A088-8DF74FD47A53}.Release|Any CPU.Build.0 = Release|x86
{57913AF9-D535-4B13-A088-8DF74FD47A53}.Release|Mixed Platforms.ActiveCfg = Release|x86
{57913AF9-D535-4B13-A088-8DF74FD47A53}.Release|Mixed Platforms.Build.0 = Release|x86
{57913AF9-D535-4B13-A088-8DF74FD47A53}.Release|Win32.ActiveCfg = Release|x86
@@ -213,6 +219,7 @@
{92E2DA5A-2AA4-4475-A20A-910661A55A78}.Debug|x86.ActiveCfg = Debug|x86
{92E2DA5A-2AA4-4475-A20A-910661A55A78}.Debug|x86.Build.0 = Debug|x86
{92E2DA5A-2AA4-4475-A20A-910661A55A78}.Release|Any CPU.ActiveCfg = Release|x86
+ {92E2DA5A-2AA4-4475-A20A-910661A55A78}.Release|Any CPU.Build.0 = Release|x86
{92E2DA5A-2AA4-4475-A20A-910661A55A78}.Release|Mixed Platforms.ActiveCfg = Release|x86
{92E2DA5A-2AA4-4475-A20A-910661A55A78}.Release|Mixed Platforms.Build.0 = Release|x86
{92E2DA5A-2AA4-4475-A20A-910661A55A78}.Release|Win32.ActiveCfg = Release|x86
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110323222120-hbb060e3b3o123tg.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (reggie.burnett:382) | Reggie Burnett | 23 Mar |
