Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco-Core

# Conflicts:
#	build/build.ps1
#	src/Umbraco.Core/Configuration/ConfigConnectionString.cs
#	src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
#	src/Umbraco.Core/Install/InstallSteps/TelemetryIdentifierStep.cs
#	src/Umbraco.Core/Models/ContentType.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	tests/Umbraco.Tests.AcceptanceTest/package.json

tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs

@@ -8,7 +8,7 @@ using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 namespace Umbraco.Cms.Tests.Common.Builders
 {
     public class RelationTypeBuilder
-        : ChildBuilderBase<RelationBuilder, IRelationType>,
+        : ChildBuilderBase<RelationBuilder, IRelationTypeWithIsDependency>,
             IWithIdBuilder,
             IWithAliasBuilder,
             IWithNameBuilder,
@@ -23,6 +23,7 @@ namespace Umbraco.Cms.Tests.Common.Builders
         private DateTime? _deleteDate;
         private int? _id;
         private bool? _isBidirectional;
+        private bool? _isDependency;
         private Guid? _key;
         private string _name;
         private Guid? _parentObjectType;
@@ -42,6 +43,12 @@ namespace Umbraco.Cms.Tests.Common.Builders
         {
             _isBidirectional = isBidirectional;
             return this;
+        } 
+        
+        public RelationTypeBuilder WithIsDependency(bool isDependency)
+        {
+            _isDependency = isDependency;
+            return this;
         }
 
         public RelationTypeBuilder WithChildObjectType(Guid childObjectType)
@@ -56,7 +63,7 @@ namespace Umbraco.Cms.Tests.Common.Builders
             return this;
         }
 
-        public override IRelationType Build()
+        public override IRelationTypeWithIsDependency Build()
         {
             var alias = _alias ?? Guid.NewGuid().ToString();
             var name = _name ?? Guid.NewGuid().ToString();
@@ -65,11 +72,12 @@ namespace Umbraco.Cms.Tests.Common.Builders
             var id = _id ?? 0;
             Guid key = _key ?? Guid.NewGuid();
             var isBidirectional = _isBidirectional ?? false;
+            var isDependency = _isDependency ?? false;
             DateTime createDate = _createDate ?? DateTime.Now;
             DateTime updateDate = _updateDate ?? DateTime.Now;
             DateTime? deleteDate = _deleteDate ?? null;
 
-            return new RelationType(name, alias, isBidirectional, parentObjectType, childObjectType)
+            return new RelationType(name, alias, isBidirectional, parentObjectType, childObjectType, isDependency)
             {
                 Id = id,
                 Key = key,

tests/Umbraco.Tests.Common/TestHelperBase.cs

@@ -86,8 +86,6 @@ namespace Umbraco.Cms.Tests.Common
 
         public IVariationContextAccessor VariationContextAccessor { get; } = new TestVariationContextAccessor();
 
-        public abstract IDbProviderFactoryCreator DbProviderFactoryCreator { get; }
-
         public abstract IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
 
         public abstract IMarchal Marchal { get; }

tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs

@@ -17,6 +17,7 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
+using Umbraco.Cms.Persistence.SqlServer.Services;
 
 namespace Umbraco.Cms.Tests.Common.TestHelpers
 {

tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj

@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Umbraco.Cms.Persistence.SqlServer\Umbraco.Cms.Persistence.SqlServer.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />