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

Merge branch origin/temp8 into temp8-di2690

Browse Source
This commit is contained in:
Stephan
2018-12-21 10:58:38 +01:00
parent 115b0cd2aa b0eb0d1205
commit bb9846a6ca
126 changed files with 1327 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/RuntimeState.cs
View File

@@ -225,14 +225,14 @@ namespace Umbraco.Core
protected virtual bool EnsureUmbracoUpgradeState(IUmbracoDatabaseFactory databaseFactory, ILogger logger)
{
var umbracoPlan = new UmbracoPlan();
var stateValueKey = Upgrader.GetStateValueKey(umbracoPlan);
var upgrader = new UmbracoUpgrader();
var stateValueKey = upgrader.StateValueKey;
// no scope, no service - just directly accessing the database
using (var database = databaseFactory.CreateDatabase())
{
CurrentMigrationState = KeyValueService.GetValue(database, stateValueKey);
FinalMigrationState = umbracoPlan.FinalState;
FinalMigrationState = upgrader.Plan.FinalState;
}
logger.Debug<RuntimeState>("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", CurrentMigrationState, FinalMigrationState ?? "<null>");