Conflicts: src/Umbraco.Core/Configuration/UmbracoConfig.cs src/Umbraco.Core/CoreBootManager.cs src/Umbraco.Core/Manifest/ManifestBuilder.cs src/Umbraco.Core/Manifest/ManifestParser.cs src/Umbraco.Core/Persistence/Migrations/MigrationResolver.cs src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionFourNineZero/RemoveUmbracoAppConstraints.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AssignMissingKeysAndIndexes.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/RemoveHelpTextColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/UpdateUniqueIdToHaveCorrectIndexType.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddIndexToUmbracoNodeTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddMissingForeignKeyForContentType.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AlterDataTypePreValueTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/RemoveCmsDocumentAliasColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/DeleteAppTables.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/EnsureAppsTreesUpdated.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/MoveMasterContentTypeData.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/NewCmsContentType2ContentTypeTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/RemoveMasterContentTypeColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/RenameCmsTabTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/RenameTabIdColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsContentTypeAllowedContentTypeTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsContentTypeTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsContentVersionTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsPropertyTypeGroupTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixOneZero/CreateServerRegistryTable.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys2.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/ChangePasswordColumn.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/UpdateToNewMemberPropertyAliases.cs src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs src/Umbraco.Core/Persistence/RepositoryFactory.cs src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs src/Umbraco.Core/Services/MemberService.cs src/Umbraco.Core/Services/ServerRegistrationService.cs src/Umbraco.Core/Sync/ConfigServerRegistrar.cs src/Umbraco.Core/Sync/ServerMessengerResolver.cs src/Umbraco.Core/Sync/ServerRegistrarResolver.cs src/Umbraco.Core/Umbraco.Core.csproj src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs src/Umbraco.Tests/CodeFirst/Definitions/ContentTypeDefinitionFactory.cs src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs src/Umbraco.Tests/Plugins/TypeFinderTests.cs src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/config/ClientDependency.config src/Umbraco.Web.UI/packages.config src/Umbraco.Web.UI/umbraco/Views/Default.cshtml src/Umbraco.Web/BaseRest/BaseRestHandler.cs src/Umbraco.Web/Cache/DistributedCacheExtensions.cs src/Umbraco.Web/Editors/AuthenticationController.cs src/Umbraco.Web/Editors/BackOfficeController.cs src/Umbraco.Web/Routing/ContentFinderByIdPath.cs src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/WebBootManager.cs src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs src/Umbraco.Web/umbraco.presentation/content.cs src/Umbraco.Web/umbraco.presentation/page.cs src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs src/UmbracoExamine/UmbracoMemberIndexer.cs src/umbraco.MacroEngines/app.config src/umbraco.MacroEngines/packages.config src/umbraco.MacroEngines/umbraco.MacroEngines.csproj src/umbraco.editorControls/app.config src/umbraco.editorControls/packages.config src/umbraco.editorControls/umbraco.editorControls.csproj src/umbraco.providers/app.config
205 lines
10 KiB
XML
205 lines
10 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
|
|
|
|
-->
|
|
|
|
|
|
<configSections>
|
|
<section name="Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
|
|
<section name="ExamineLuceneIndexSets" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
|
|
|
|
<section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
|
|
|
|
<sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
|
|
|
|
<sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="Remove" />
|
|
<sectionGroup name="umbracoConfiguration" xdt:Transform="Insert">
|
|
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
|
|
<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
|
|
<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
|
|
</sectionGroup>
|
|
|
|
</configSections>
|
|
|
|
<FileSystemProviders xdt:Transform="Remove" />
|
|
<umbracoConfiguration xdt:Transform="Remove" />
|
|
<umbracoConfiguration xdt:Transform="InsertBefore(/configuration/appSettings)">
|
|
<settings configSource="config\umbracoSettings.config" />
|
|
<FileSystemProviders configSource="config\FileSystemProviders.config" />
|
|
<dashBoard configSource="config\Dashboard.config" />
|
|
</umbracoConfiguration>
|
|
|
|
<appSettings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
|
|
<appSettings xdt:Transform="InsertIfMissing">
|
|
<add key="umbracoConfigurationStatus" value="" />
|
|
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
|
|
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
|
|
<add key="umbracoPath" value="~/umbraco" />
|
|
<add key="umbracoHideTopLevelNodeFromPath" value="true" />
|
|
<add key="umbracoUseDirectoryUrls" value="true" />
|
|
<add key="umbracoTimeOutInMinutes" value="20" />
|
|
<add key="umbracoDefaultUILanguage" value="en" />
|
|
<add key="umbracoUseSSL" value="false" />
|
|
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
|
|
<add key="webpages:Enabled" value="false" />
|
|
<add key="enableSimpleMembership" value="false" />
|
|
<add key="autoFormsAuthentication" value="false" />
|
|
<add key="log4net.Config" value="config\log4net.config" />
|
|
<add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)" />
|
|
</appSettings>
|
|
|
|
<connectionStrings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
|
|
<connectionStrings xdt:Transform="InsertIfMissing">
|
|
<remove name="umbracoDbDSN" />
|
|
<add name="umbracoDbDSN" connectionString="" providerName="" />
|
|
</connectionStrings>
|
|
|
|
<system.data>
|
|
<DbProviderFactories>
|
|
<add name="Microsoft SQL Server Compact Data Provider 4.0" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"
|
|
type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" />
|
|
<add name="MySQL Data Provider" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"
|
|
type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" />
|
|
</DbProviderFactories>
|
|
</system.data>
|
|
|
|
<system.web>
|
|
<xhtmlConformance xdt:Transform="Remove" />
|
|
<membership defaultProvider="UmbracoMembershipProvider">
|
|
<providers>
|
|
<add name="UmbracoMembershipProvider" defaultMemberTypeAlias="Member"
|
|
xdt:Locator="Condition(@defaultMemberTypeAlias='Another Type' and @name='UmbracoMembershipProvider')"
|
|
xdt:Transform="SetAttributes(defaultMemberTypeAlias)" />
|
|
</providers>
|
|
</membership>
|
|
|
|
<httpRuntime targetFramework="4.5" xdt:Transform="SetAttributes(targetFramework)" />
|
|
|
|
<compilation debug="true" targetFramework="4.5" xdt:Transform="SetAttributes(debug,targetFramework)">
|
|
<assemblies xdt:Transform="Remove" />
|
|
<assemblies xdt:Transform="Insert" />
|
|
<assemblies>
|
|
<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="Insert" />
|
|
<add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="Insert" />
|
|
</assemblies>
|
|
</compilation>
|
|
<!-- We no longer support medium trust so just remove it -->
|
|
<trust xdt:Transform="Remove" />
|
|
|
|
<httpHandlers>
|
|
<add path="GoogleSpellChecker.ashx" xdt:Transform="Remove" xdt:Locator="Match(path)" />
|
|
</httpHandlers>
|
|
</system.web>
|
|
|
|
<system.web.extensions xdt:Transform="Remove" />
|
|
|
|
<system.codedom xdt:Transform="Remove" />
|
|
|
|
<system.webServer>
|
|
<handlers>
|
|
<remove name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
|
|
<add name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
|
|
</handlers>
|
|
</system.webServer>
|
|
|
|
<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.1" newVersion="4.0.0.1" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Net.Http']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="System.Net.Http" publicKeyToken="31bf3856ad364e35" />
|
|
<bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
|
|
</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>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin']])" />
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
|
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security']])" />
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
|
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.Cookies']])" />
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
|
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
|
|
</dependentAssembly>
|
|
|
|
<dependentAssembly xdt:Transform="Remove"
|
|
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.OAuth']])" />
|
|
<dependentAssembly xdt:Transform="Insert">
|
|
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
|
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
|
|
</dependentAssembly>
|
|
|
|
</assemblyBinding>
|
|
|
|
</runtime>
|
|
|
|
<system.web.webPages.razor xdt:Transform="Remove" />
|
|
|
|
</configuration> |