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

AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process

Browse Source
This commit is contained in:
Bjarke Berg
2020-05-06 20:37:03 +02:00
parent 13197eb5ff
commit 269c75e26b
37 changed files with 625 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web.UI.NetCore/Startup.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Data.SqlClient;
using System.IO;
using System.Reflection;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@@ -16,10 +17,8 @@ using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Persistance.SqlCe;
using Umbraco.Web.BackOffice.AspNetCore;
using Umbraco.Web.Common.Extensions;
using Umbraco.Web.Common.Filters;
@@ -52,24 +51,8 @@ namespace Umbraco.Web.UI.BackOffice
// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
public void ConfigureServices(IServiceCollection services)
{
services.AddSingleton<ISqlSyntaxProvider, SqlServerSyntaxProvider>();
services.AddSingleton<ISqlSyntaxProvider, SqlCeSyntaxProvider>();
services.AddSingleton<IBulkSqlInsertProvider, SqlServerBulkSqlInsertProvider>();
services.AddSingleton<IBulkSqlInsertProvider, SqlCeBulkSqlInsertProvider>();
services.AddSingleton<IEmbeddedDatabaseCreator, NoopEmbeddedDatabaseCreator>();
services.AddSingleton<IEmbeddedDatabaseCreator, SqlCeEmbeddedDatabaseCreator>();
services.AddSingleton<IDbProviderFactoryCreator>(x => new DbProviderFactoryCreator(
x.GetService<Configs>().ConnectionStrings()[Core.Constants.System.UmbracoConnectionName]?.ProviderName,
DbProviderFactories.GetFactory,
x.GetServices<ISqlSyntaxProvider>(),
x.GetServices<IBulkSqlInsertProvider>(),
x.GetServices<IEmbeddedDatabaseCreator>()
));
services.AddUmbracoSqlCeSupport();
services.AddUmbracoSqlServerSupport();
services.AddUmbracoConfiguration(_config);
services.AddUmbracoRuntimeMinifier(_config);