fixed merge

Author: NillasKA

src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs

@@ -99,9 +99,11 @@ public static class Tables
             public const string WebhookLog = Webhook + "Log";
             public const string WebhookRequest = Webhook + "Request";
 
-            public const string LongRunningOperation = TableNamePrefix + "LongRunningOperation";
 
             public const string RepositoryCacheVersion = TableNamePrefix + "RepositoryCacheVersion";
+            public const string LongRunningOperation = TableNamePrefix + "LongRunningOperation";
+
+            public const string LastSynced = TableNamePrefix + "LastSynced";
         }
     }
 }

src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs

@@ -90,6 +90,8 @@ public class DatabaseSchemaCreator
         typeof(WebhookLogDto),
         typeof(WebhookRequestDto),
         typeof(UserDataDto),
+        typeof(LongRunningOperationDto),
+        typeof(LastSyncedDto),
         typeof(RepositoryCacheVersionDto),
         typeof(LongRunningOperationDto),
     };

src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs

@@ -123,5 +123,6 @@ protected virtual void DefinePlan()
         // To 16.2.0
         To<V_16_2_0.AddLongRunningOperations>("{741C22CF-5FB8-4343-BF79-B97A58C2CCBA}");
         To<V_16_2_0.AddDocumentUrlLock>("{BE11D4D3-3A1F-4598-90D4-B548BD188C48}");
+        To<V_16_2_0.AddLastSyncedTable>("26179D88-58CE-4C92-B4A4-3CBA6E7188AC");
     }
 }

tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs

@@ -57,8 +57,8 @@ private UserRepository CreateRepository(ICoreScopeProvider provider)
             Options.Create(new UserPasswordConfigurationSettings()),
             new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory()),
             mockRuntimeState.Object,
-            PermissionMappers,
-            Mock.Of<IRepositoryCacheVersionService>());
+            Mock.Of<IRepositoryCacheVersionService>(),
+            PermissionMappers);
         return repository;
     }
 
@@ -165,9 +165,8 @@ public void Can_Perform_Delete_On_UserRepository()
                 Options.Create(new UserPasswordConfigurationSettings()),
                 new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory()),
                 mockRuntimeState.Object,
-                PermissionMappers,
-                AppPolicyCache,
-                Mock.Of<IRepositoryCacheVersionService>());
+                Mock.Of<IRepositoryCacheVersionService>(),
+                PermissionMappers);
 
             repository2.Delete(user);