Files
Umbraco-CMS/tests/Umbraco.Tests.Benchmarks/app.config

6 lines
184 B
Plaintext
Raw Normal View History

<?xml version="1.0" encoding="utf-8" ?>
2018-01-23 11:15:37 -07:00
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
Merge remote-tracking branch 'origin/dev-v7' into dev-v8 # Conflicts: # build/Modules/Umbraco.Build/Umbraco.Build.psm1 # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Core/DatabaseContext.cs # src/Umbraco.Core/IO/FileSystemProviderManager.cs # src/Umbraco.Core/ObjectExtensions.cs # src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs # src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs # src/Umbraco.Core/Services/IdkMap.cs # src/Umbraco.Core/Services/UserService.cs # src/Umbraco.Core/packages.config # src/Umbraco.Tests.Benchmarks/app.config # src/Umbraco.Tests/UI/LegacyDialogTests.cs # src/Umbraco.Web/Cache/MediaCacheRefresher.cs # src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs # src/Umbraco.Web/Features/DisabledFeatures.cs # src/Umbraco.Web/Mvc/RenderRouteHandler.cs # src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs # src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs # src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs # src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs # src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs # src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs # src/Umbraco.Web/PublishedContentQuery.cs # src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs # src/Umbraco.Web/packages.config # src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
2018-03-29 20:01:14 +11:00
</startup>
</configuration>