Moved non-scoped retrieval of key value into an extension method in IUmbracoDatabase.

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs

@@ -18,21 +18,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             : base(scopeAccessor, AppCaches.NoCache, logger)
         { }
 
-        /// <summary>
-        /// Gets a value directly from the database, no scope, nothing.
-        /// </summary>
-        /// <remarks>Used by <see cref="Runtime.CoreRuntime"/> to determine the runtime state.</remarks>
-        internal static string GetValue(IUmbracoDatabase database, string key)
-        {
-            if (database is null) return null;
-
-            var sql = database.SqlContext.Sql()
-                .Select<KeyValueDto>()
-                .From<KeyValueDto>()
-                .Where<KeyValueDto>(x => x.Key == key);
-            return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
-        }
-
         #region Overrides of NPocoRepositoryBase<string, IKeyValue>
 
         protected override Guid NodeObjectTypeId => throw new NotSupportedException();

src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Persistence
 {
@@ -10,5 +11,20 @@ namespace Umbraco.Core.Persistence
             if (asDatabase == null) throw new Exception("oops: database.");
             return asDatabase;
         }
+
+        /// <summary>
+        /// Gets a key/value directly from the database, no scope, nothing.
+        /// </summary>
+        /// <remarks>Used by <see cref="Runtime.CoreRuntime"/> to determine the runtime state.</remarks>
+        public static string GetFromKeyValueTable(this IUmbracoDatabase database, string key)
+        {
+            if (database is null) return null;
+
+            var sql = database.SqlContext.Sql()
+                .Select<KeyValueDto>()
+                .From<KeyValueDto>()
+                .Where<KeyValueDto>(x => x.Key == key);
+            return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
+        }
     }
 }

src/Umbraco.Infrastructure/RuntimeState.cs

@@ -225,7 +225,7 @@ namespace Umbraco.Core
             // no scope, no service - just directly accessing the database
             using (var database = databaseFactory.CreateDatabase())
             {
-                CurrentMigrationState = KeyValueRepository.GetValue(database, stateValueKey);
+                CurrentMigrationState = database.GetFromKeyValueTable(stateValueKey);
                 FinalMigrationState = upgrader.Plan.FinalState;
             }