yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Morten Christensen
2013-01-18 09:01:10 -01:00
parent b5a140945a f5ce9dc9d0
commit 98b8db7e3d
14 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/Build.proj
View File

@@ -147,7 +147,7 @@
</Target>
<!-- Copy the transformed web.config file to the root -->
<Target Name="CopyTransformedWebConfig" DependsOnTargets="CompileProjects">
<Target Name="CopyTransformedWebConfig" DependsOnTargets="CopyXmlDocumentation">
<ItemGroup>
<WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
</ItemGroup>
@@ -158,6 +158,19 @@
SkipUnchangedFiles="false" />
</Target>
<!-- Copy the xml documentation to the bin folder -->
<Target Name="CopyXmlDocumentation" DependsOnTargets="CompileProjects">
<ItemGroup>
<XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
</ItemGroup>
<Copy SourceFiles="@(XmlDocumentationFiles)"
DestinationFiles="@(XmlDocumentationFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Message Text="CopyXmlDocumentation" />
</Target>
<Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
<Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
<!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->

1
src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
View File

@@ -39,6 +39,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -31,6 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Umbraco.Core.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">

5
src/Umbraco.Web/WebBootManager.cs
View File

@@ -47,11 +47,6 @@ namespace Umbraco.Web
if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
}
public void Boot()
{
InitializeResolvers();
}
/// <summary>
/// Initialize objects before anything during the boot cycle happens
/// </summary>

1
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
View File

@@ -39,6 +39,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\umbraco.MacroEngines.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.42.2941, Culture=neutral, processorArchitecture=MSIL">

2
src/umbraco.businesslogic/umbraco.businesslogic.csproj
View File

@@ -88,7 +88,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\release\businesslogic.XML</DocumentationFile>
<DocumentationFile>bin\release\businesslogic.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>

2
src/umbraco.cms/umbraco.cms.csproj
View File

@@ -88,7 +88,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\cms.XML</DocumentationFile>
<DocumentationFile>bin\Release\cms.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>

2
src/umbraco.controls/umbraco.controls.csproj
View File

@@ -62,7 +62,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\controls.XML</DocumentationFile>
<DocumentationFile>bin\Release\controls.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>

2
src/umbraco.datalayer/umbraco.datalayer.csproj
View File

@@ -62,7 +62,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\umbraco.DataLayer.XML</DocumentationFile>
<DocumentationFile>bin\Release\umbraco.DataLayer.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>

2
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -88,7 +88,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\umbraco.editorControls.XML</DocumentationFile>
<DocumentationFile>bin\Release\umbraco.editorControls.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>

2
src/umbraco.interfaces/umbraco.interfaces.csproj
View File

@@ -86,7 +86,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\interfaces.XML</DocumentationFile>
<DocumentationFile>bin\Release\interfaces.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>

2
src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
View File

@@ -88,7 +88,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\umbraco.macroRenderings.XML</DocumentationFile>
<DocumentationFile>bin\Release\umbraco.macroRenderings.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>

2
src/umbraco.providers/umbraco.providers.csproj
View File

@@ -60,7 +60,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\umbraco.providers.XML</DocumentationFile>
<DocumentationFile>bin\Release\umbraco.providers.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>

2
src/umbraco.webservices/umbraco.webservices.csproj
View File

@@ -58,7 +58,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\umbraco.webservices.XML</DocumentationFile>
<DocumentationFile>bin\Release\umbraco.webservices.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>