swcs/OurUmbraco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into move-masterpages-to-views

Browse Source 
# Conflicts:
#	.gitignore
#	OurUmbraco.Site/OurUmbraco.Site.csproj
#	OurUmbraco.Site/Views/MacroPartials/Members/ForgotPassword.cshtml
#	OurUmbraco.Site/Views/Partials/Members/ForgotPassword.cshtml
#	OurUmbraco.Site/Views/Partials/Members/Login.cshtml
#	OurUmbraco.Site/Views/Search/Search.aspx.cs
#	OurUmbraco.Site/Views/Web.config
#	OurUmbraco.Site/config/ClientDependency.config
#	OurUmbraco.Site/config/Dashboard.config
#	OurUmbraco.Site/config/imageprocessor/cache.config
#	OurUmbraco.Site/masterpages/Community.master
#	OurUmbraco.Site/masterpages/ReleaseProgress.master
#	OurUmbraco.Site/masterpages/Repository/Projects.master
#	OurUmbraco.Site/masterpages/popular.master
#	OurUmbraco.Site/packages.config
#	OurUmbraco/Our/Controllers/LoginController.cs
#	OurUmbraco/Our/MigrationsHandler.cs
#	OurUmbraco/OurUmbraco.csproj
#	OurUmbraco/packages.config
This commit is contained in:
Sebastiaan Janssen
2017-01-21 18:47:09 +01:00
parent fd12775e86
commit e8565650e4
54 changed files with 1061 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
live.proj
+13 -5
View File
@@ -1,4 +1,4 @@
<Project DefaultTargets="TransformWebConfig" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="TransformConfigs" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectPath>.\</ProjectPath>
<SourceDirectory>.\OurUmbraco.Site\</SourceDirectory>
@@ -10,20 +10,28 @@
<UsingTask TaskName="TransformXml" AssemblyFile="$(DeployHelperDirectory)Microsoft.Web.Publishing.Tasks.dll"/>
<Target Name="TransformWebConfig">
<Target Name="TransformConfigs">
<PropertyGroup>
<WebConfigTransformInputFile>$(SourceDirectory)web.config</WebConfigTransformInputFile>
<WebConfigTransformFile>$(DeployHelperDirectory)\$(ProjectName)\ConfigTransforms\Web.$(Environment).config</WebConfigTransformFile>
<WebConfigTransformOutputFolder>$(DeployHelperDirectory)\$(ProjectName)\$(Environment)\</WebConfigTransformOutputFolder>
<ApplicationInsightsConfigTransformInputFile>$(SourceDirectory)ApplicationInsights.config</ApplicationInsightsConfigTransformInputFile>
<ApplicationInsightsConfigTransformFile>$(DeployHelperDirectory)\$(ProjectName)\ConfigTransforms\ApplicationInsights.$(Environment).config</ApplicationInsightsConfigTransformFile>
<ConfigTransformOutputFolder>$(DeployHelperDirectory)\$(ProjectName)\$(Environment)\</ConfigTransformOutputFolder>
<StackTraceEnabled>False</StackTraceEnabled>
</PropertyGroup>
<MakeDir Directories="$(WebConfigTransformOutputFolder)"/>
<MakeDir Directories="$(ConfigTransformOutputFolder)"/>
<TransformXml Source="$(WebConfigTransformInputFile)"
Transform="$(WebConfigTransformFile)"
Destination="$(WebConfigTransformOutputFolder)\Web.config"
Destination="$(ConfigTransformOutputFolder)\Web.config"
StackTrace="$(StackTraceEnabled)" />
<TransformXml Source="$(ApplicationInsightsConfigTransformInputFile)"
Transform="$(ApplicationInsightsConfigTransformFile)"
Destination="$(ConfigTransformOutputFolder)\ApplicationInsights.config"
StackTrace="$(StackTraceEnabled)" />
</Target>
</Project>