diff --git a/.hgignore b/.hgignore index 37f74d35c3..7709452fba 100644 --- a/.hgignore +++ b/.hgignore @@ -64,4 +64,5 @@ src/Umbraco.Tests/config/umbracoSettings.config src/Umbraco.Web.UI/App_Plugins/* src/Umbraco.Web.UI/Views/* -src\Umbraco.Web.UI\[W]eb.config \ No newline at end of file +src\Umbraco.Web.UI\[W]eb.config +*.transformed diff --git a/build/Build.proj b/build/Build.proj index e4a506b350..7f962f29d6 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -1,4 +1,4 @@ - + @@ -84,13 +84,6 @@ - - @@ -101,11 +94,9 @@ - - @@ -119,7 +110,6 @@ - @@ -143,7 +133,7 @@ - + @@ -152,80 +142,26 @@ + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 1c69096a78..1b159e1032 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2245,7 +2245,28 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" - + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets index d0d2922b3e..6bceb13987 100644 --- a/src/umbraco.presentation.targets +++ b/src/umbraco.presentation.targets @@ -57,39 +57,6 @@ ***************************************************** --> - - - - - $(ProjDir)Web.Template.config - $(ProjOutputDir)Web.config - - - - - - - - - - - $(ProjDir)Web.Template.config - $(ProjOutputDir)Web.config - - - - - - - - - diff --git a/tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets b/tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets deleted file mode 100644 index 0c9085319c..0000000000 --- a/tools/BuildTargets/WebApplications/Microsoft.WebApplication.targets +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - 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; - - - - -