Conflicts: src/Umbraco.Core/UriExtensions.cs src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs src/Umbraco.Tests/Umbraco.Tests.csproj src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web/Editors/MediaController.cs src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs src/Umbraco.Web/Security/WebSecurity.cs src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/UmbracoContext.cs src/Umbraco.Web/UmbracoModule.cs src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs src/Umbraco.Web/WebApi/UmbracoApiController.cs src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
79 lines
3.6 KiB
XML
79 lines
3.6 KiB
XML
<?xml version="1.0"?>
|
|
|
|
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
|
|
<!--
|
|
CAREFUL!
|
|
========
|
|
|
|
ONLY edit this if a certain change NEEDS to go into the config file of EVERYBODY contributing to the project.
|
|
|
|
After first build you will get your own web.config, which is no included in source control.
|
|
|
|
In the web.config you can edit all you want, it won't be overwritten, but it WILL be altered by this transform file.
|
|
|
|
The transforms in this file only apply to debugging, not to the web.config that will be released, see web.Template.Release.config for that
|
|
|
|
2012-11-08 SJ - Add Medium trust for everybody so we'll see any MedTrust related errors early on
|
|
-->
|
|
|
|
|
|
<configSections>
|
|
<section name="Examine" type="Examine.Config.ExamineSettings, Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"/>
|
|
<section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"/>
|
|
</configSections>
|
|
|
|
<appSettings>
|
|
<add key="umbracoDbDSN" xdt:Transform="Remove" xdt:Locator="Match(key)" />
|
|
</appSettings>
|
|
|
|
<system.web>
|
|
<compilation debug="true" xdt:Transform="SetAttributes(debug)" />
|
|
<!-- We no longer support medium trust so just remove it -->
|
|
<trust xdt:Transform="Remove" />
|
|
</system.web>
|
|
|
|
<runtime>
|
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
|
|
<!-- Ensure correct version of MVC -->
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Helpers']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
|
|
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
|
|
<bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
|
|
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages.Razor']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
|
|
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
|
</dependentAssembly>
|
|
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
|
|
<bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
|
|
</dependentAssembly>
|
|
|
|
</assemblyBinding>
|
|
|
|
</runtime>
|
|
|
|
</configuration> |