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:
Sebastiaan Janssen
2012-11-08 11:30:10 -01:00
parent 3a6dae9d0d b2e4489e66
commit bd4e6eaa62
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/web.Template.Debug.config
View File

@@ -16,6 +16,8 @@
-->
<system.web>
<compilation debug="true" xdt:Transform="SetAttributes(debug)" />
<trust level="Medium" xdt:Transform="Remove" />
<trust level="Medium" originUrl=".*" xdt:Transform="Insert" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.

1
src/Umbraco.Web.UI/web.Template.Release.config
View File

@@ -15,6 +15,7 @@
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<trust xdt:Transform="Remove"/>
<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
</customErrors>

1
src/Umbraco.Web.UI/web.Template.config
View File

@@ -75,6 +75,7 @@
</connectionStrings>
<system.web>
<customErrors mode="RemoteOnly" />
<trust level="Medium" originUrl=".*"/>
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />

7
src/umbraco.presentation.targets
View File

@@ -71,7 +71,7 @@
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false"
Condition="!Exists('$(OutputFileName)')"
/>
/>
</Target>
<Target Name="CustomTarget" AfterTargets="CopyWebConfig">
@@ -86,7 +86,8 @@
<Message Text="$(OriginalFileName)" Importance="high" />
<Message Text="$(OutputFileName)" Importance="high" />
<TransformXml Source="$(OriginalFileName)" Transform="$(WebConfigSource)" Destination="$(OutputFileName)" />
<TransformXml Condition="$(BuildingInsideVisualStudio) == ''" Source="$(OriginalFileName)" Transform="$(WebConfigSource)" Destination="$(OutputFileName)" />
<TransformXml Condition="$(BuildingInsideVisualStudio) == 'true'" Source="$(OutputFileName)" Transform="$(WebConfigSource)" Destination="$(OutputFileName)" />
</Target>
<Target Name="ResetConfigFiles" Condition="$(ProjDir) != $(ProjOutputDir)" BeforeTargets="Build;Rebuild" Inputs="@(ConfigFiles)" Outputs="%(Identity).Dummy">
@@ -105,7 +106,7 @@
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false"
Condition="Exists('$(ModifiedFileName)')"/>
</Target>
</Project>

4
src/umbraco.sln
View File

@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-1
..\docs\ReleaseNotes.txt = ..\docs\ReleaseNotes.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web", "Umbraco.Web\Umbraco.Web.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "umbraco.businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}"
@@ -58,8 +60,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Core", "Umbraco.Cor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests", "Umbraco.Tests\Umbraco.Tests.csproj", "{5D3B8245-ADA6-453F-A008-50ED04BFE770}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = umbraco2.vsmdi