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

AB3594 - Moved the composition root out to UmbracoApplicationBase, and injecting the needed parts from there. Also remove usages of ConfigurationManager from Umbraco.Core

Browse Source
This commit is contained in:
Bjarke Berg
2019-11-15 11:07:37 +01:00
parent 126380dcee
commit 603ec0ccfb
63 changed files with 441 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
View File

@@ -1,13 +1,11 @@
using System;
using System.Configuration;
using System.Linq;
using System.Linq;
using System.Threading.Tasks;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Migrations.Upgrade;
using Umbraco.Web.Composing;
using Umbraco.Web.Install.Models;
using Umbraco.Web.Migrations;
using Umbraco.Web.Migrations.PostMigrations;
namespace Umbraco.Web.Install.InstallSteps
@@ -66,9 +64,9 @@ namespace Umbraco.Web.Install.InstallSteps
return false;
}
var databaseSettings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
var databaseSettings = Current.Configs.ConnectionStrings()[Constants.System.UmbracoConnectionName];
if (_databaseBuilder.IsConnectionStringConfigured(databaseSettings))
if (DatabaseHelper.IsConnectionStringConfigured(databaseSettings))
{
// a connection string was present, determine whether this is an install/upgrade
// return true (upgrade) if there is an installed version, else false (install)