Merge branch 'v9/dev' of https://github.com/umbraco/Umbraco-CMS into v9/dev

Author: Nikolaj

build/templates/UmbracoPackage/.template.config/template.json

@@ -24,7 +24,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.0.0-rc003",
+            "defaultValue": "9.0.0-rc004",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

build/templates/UmbracoProject/.template.config/template.json

@@ -57,7 +57,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.0.0-rc003",
+            "defaultValue": "9.0.0-rc004",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

src/Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Version>9.0.0</Version>
     <AssemblyVersion>9.0.0</AssemblyVersion>
-    <InformationalVersion>9.0.0-rc003</InformationalVersion>
+    <InformationalVersion>9.0.0-rc004</InformationalVersion>
     <FileVersion>9.0.0</FileVersion>
     <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>

src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs

@@ -40,7 +40,8 @@ public class SqlMainDomLock : IMainDomLock
         private bool _errorDuringAcquiring;
         private readonly object _locker = new object();
         private bool _hasTable = false;
-
+        private bool _acquireWhenTablesNotAvailable = false;
+        
         public SqlMainDomLock(
             ILogger<SqlMainDomLock> logger,
             ILoggerFactory loggerFactory,
@@ -99,7 +100,8 @@ public async Task<bool> AcquireLockAsync(int millisecondsTimeout)
                 _hasTable = db.HasTable(Cms.Core.Constants.DatabaseSchema.Tables.KeyValue);
                 if (!_hasTable)
                 {
-                    // the Db does not contain the required table, we must be in an install state we have no choice but to assume we can acquire
+                    _logger.LogDebug("The DB does not contain the required table so we must be in an install state. We have no choice but to assume we can acquire.");
+                    _acquireWhenTablesNotAvailable = true;
                     return true;
                 }
 
@@ -225,6 +227,13 @@ private void ListeningLoop()
                             }
                         }
 
+                        // In case we acquired the main dom doing install when there was no database. We therefore have to insert our lockId now, but only handle this once.
+                        if (_acquireWhenTablesNotAvailable)
+                        {
+                            _acquireWhenTablesNotAvailable = false;
+                            InsertLockRecord(_lockId, db);
+                        }
+
                         db.BeginTransaction(IsolationLevel.ReadCommitted);
                         // get a read lock
                         _sqlServerSyntax.ReadLock(db, Cms.Core.Constants.Locks.MainDom);
@@ -434,7 +443,10 @@ private RecordPersistenceType InsertLockRecord(string id, IUmbracoDatabase db)
         private bool IsMainDomValue(string val, IUmbracoDatabase db)
         {
             return db.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoKeyValue WHERE [key] = @key AND [value] = @val",
-                new { key = MainDomKey, val = val }) == 1;
+                    new { key = MainDomKey, val = val }) == 1;
+
+
+
         }
 
         /// <summary>
@@ -447,6 +459,7 @@ private bool IsMainDomValue(string val, IUmbracoDatabase db)
         #region IDisposable Support
         private bool _disposedValue = false; // To detect redundant calls
 
+
         protected virtual void Dispose(bool disposing)
         {
             if (!_disposedValue)