From 19c3b251a02e344818b78ce454c8c0d7fbbcf048 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 19 Nov 2012 08:09:43 -0100 Subject: [PATCH] Include the VS targets file so that the build server can find it as well --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 2 +- .../Microsoft.WebApplication.targets | 389 ++++++++++++++++++ 3 files changed, 391 insertions(+), 2 deletions(-) create mode 100644 tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2a7d711ecf..40a150d287 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2346,7 +2346,7 @@ xcopy "$(ProjectDir)"..\..\lib\SQLCE4\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /D xcopy "$(ProjectDir)"..\..\lib\SQLCE4\x86\*.* "$(TargetDir)x86\" /Y /F /E /D - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 47e474b0fa..b0954d002e 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -2170,7 +2170,7 @@ xcopy /s /y "$(ProjectDir)umbraco.presentation\*.asmx" "$(ProjectDir)..\Umbraco. xcopy /s /y "$(ProjectDir)umbraco.presentation\*.ashx" "$(ProjectDir)..\Umbraco.Web.UI\" xcopy /s /y "$(ProjectDir)umbraco.presentation\*.master" "$(ProjectDir)..\Umbraco.Web.UI\" - + diff --git a/tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets b/tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets new file mode 100644 index 0000000000..0c9085319c --- /dev/null +++ b/tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets @@ -0,0 +1,389 @@ + + + + + + + False + True + False + $(WebProjectOutputDirInsideProjectDefault) + False + False + False + True + False + + + + + $(MSBuildProjectDirectory) + $(OutDir)_PublishedWebsites\$(MSBuildProjectName) + + + + + $(PrepareForRunDependsOn); + CopySilverlightApplications; + _CopyBinDeployableAssemblies; + + + $(PrepareForRunDependsOn); + _CopyWebApplication; + _BuiltWebOutputGroupOutput + + + + + + + + + $(CleanDependsOn); + CleanWebProjectOutputDir; + + + + + + + + + + + + + + + + + + + + + + _CopyWebApplicationLegacy; + + + _WPPCopyWebApplication; + + + $(OnBefore_CopyWebApplicationDefault); + + + + + + <_CopyWebApplicationDependsOn Condition="'$(_CopyWebApplicationDependsOn)'==''"> + $(OnBefore_CopyWebApplication); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_SilverlightApplications Include="@(_AllSilverlightApplications)" Condition="Exists('%(Identity)')"/> + <_SilverlightApplicationsNotExist Include="@(_AllSilverlightApplications)" Condition="!Exists('%(Identity)')"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _bin_deployableAssemblies\ + $([System.IO.Path]::GetFullPath($(BinDeployableFolder))) + + + + + + + + + + <_binDeployableAssemblies Include ="@(__binDeployableAssemblies)" Condition="'@(__binDeployableAssemblies)' != ''"> + $([System.String]::Concat($([System.IO.Path]::GetDirectoryName($([System.String]::new('%(__binDeployableAssemblies.FullPath)')))),'\').SubString($(BinDeployableFolderFullPath.Length))) + + + + + + + + + + + + + + + + + + + + $(OnBeforePipelineCollectFilesPhase); + CopySilverlightApplications; + + + + +