From ba35afa49415b221df026ef9aa97f086e1c01741 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 19 Nov 2019 12:17:42 +1100
Subject: [PATCH] re, re, re-fixes the merge issues with this stupid csproj
 file, hopefully it now merges upwards properly.

---
 src/Umbraco.Core/Umbraco.Core.csproj | 807 ++++++++++-----------------
 1 file changed, 306 insertions(+), 501 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 0ac579b2cd..49011993e3 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -127,65 +127,30 @@
     </Compile>
     -->
     <Compile Include="Cache\DefaultRepositoryCachePolicy.cs" />
+    <Compile Include="Compose\AuditEventsComponent.cs" />
     <Compile Include="Cache\FullDataSetRepositoryCachePolicy.cs" />
     <Compile Include="Cache\RepositoryCachePolicyBase.cs" />
     <Compile Include="Cache\SingleItemsOnlyRepositoryCachePolicy.cs" />
-    <Compile Include="Compose\AuditEventsComponent.cs" />
     <Compile Include="Compose\AuditEventsComposer.cs" />
-    <Compile Include="Compose\ManifestWatcherComponent.cs" />
-    <Compile Include="Compose\ManifestWatcherComposer.cs" />
-    <Compile Include="Compose\RelateOnCopyComponent.cs" />
-    <Compile Include="Compose\RelateOnCopyComposer.cs" />
-    <Compile Include="Compose\RelateOnTrashComponent.cs" />
-    <Compile Include="Compose\RelateOnTrashComposer.cs" />
     <Compile Include="Composing\ComponentComposer.cs" />
     <Compile Include="Composing\ComposeAfterAttribute.cs" />
     <Compile Include="Composing\ComposeBeforeAttribute.cs" />
     <Compile Include="Composing\Composers.cs" />
+    <Compile Include="Composing\RegisterFactory.cs" />
+    <Compile Include="CompositionExtensions.cs" />
+    <Compile Include="Composing\IUserComposer.cs" />
+    <Compile Include="Compose\ManifestWatcherComposer.cs" />
+    <Compile Include="Compose\RelateOnCopyComposer.cs" />
+    <Compile Include="Compose\RelateOnTrashComposer.cs" />
     <Compile Include="Composing\CompositionExtensions\Configuration.cs" />
     <Compile Include="Composing\CompositionExtensions\CoreMappingProfiles.cs" />
     <Compile Include="Composing\CompositionExtensions\FileSystems.cs" />
     <Compile Include="Composing\CompositionExtensions\Repositories.cs" />
     <Compile Include="Composing\CompositionExtensions\Services.cs" />
-    <Compile Include="Composing\Current.cs" />
-    <Compile Include="Composing\IUserComposer.cs" />
-    <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
-    <Compile Include="Composing\LightInject\LightInjectException.cs" />
-    <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
-    <Compile Include="Composing\RegisterFactory.cs" />
-    <Compile Include="Composing\TargetedServiceFactory.cs" />
-    <Compile Include="CompositionExtensions.cs" />
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
-    <Compile Include="ContentExtensions.cs" />
-    <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="ConventionsHelper.cs" />
-    <Compile Include="Deploy\ArtifactBase.cs" />
-    <Compile Include="Deploy\ArtifactDependency.cs" />
-    <Compile Include="Deploy\ArtifactDependencyCollection.cs" />
-    <Compile Include="Deploy\ArtifactDependencyMode.cs" />
-    <Compile Include="Deploy\ArtifactDeployState.cs" />
-    <Compile Include="Deploy\ArtifactDeployStateOfTArtifactTEntity.cs" />
-    <Compile Include="Deploy\ArtifactSignature.cs" />
-    <Compile Include="Deploy\Difference.cs" />
-    <Compile Include="Deploy\Direction.cs" />
-    <Compile Include="Deploy\IArtifact.cs" />
-    <Compile Include="Deploy\IArtifactSignature.cs" />
-    <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
-    <Compile Include="Deploy\IDeployContext.cs" />
-    <Compile Include="Deploy\IFileSource.cs" />
-    <Compile Include="Deploy\IFileType.cs" />
-    <Compile Include="Deploy\IFileTypeCollection.cs" />
-    <Compile Include="Deploy\IGridCellValueConnector.cs" />
-    <Compile Include="Deploy\IImageSourceParser.cs" />
-    <Compile Include="Deploy\ILocalLinkParser.cs" />
-    <Compile Include="Deploy\IMacroParser.cs" />
-    <Compile Include="Deploy\IServiceConnector.cs" />
-    <Compile Include="Deploy\IUniqueIdentifyingServiceConnector.cs" />
-    <Compile Include="Deploy\IValueConnector.cs" />
-    <Compile Include="Diagnostics\MiniDump.cs" />
-    <Compile Include="EmailSender.cs" />
     <Compile Include="Events\ContentPublishedEventArgs.cs" />
     <Compile Include="Events\ContentPublishingEventArgs.cs" />
     <Compile Include="Events\ContentSavedEventArgs.cs" />
@@ -193,21 +158,17 @@
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\ImportPackageEventArgs.cs" />
     <Compile Include="Events\MigrationEventArgs.cs" />
-    <Compile Include="Events\QueuingEventDispatcher.cs" />
     <Compile Include="Events\QueuingEventDispatcherBase.cs" />
-    <Compile Include="Events\UninstallPackageEventArgs.cs" />
-    <Compile Include="FileResources\Files.Designer.cs" />
-    <Compile Include="GuidUtils.cs" />
-    <Compile Include="HttpContextExtensions.cs" />
-    <Compile Include="IO\FileSecurityException.cs" />
-    <Compile Include="IO\FileSystemExtensions.cs" />
-    <Compile Include="IO\FileSystems.cs" />
-    <Compile Include="IO\FileSystemWrapper.cs" />
+    <Compile Include="Composing\Current.cs" />
+    <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
+    <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
+    <Compile Include="Composing\TargetedServiceFactory.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="IO\IMediaPathScheme.cs" />
     <Compile Include="IO\IOHelper.cs" />
     <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
     <Compile Include="Logging\Viewer\LogTimePeriod.cs" />
+    <Compile Include="Manifest\IPackageManifest.cs" />
     <Compile Include="Manifest\ManifestParser.cs" />
     <Compile Include="Migrations\IMigrationBuilder.cs" />
     <Compile Include="Migrations\Upgrade\Common\DeleteKeysAndIndexes.cs" />
@@ -237,26 +198,25 @@
     <Compile Include="Migrations\Upgrade\V_8_0_1\ChangeNuCacheJsonFormat.cs" />
     <Compile Include="Migrations\Upgrade\V_8_1_0\ConvertTinyMceAndGridMediaUrlsToLocalLink.cs" />
     <Compile Include="Models\ContentBaseExtensions.cs" />
-    <Compile Include="Models\GridValue.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
-    <Compile Include="Models\Identity\IdentityUser.cs" />
     <Compile Include="Models\Identity\UserLoginInfoWrapper.cs" />
     <Compile Include="Models\Language.cs" />
     <Compile Include="Models\Macro.cs" />
     <Compile Include="Models\Membership\UserGroup.cs" />
     <Compile Include="Models\Membership\UserGroupExtensions.cs" />
     <Compile Include="Models\ObjectTypes.cs" />
+    <Compile Include="Models\Packaging\PackageDefinition.cs" />
+    <Compile Include="Models\Property.cs" />
+    <Compile Include="Models\PropertyCollection.cs" />
+    <Compile Include="Models\PropertyType.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\FixLanguageIsoCodeLength.cs" />
     <Compile Include="Models\CultureImpact.cs" />
-    <Compile Include="Models\Packaging\PackageDefinition.cs" />
     <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
     <Compile Include="Models\Template.cs" />
     <Compile Include="Models\TemplateOnDisk.cs" />
-    <Compile Include="Packaging\CompiledPackageXmlParser.cs" />
-    <Compile Include="PropertyEditors\IIgnoreUserStartNodesConfig.cs" />
     <Compile Include="PropertyEditors\Validators\DelimitedValueValidator.cs" />
     <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
     <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
@@ -289,356 +249,76 @@
     <Compile Include="Sync\RefreshInstructionEnvelope.cs" />
     <Compile Include="TypeExtensions.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
-    <Compile Include="Configuration\CaseInsensitiveEnumConfigConverter.cs" />
-    <Compile Include="Configuration\CommaDelimitedConfigurationElement.cs" />
-    <Compile Include="ConfigsExtensions.cs" />
-    <Compile Include="Configuration\Configs.cs" />
-    <Compile Include="Configuration\CoreDebug.cs" />
-    <Compile Include="Configuration\GlobalSettings.cs" />
-    <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
-    <Compile Include="Configuration\Grid\GridConfig.cs" />
-    <Compile Include="Configuration\Grid\GridEditorsConfig.cs" />
-    <Compile Include="Configuration\HealthChecks\DisabledHealthCheckElement.cs" />
-    <Compile Include="Configuration\HealthChecks\DisabledHealthChecksElementCollection.cs" />
-    <Compile Include="Configuration\HealthChecks\HealthCheckNotificationSettingsElement.cs" />
-    <Compile Include="Configuration\HealthChecks\HealthCheckNotificationVerbosity.cs" />
-    <Compile Include="Configuration\HealthChecks\HealthChecksSection.cs" />
-    <Compile Include="Configuration\HealthChecks\IDisabledHealthCheck.cs" />
-    <Compile Include="Configuration\HealthChecks\IHealthCheckNotificationSettings.cs" />
-    <Compile Include="Configuration\HealthChecks\IHealthChecks.cs" />
-    <Compile Include="Configuration\HealthChecks\INotificationMethod.cs" />
-    <Compile Include="Configuration\HealthChecks\INotificationMethodSettings.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodElement.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodsElementCollection.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElement.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElementCollection.cs" />
-    <Compile Include="Configuration\InnerTextConfigurationElement.cs" />
-    <Compile Include="Configuration\OptionalCommaDelimitedConfigurationElement.cs" />
-    <Compile Include="Configuration\OptionalInnerTextConfigurationElement.cs" />
-    <Compile Include="Configuration\RawXmlConfigurationElement.cs" />
-    <Compile Include="Configuration\UmbracoConfigurationSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\BackOfficeElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\CharCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\CharElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentError404Collection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentErrorPageElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillPropertiesCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\LoggingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\NotificationsElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\RequestHandlerElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\SecurityElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\TourConfigElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UmbracoConfigurationElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UmbracoSettingsSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UrlReplacingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\WebRoutingElement.cs" />
-    <Compile Include="RegisterExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
-    <Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />
-    <Compile Include="Events\RolesEventArgs.cs" />
     <Compile Include="GuidUtils.cs" />
-    <Compile Include="IO\MediaFileSystem.cs" />
     <Compile Include="IO\MediaPathSchemes\CombinedGuidsMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\TwoGuidsMediaPathScheme.cs" />
-    <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
-    <Compile Include="IO\PhysicalFileSystem.cs" />
-    <Compile Include="IO\ShadowFileSystem.cs" />
-    <Compile Include="IO\ShadowFileSystems.cs" />
-    <Compile Include="IO\ShadowWrapper.cs" />
     <Compile Include="IO\SupportingFileSystems.cs" />
-    <Compile Include="IO\SystemDirectories.cs" />
-    <Compile Include="IO\SystemFiles.cs" />
-    <Compile Include="IO\ViewHelper.cs" />
-    <Compile Include="Logging\LogHttpRequest.cs" />
-    <Compile Include="Logging\MessageTemplates.cs" />
-    <Compile Include="Logging\OwinLogger.cs" />
-    <Compile Include="Logging\OwinLoggerFactory.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\HttpRequestIdEnricher.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\HttpRequestNumberEnricher.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\HttpSessionIdEnricher.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\Log4NetLevelMapperEnricher.cs" />
-    <Compile Include="Logging\Serilog\LoggerConfigExtensions.cs" />
-    <Compile Include="Logging\Serilog\SerilogLogger.cs" />
     <Compile Include="Logging\Viewer\CountingFilter.cs" />
     <Compile Include="Logging\Viewer\ErrorCounterFilter.cs" />
     <Compile Include="Logging\Viewer\ExpressionFilter.cs" />
     <Compile Include="Logging\Viewer\ILogFilter.cs" />
-    <Compile Include="Logging\Viewer\ILogViewer.cs" />
-    <Compile Include="Logging\Viewer\JsonLogViewer.cs" />
-    <Compile Include="Logging\Viewer\LogLevelCounts.cs" />
-    <Compile Include="Logging\Viewer\LogMessage.cs" />
     <Compile Include="Logging\Viewer\LogTemplate.cs" />
-    <Compile Include="Logging\Viewer\LogTimePeriod.cs" />
+    <Compile Include="Logging\Viewer\ILogViewer.cs" />
+    <Compile Include="Logging\Viewer\LogLevelCounts.cs" />
+    <Compile Include="Logging\Viewer\JsonLogViewer.cs" />
+    <Compile Include="Logging\Viewer\LogMessage.cs" />
     <Compile Include="Logging\Viewer\LogViewerComposer.cs" />
     <Compile Include="Logging\Viewer\LogViewerSourceBase.cs" />
+    <Compile Include="Logging\LogHttpRequest.cs" />
+    <Compile Include="Logging\MessageTemplates.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\HttpRequestIdEnricher.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\HttpRequestNumberEnricher.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\HttpSessionIdEnricher.cs" />
+    <Compile Include="Logging\Serilog\LoggerConfigExtensions.cs" />
+    <Compile Include="Logging\Serilog\Enrichers\Log4NetLevelMapperEnricher.cs" />
     <Compile Include="Logging\Viewer\MessageTemplateFilter.cs" />
     <Compile Include="Logging\Viewer\SavedLogSearch.cs" />
-    <Compile Include="MainDom.cs" />
     <Compile Include="Manifest\DashboardAccessRuleConverter.cs" />
-    <Compile Include="Manifest\DataEditorConverter.cs" />
-    <Compile Include="Manifest\IPackageManifest.cs" />
     <Compile Include="Manifest\ManifestContentAppFactory.cs" />
-    <Compile Include="Manifest\ManifestParser.cs" />
-    <Compile Include="Manifest\ManifestWatcher.cs" />
-    <Compile Include="Manifest\ValueValidatorConverter.cs" />
-    <Compile Include="Migrations\Expressions\Alter\AlterBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterDefaultConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Alter\IAlterBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\AlterTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnOptionForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\ExecutableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\Expressions\CreateColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Common\Expressions\CreateForeignKeyExpression.cs" />
-    <Compile Include="Migrations\Expressions\Common\Expressions\CreateIndexExpression.cs" />
-    <Compile Include="Migrations\Expressions\Common\IColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\IColumnTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\IExecutableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\IForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\CreateColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOptionForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Constraint\CreateConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Constraint\ICreateConstraintColumnsBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Constraint\ICreateConstraintOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\CreateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Expressions\CreateConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Create\Expressions\CreateTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\CreateForeignKeyBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyForeignColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyFromTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyPrimaryColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyToTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ICreateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\CreateIndexBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexColumnOptionsBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexForTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexOnColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexOptionsBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\KeysAndIndexes\CreateKeysAndIndexesBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\CreateTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\CreateTableOfDtoBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnAsTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnOptionForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableWithColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Column\DeleteColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Column\IDeleteColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Constraint\DeleteConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Constraint\IDeleteConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Data\DeleteDataBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Data\IDeleteDataBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\DeleteDefaultConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\IDeleteDefaultConstraintOnColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\IDeleteDefaultConstraintOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DeleteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteDataExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteDefaultConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteForeignKeyExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteIndexExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\DeleteForeignKeyBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyForeignColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyFromTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyPrimaryColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyToTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\IDeleteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Index\DeleteIndexBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Index\IDeleteIndexForTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Index\IDeleteIndexOnColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\KeysAndIndexes\DeleteKeysAndIndexesBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Execute\ExecuteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Execute\Expressions\ExecuteSqlStatementExpression.cs" />
-    <Compile Include="Migrations\Expressions\Execute\IExecuteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\ExpressionBuilderBase.cs" />
-    <Compile Include="Migrations\Expressions\ExpressionBuilderBaseOfNext.cs" />
-    <Compile Include="Migrations\Expressions\IFluentBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\Expressions\InsertDataExpression.cs" />
-    <Compile Include="Migrations\Expressions\Insert\IInsertBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\IInsertIntoBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\InsertBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\InsertIntoBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Column\IRenameColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Column\IRenameColumnToBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Column\RenameColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Expressions\RenameColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Expressions\RenameTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Rename\IRenameBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\RenameBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Table\IRenameTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Table\RenameTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\Expressions\UpdateDataExpression.cs" />
-    <Compile Include="Migrations\Expressions\Update\IUpdateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\IUpdateTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\IUpdateWhereBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\UpdateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\UpdateDataBuilder.cs" />
-    <Compile Include="Migrations\IMigrationBuilder.cs" />
-    <Compile Include="Migrations\IMigrationContext.cs" />
-    <Compile Include="Migrations\IMigrationExpression.cs" />
-    <Compile Include="Migrations\Install\DatabaseBuilder.cs" />
-    <Compile Include="Migrations\Install\DatabaseDataCreator.cs" />
-    <Compile Include="Migrations\Install\DatabaseSchemaCreator.cs" />
-    <Compile Include="Migrations\Install\DatabaseSchemaResult.cs" />
     <Compile Include="Migrations\MergeBuilder.cs" />
-    <Compile Include="Migrations\MigrationBase.cs" />
     <Compile Include="Migrations\MigrationBase_Extra.cs" />
-    <Compile Include="Migrations\MigrationBuilder.cs" />
-    <Compile Include="Migrations\MigrationContext.cs" />
-    <Compile Include="Migrations\MigrationExpressionBase.cs" />
-    <Compile Include="Migrations\MigrationPlan.cs" />
     <Compile Include="Migrations\PostMigrations\IPublishedSnapshotRebuilder.cs" />
     <Compile Include="Migrations\PostMigrations\PublishedSnapshotRebuilder.cs" />
     <Compile Include="Migrations\PostMigrations\RebuildPublishedSnapshot.cs" />
-    <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
-    <Compile Include="Migrations\Upgrade\Common\DeleteKeysAndIndexes.cs" />
-    <Compile Include="Migrations\Upgrade\UmbracoPlan.cs" />
-    <Compile Include="Migrations\Upgrade\Upgrader.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentNuTable.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddLockObjects.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddTypedLabels.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables1A.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables2.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\ContentVariationMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypeMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ContentPickerPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DecimalPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DefaultPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DropDownFlexiblePreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\IPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ListViewPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MarkdownEditorPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MediaPickerPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\NestedContentPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueDto.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollection.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollectionBuilder.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorComposer.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RenamingPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RichTextPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\UmbracoSliderPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ValueListPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropDownPropertyEditorsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropMigrationsTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropPreValueTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropTaskTables.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropTemplateDesignColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropXmlTables.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\FallbackLanguage.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\FixLanguageIsoCodeLength.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\LanguageColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MakeRedirectUrlVariant.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MakeTagsVariant.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigrationBase.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioAndCheckboxPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorMacroColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorVariantsModel.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RenameMediaVersionTable.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioAndCheckboxPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameUmbracoDomainsTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TablesForScheduledPublishing.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigration.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\FallbackLanguage.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigrationFix.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UpdateDefaultMandatoryLanguage.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UpdatePickerIntegerValuesToUdi.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UserForeignKeys.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\VariantsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_1\ChangeNuCacheJsonFormat.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_1_0\ConvertTinyMceAndGridMediaUrlsToLocalLink.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_1_0\FixContentNuCascade.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_1_0\RenameUserLoginDtoDateIndex.cs" />
-    <Compile Include="Models\Content.cs" />
-    <Compile Include="Models\ContentBase.cs" />
-    <Compile Include="Models\ContentBaseExtensions.cs" />
+    <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
     <Compile Include="Models\ContentRepositoryExtensions.cs" />
     <Compile Include="Models\ContentTagsExtensions.cs" />
-    <Compile Include="Models\ContentType.cs" />
-    <Compile Include="Models\ContentTypeAvailableCompositionsResult.cs" />
-    <Compile Include="Models\ContentTypeAvailableCompositionsResults.cs" />
-    <Compile Include="Models\ContentTypeBase.cs" />
     <Compile Include="Models\ContentTypeBaseExtensions.cs" />
-    <Compile Include="Models\ContentTypeCompositionBase.cs" />
-    <Compile Include="Models\CultureImpact.cs" />
-    <Compile Include="Models\DataType.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
-    <Compile Include="Models\GridValue.cs" />
-    <Compile Include="Models\IContentType.cs" />
-    <Compile Include="Models\IContentTypeBase.cs" />
-    <Compile Include="Models\IContentTypeComposition.cs" />
-    <Compile Include="Models\IDataType.cs" />
-    <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
-    <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
-    <Compile Include="Models\Identity\IdentityUser.cs" />
-    <Compile Include="Models\Identity\UserLoginInfoWrapper.cs" />
-    <Compile Include="Models\IMediaType.cs" />
-    <Compile Include="Models\IMember.cs" />
-    <Compile Include="Models\IMemberType.cs" />
-    <Compile Include="Models\Language.cs" />
-    <Compile Include="Models\Macro.cs" />
-    <Compile Include="Models\Media.cs" />
-    <Compile Include="Models\MediaExtensions.cs" />
-    <Compile Include="Models\MediaType.cs" />
-    <Compile Include="Models\Member.cs" />
-    <Compile Include="Models\Membership\MembershipUserExtensions.cs" />
-    <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
-    <Compile Include="Models\Membership\UmbracoMembershipUser.cs" />
-    <Compile Include="Models\Membership\User.cs" />
-    <Compile Include="Models\Membership\UserGroup.cs" />
-    <Compile Include="Models\Membership\UserGroupExtensions.cs" />
-    <Compile Include="Models\MemberType.cs" />
-    <Compile Include="Models\ObjectTypes.cs" />
-    <Compile Include="Models\Packaging\InstallationSummary.cs" />
-    <Compile Include="Models\Packaging\PackageDefinition.cs" />
-    <Compile Include="Models\Packaging\UninstallationSummary.cs" />
     <Compile Include="Models\PathValidationExtensions.cs" />
-    <Compile Include="Models\Property.cs" />
-    <Compile Include="Models\PropertyCollection.cs" />
-    <Compile Include="Models\PropertyType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PropertyGroup.cs" />
-    <Compile Include="Models\PropertyGroupCollection.cs" />
     <Compile Include="Models\PropertyTagsExtensions.cs" />
-    <Compile Include="Models\PropertyType.cs" />
-    <Compile Include="Models\PropertyTypeCollection.cs" />
-    <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentExtensionsForModels.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentModel.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
-    <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
     <Compile Include="Models\SimpleContentType.cs" />
-    <Compile Include="Models\Template.cs" />
-    <Compile Include="Models\TemplateOnDisk.cs" />
-    <Compile Include="Models\UmbracoObjectTypes.cs" />
-    <Compile Include="Models\UserExtensions.cs" />
-    <Compile Include="ObjectJsonExtensions.cs" />
     <Compile Include="PackageActions\AllowDoctype.cs" />
     <Compile Include="PackageActions\PublishRootDocument.cs" />
     <Compile Include="Packaging\CompiledPackageXmlParser.cs" />
@@ -649,53 +329,145 @@
     <Compile Include="Packaging\PackageDataInstallation.cs" />
     <Compile Include="Packaging\PackageDefinitionXmlParser.cs" />
     <Compile Include="Packaging\PackageFileInstallation.cs" />
-    <Compile Include="Packaging\PackageInstallation.cs" />
     <Compile Include="Packaging\PackagesRepository.cs" />
-    <Compile Include="Persistence\BulkDataReader.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\ConstraintAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\ForeignKeyAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\IndexAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\IndexTypes.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\LengthAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\NullSettingAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\NullSettings.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\PrimaryKeyColumnAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\ReferencesAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\SpecialDbTypeAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\SpecialDbTypes.cs" />
-    <Compile Include="Persistence\DatabaseDebugHelper.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ColumnDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ConstraintDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ConstraintType.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\DbIndexDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\DefinitionFactory.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\DeletionDataDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ForeignKeyDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\IndexColumnDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\IndexDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\InsertionDataDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ModificationType.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\SystemMethods.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\TableDefinition.cs" />
-    <Compile Include="Persistence\DbCommandExtensions.cs" />
-    <Compile Include="Persistence\DbConnectionExtensions.cs" />
+    <Compile Include="Persistence\Dtos\AuditEntryDto.cs" />
+    <Compile Include="Persistence\Dtos\ConsentDto.cs" />
+    <Compile Include="Persistence\Dtos\ContentScheduleDto.cs" />
+    <Compile Include="Persistence\Dtos\ContentVersionCultureVariationDto.cs" />
+    <Compile Include="Persistence\Dtos\DocumentCultureVariationDto.cs" />
+    <Compile Include="Persistence\Dtos\MediaDto.cs" />
+    <Compile Include="Persistence\Dtos\MediaVersionDto.cs" />
+    <Compile Include="Persistence\Dtos\UserLoginDto.cs" />
+    <Compile Include="Persistence\Factories\AuditEntryFactory.cs" />
+    <Compile Include="Persistence\Factories\ConsentFactory.cs" />
+    <Compile Include="Persistence\Mappers\AuditEntryMapper.cs" />
+    <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
+    <Compile Include="Persistence\Mappers\ConsentMapper.cs" />
+    <Compile Include="Persistence\Mappers\SimpleContentTypeMapper.cs" />
+    <Compile Include="Persistence\Repositories\Implement\AuditEntryRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ConsentRepository.cs" />
+    <Compile Include="Persistence\SqlContextExtensions.cs" />
+    <Compile Include="Persistence\SqlSyntaxExtensions.cs" />
+    <Compile Include="Persistence\UmbracoPocoDataBuilder.cs" />
+    <Compile Include="PropertyEditors\ColorPickerConfiguration.cs" />
+    <Compile Include="PropertyEditors\ConfigurationEditorOfTConfiguration.cs" />
+    <Compile Include="PropertyEditors\ConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\DefaultPropertyIndexValueFactory.cs" />
+    <Compile Include="PropertyEditors\DropDownFlexibleConfiguration.cs" />
+    <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
+    <Compile Include="PropertyEditors\LabelConfiguration.cs" />
+    <Compile Include="PropertyEditors\LabelConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditorCollection.cs" />
+    <Compile Include="PropertyEditors\PropertyEditorCollection.cs" />
+    <Compile Include="PropertyEditors\PropertyEditorTagsExtensions.cs" />
+    <Compile Include="PropertyEditors\SliderConfiguration.cs" />
+    <Compile Include="PropertyEditors\TagConfiguration.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
+    <Compile Include="PropertyEditors\ValueListConfiguration.cs" />
+    <Compile Include="ReflectionUtilities-Unused.cs" />
+    <Compile Include="RuntimeOptions.cs" />
+    <Compile Include="Runtime\CoreRuntime.cs" />
+    <Compile Include="Runtime\CoreInitialComponent.cs" />
+    <Compile Include="Migrations\Expressions\Common\ExecutableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Common\IExecutableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\KeysAndIndexes\CreateKeysAndIndexesBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Table\CreateTableOfDtoBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\KeysAndIndexes\DeleteKeysAndIndexesBuilder.cs" />
+    <Compile Include="Migrations\Install\DatabaseBuilder.cs" />
+    <Compile Include="Deploy\ArtifactBase.cs" />
+    <Compile Include="Deploy\ArtifactDependency.cs" />
+    <Compile Include="Deploy\ArtifactDependencyCollection.cs" />
+    <Compile Include="Deploy\ArtifactDependencyMode.cs" />
+    <Compile Include="Deploy\ArtifactDeployState.cs" />
+    <Compile Include="Deploy\ArtifactDeployStateOfTArtifactTEntity.cs" />
+    <Compile Include="Deploy\ArtifactSignature.cs" />
+    <Compile Include="Deploy\Difference.cs" />
+    <Compile Include="Deploy\Direction.cs" />
+    <Compile Include="Deploy\IArtifact.cs" />
+    <Compile Include="Deploy\IArtifactSignature.cs" />
+    <Compile Include="Deploy\IDeployContext.cs" />
+    <Compile Include="Deploy\IFileSource.cs" />
+    <Compile Include="Deploy\IFileType.cs" />
+    <Compile Include="Deploy\IFileTypeCollection.cs" />
+    <Compile Include="Deploy\IGridCellValueConnector.cs" />
+    <Compile Include="Deploy\IImageSourceParser.cs" />
+    <Compile Include="Deploy\ILocalLinkParser.cs" />
+    <Compile Include="Deploy\IMacroParser.cs" />
+    <Compile Include="Deploy\IServiceConnector.cs" />
+    <Compile Include="Deploy\IUniqueIdentifyingServiceConnector.cs" />
+    <Compile Include="Deploy\IValueConnector.cs" />
+    <Compile Include="Diagnostics\MiniDump.cs" />
+    <Compile Include="EmailSender.cs" />
+    <Compile Include="Events\QueuingEventDispatcher.cs" />
+    <Compile Include="Events\UninstallPackageEventArgs.cs" />
+    <Compile Include="Composing\LightInject\LightInjectException.cs" />
+    <Compile Include="FileResources\Files.Designer.cs" />
+    <Compile Include="HttpContextExtensions.cs" />
+    <Compile Include="IO\FileSecurityException.cs" />
+    <Compile Include="IO\FileSystemExtensions.cs" />
+    <Compile Include="IO\FileSystems.cs" />
+    <Compile Include="IO\FileSystemWrapper.cs" />
+    <Compile Include="IO\MediaFileSystem.cs" />
+    <Compile Include="IO\PhysicalFileSystem.cs" />
+    <Compile Include="IO\ShadowFileSystem.cs" />
+    <Compile Include="IO\ShadowFileSystems.cs" />
+    <Compile Include="IO\ShadowWrapper.cs" />
+    <Compile Include="IO\SystemDirectories.cs" />
+    <Compile Include="IO\SystemFiles.cs" />
+    <Compile Include="IO\ViewHelper.cs" />
+    <Compile Include="Logging\Serilog\SerilogLogger.cs" />
+    <Compile Include="Logging\OwinLogger.cs" />
+    <Compile Include="Logging\OwinLoggerFactory.cs" />
+    <Compile Include="MainDom.cs" />
+    <Compile Include="Manifest\ValueValidatorConverter.cs" />
+    <Compile Include="Manifest\ManifestWatcher.cs" />
+    <Compile Include="Manifest\DataEditorConverter.cs" />
+    <Compile Include="Migrations\MigrationBuilder.cs" />
+    <Compile Include="Migrations\MigrationPlan.cs" />
+    <Compile Include="Migrations\Upgrade\UmbracoPlan.cs" />
+    <Compile Include="Migrations\Upgrade\Upgrader.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DropMigrationsTable.cs" />
+    <Compile Include="Models\Content.cs" />
+    <Compile Include="Models\ContentBase.cs" />
+    <Compile Include="ContentExtensions.cs" />
+    <Compile Include="Models\ContentType.cs" />
+    <Compile Include="Models\ContentTypeAvailableCompositionsResult.cs" />
+    <Compile Include="Models\ContentTypeAvailableCompositionsResults.cs" />
+    <Compile Include="Models\ContentTypeBase.cs" />
+    <Compile Include="Models\ContentTypeCompositionBase.cs" />
+    <Compile Include="Models\DataType.cs" />
+    <Compile Include="Models\GridValue.cs" />
+    <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
+    <Compile Include="Models\Identity\IdentityUser.cs" />
+    <Compile Include="Models\Media.cs" />
+    <Compile Include="Models\MediaExtensions.cs" />
+    <Compile Include="Models\MediaType.cs" />
+    <Compile Include="Models\Member.cs" />
+    <Compile Include="Models\Membership\MembershipUserExtensions.cs" />
+    <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
+    <Compile Include="Models\Membership\UmbracoMembershipUser.cs" />
+    <Compile Include="Models\Membership\User.cs" />
+    <Compile Include="Models\MemberType.cs" />
+    <Compile Include="Models\Packaging\InstallationSummary.cs" />
+    <Compile Include="Models\PublishedContent\PublishedContentTypeFactory.cs" />
+    <Compile Include="Models\PublishedContent\PublishedContentExtensionsForModels.cs" />
+    <Compile Include="Models\PublishedContent\PublishedContentModel.cs" />
+    <Compile Include="Models\PublishedContent\PublishedModelFactory.cs" />
+    <Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
     <Compile Include="Persistence\Dtos\AccessDto.cs" />
     <Compile Include="Persistence\Dtos\AccessRuleDto.cs" />
-    <Compile Include="Persistence\Dtos\AuditEntryDto.cs" />
     <Compile Include="Persistence\Dtos\CacheInstructionDto.cs" />
-    <Compile Include="Persistence\Dtos\ConsentDto.cs" />
     <Compile Include="Persistence\Dtos\ContentDto.cs" />
     <Compile Include="Persistence\Dtos\ContentNuDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentScheduleDto.cs" />
     <Compile Include="Persistence\Dtos\ContentType2ContentTypeDto.cs" />
     <Compile Include="Persistence\Dtos\ContentTypeAllowedContentTypeDto.cs" />
     <Compile Include="Persistence\Dtos\ContentTypeDto.cs" />
     <Compile Include="Persistence\Dtos\ContentTypeTemplateDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentVersionCultureVariationDto.cs" />
     <Compile Include="Persistence\Dtos\ContentVersionDto.cs" />
     <Compile Include="Persistence\Dtos\DataTypeDto.cs" />
     <Compile Include="Persistence\Dtos\DictionaryDto.cs" />
-    <Compile Include="Persistence\Dtos\DocumentCultureVariationDto.cs" />
     <Compile Include="Persistence\Dtos\DocumentDto.cs" />
     <Compile Include="Persistence\Dtos\DocumentPublishedReadOnlyDto.cs" />
     <Compile Include="Persistence\Dtos\DocumentVersionDto.cs" />
@@ -708,14 +480,11 @@
     <Compile Include="Persistence\Dtos\LogDto.cs" />
     <Compile Include="Persistence\Dtos\MacroDto.cs" />
     <Compile Include="Persistence\Dtos\MacroPropertyDto.cs" />
-    <Compile Include="Persistence\Dtos\MediaDto.cs" />
-    <Compile Include="Persistence\Dtos\MediaVersionDto.cs" />
     <Compile Include="Persistence\Dtos\Member2MemberGroupDto.cs" />
     <Compile Include="Persistence\Dtos\MemberDto.cs" />
     <Compile Include="Persistence\Dtos\MemberPropertyTypeDto.cs" />
     <Compile Include="Persistence\Dtos\NodeDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyDataDto.cs" />
-    <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeGroupDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeGroupReadOnlyDto.cs" />
@@ -733,10 +502,8 @@
     <Compile Include="Persistence\Dtos\UserGroup2AppDto.cs" />
     <Compile Include="Persistence\Dtos\UserGroup2NodePermissionDto.cs" />
     <Compile Include="Persistence\Dtos\UserGroupDto.cs" />
-    <Compile Include="Persistence\Dtos\UserLoginDto.cs" />
     <Compile Include="Persistence\Dtos\UserStartNodeDto.cs" />
     <Compile Include="Models\UserExtensions.cs" />
-    <Compile Include="NameValueCollectionExtensions.cs" />
     <Compile Include="ObjectJsonExtensions.cs" />
     <Compile Include="Models\Packaging\UninstallationSummary.cs" />
     <Compile Include="Packaging\PackageInstallation.cs" />
@@ -769,16 +536,13 @@
     <Compile Include="Persistence\DbCommandExtensions.cs" />
     <Compile Include="Persistence\DbConnectionExtensions.cs" />
     <Compile Include="Persistence\EntityNotFoundException.cs" />
-    <Compile Include="Persistence\Factories\AuditEntryFactory.cs" />
-    <Compile Include="Persistence\Factories\ConsentFactory.cs" />
-    <Compile Include="Persistence\Factories\ContentBaseFactory.cs" />
     <Compile Include="Persistence\Factories\ContentTypeFactory.cs" />
     <Compile Include="Persistence\Factories\DataTypeFactory.cs" />
     <Compile Include="Persistence\Factories\DictionaryItemFactory.cs" />
     <Compile Include="Persistence\Factories\DictionaryTranslationFactory.cs" />
     <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />
     <Compile Include="Persistence\Factories\LanguageFactory.cs" />
-    <Compile Include="Persistence\Factories\MacroFactory.cs" />
+    <Compile Include="Persistence\Factories\ContentBaseFactory.cs" />
     <Compile Include="Persistence\Factories\MemberGroupFactory.cs" />
     <Compile Include="Persistence\Factories\PropertyFactory.cs" />
     <Compile Include="Persistence\Factories\PropertyGroupFactory.cs" />
@@ -791,7 +555,6 @@
     <Compile Include="Persistence\Factories\UserFactory.cs" />
     <Compile Include="Persistence\Factories\UserGroupFactory.cs" />
     <Compile Include="Persistence\FaultHandling\ITransientErrorDetectionStrategy.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs" />
     <Compile Include="Persistence\FaultHandling\RetryingEventArgs.cs" />
     <Compile Include="Persistence\FaultHandling\RetryLimitExceededException.cs" />
     <Compile Include="Persistence\FaultHandling\RetryPolicy.cs" />
@@ -808,10 +571,7 @@
     <Compile Include="Persistence\IUmbracoDatabaseFactory.cs" />
     <Compile Include="Persistence\LocalDb.cs" />
     <Compile Include="Persistence\Mappers\AccessMapper.cs" />
-    <Compile Include="Persistence\Mappers\AuditEntryMapper.cs" />
-    <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
     <Compile Include="Persistence\Mappers\BaseMapper.cs" />
-    <Compile Include="Persistence\Mappers\ConsentMapper.cs" />
     <Compile Include="Persistence\Mappers\ContentMapper.cs" />
     <Compile Include="Persistence\Mappers\ContentTypeMapper.cs" />
     <Compile Include="Persistence\Mappers\DataTypeMapper.cs" />
@@ -837,13 +597,121 @@
     <Compile Include="Persistence\Mappers\RelationMapper.cs" />
     <Compile Include="Persistence\Mappers\RelationTypeMapper.cs" />
     <Compile Include="Persistence\Mappers\ServerRegistrationMapper.cs" />
-    <Compile Include="Persistence\Mappers\SimpleContentTypeMapper.cs" />
     <Compile Include="Persistence\Mappers\TagMapper.cs" />
     <Compile Include="Persistence\Mappers\TemplateMapper.cs" />
     <Compile Include="Persistence\Mappers\UmbracoEntityMapper.cs" />
     <Compile Include="Persistence\Mappers\UserGroupMapper.cs" />
     <Compile Include="Persistence\Mappers\UserMapper.cs" />
     <Compile Include="Persistence\Mappers\UserSectionMapper.cs" />
+    <Compile Include="Migrations\IMigrationContext.cs" />
+    <Compile Include="Migrations\IMigrationExpression.cs" />
+    <Compile Include="Migrations\Install\DatabaseDataCreator.cs" />
+    <Compile Include="Migrations\Install\DatabaseSchemaCreator.cs" />
+    <Compile Include="Migrations\Install\DatabaseSchemaResult.cs" />
+    <Compile Include="Migrations\MigrationBase.cs" />
+    <Compile Include="Migrations\MigrationContext.cs" />
+    <Compile Include="Migrations\MigrationExpressionBase.cs" />
+    <Compile Include="Migrations\Expressions\Alter\AlterBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterColumnExpression.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterDefaultConstraintExpression.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterTableExpression.cs" />
+    <Compile Include="Migrations\Expressions\Alter\IAlterBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Table\AlterTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnOptionForeignKeyCascadeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnOptionBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnTypeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Column\CreateColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOnTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOptionForeignKeyCascadeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOptionBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnTypeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Constraint\CreateConstraintBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Constraint\ICreateConstraintColumnsBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Constraint\ICreateConstraintOnTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\CreateBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Expressions\CreateConstraintExpression.cs" />
+    <Compile Include="Migrations\Expressions\Create\Expressions\CreateTableExpression.cs" />
+    <Compile Include="Migrations\Expressions\Create\ForeignKey\CreateForeignKeyBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyCascadeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyForeignColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyFromTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyPrimaryColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyToTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\ICreateBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Index\CreateIndexBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexColumnOptionsBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexForTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexOnColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexOptionsBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Table\CreateTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnAsTypeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnOptionForeignKeyCascadeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnOptionBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableWithColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Column\DeleteColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Column\IDeleteColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Constraint\DeleteConstraintBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Constraint\IDeleteConstraintBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\DeleteDefaultConstraintBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\IDeleteDefaultConstraintOnColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\IDeleteDefaultConstraintOnTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\DeleteBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Data\DeleteDataBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteColumnExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteConstraintExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteDataExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteDefaultConstraintExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteForeignKeyExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteIndexExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteTableExpression.cs" />
+    <Compile Include="Migrations\Expressions\Delete\ForeignKey\DeleteForeignKeyBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyForeignColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyFromTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyOnTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyPrimaryColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyToTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\IDeleteBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Data\IDeleteDataBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Index\DeleteIndexBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Index\IDeleteIndexForTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Delete\Index\IDeleteIndexOnColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Execute\ExecuteBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Execute\Expressions\ExecuteSqlStatementExpression.cs" />
+    <Compile Include="Migrations\Expressions\Execute\IExecuteBuilder.cs" />
+    <Compile Include="Migrations\Expressions\ExpressionBuilderBaseOfNext.cs" />
+    <Compile Include="Migrations\Expressions\ExpressionBuilderBase.cs" />
+    <Compile Include="Migrations\Expressions\Common\Expressions\CreateColumnExpression.cs" />
+    <Compile Include="Migrations\Expressions\Common\Expressions\CreateForeignKeyExpression.cs" />
+    <Compile Include="Migrations\Expressions\Common\Expressions\CreateIndexExpression.cs" />
+    <Compile Include="Migrations\Expressions\Common\IColumnOptionBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Common\IColumnTypeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\IFluentBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Common\IForeignKeyCascadeBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Insert\Expressions\InsertDataExpression.cs" />
+    <Compile Include="Migrations\Expressions\Insert\IInsertBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Insert\IInsertIntoBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Insert\InsertBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Insert\InsertIntoBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Column\IRenameColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Column\IRenameColumnToBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Column\RenameColumnBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Expressions\RenameColumnExpression.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Expressions\RenameTableExpression.cs" />
+    <Compile Include="Migrations\Expressions\Rename\IRenameBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\RenameBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Table\IRenameTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Rename\Table\RenameTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Update\Expressions\UpdateDataExpression.cs" />
+    <Compile Include="Migrations\Expressions\Update\IUpdateBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Update\IUpdateTableBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Update\IUpdateWhereBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Update\UpdateBuilder.cs" />
+    <Compile Include="Migrations\Expressions\Update\UpdateDataBuilder.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentNuTable.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\AddLockObjects.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\VariantsMigration.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\ContentVariationMigration.cs" />
     <Compile Include="Persistence\NPocoDatabaseExtensions-Bulk.cs" />
     <Compile Include="Persistence\NPocoDatabaseExtensions.cs" />
     <Compile Include="Persistence\NPocoDatabaseTypeExtensions.cs" />
@@ -860,38 +728,33 @@
     <Compile Include="Persistence\Querying\TextColumnType.cs" />
     <Compile Include="Persistence\Querying\ValuePropertyMatchType.cs" />
     <Compile Include="Persistence\RecordPersistenceType.cs" />
-    <Compile Include="Persistence\Repositories\IContentRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeCommonRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\IDataTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
-    <Compile Include="Persistence\Repositories\IEntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\AuditEntryRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\AuditRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ConsentRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ContentRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DocumentBlueprintRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DocumentRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ContentTypeRepositoryBase.cs" />
     <Compile Include="Persistence\Repositories\Implement\DataTypeContainerRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\DataTypeRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\DictionaryRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DocumentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DocumentRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\DocumentTypeContainerRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\DomainRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\EntityContainerRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\EntityRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ExternalLoginRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\FileRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
+    <Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IContentTypeRepositoryBase.cs" />
+    <Compile Include="Persistence\Repositories\IDataTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IEntityRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMediaRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMediaTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMemberRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
+    <Compile Include="Persistence\Repositories\IContentRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\LanguageRepositoryExtensions.cs" />
     <Compile Include="Persistence\Repositories\Implement\MacroRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\MediaRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\MediaTypeContainerRepository.cs" />
@@ -909,8 +772,8 @@
     <Compile Include="Persistence\Repositories\Implement\RedirectUrlRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\RelationRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\RelationTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\RepositoryBaseOfTIdTEntity.cs" />
     <Compile Include="Persistence\Repositories\Implement\RepositoryCacheKeys.cs" />
+    <Compile Include="Persistence\Repositories\Implement\RepositoryBaseOfTIdTEntity.cs" />
     <Compile Include="Persistence\Repositories\Implement\ScriptRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ServerRegistrationRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\SimilarNodeName.cs" />
@@ -921,10 +784,8 @@
     <Compile Include="Persistence\Repositories\Implement\TupleExtensions.cs" />
     <Compile Include="Persistence\Repositories\Implement\UserGroupRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\UserRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ContentRepositoryBase.cs" />
     <Compile Include="Persistence\SqlContext.cs" />
-    <Compile Include="Persistence\SqlContextExtensions.cs" />
-    <Compile Include="Persistence\SqlSyntaxExtensions.cs" />
     <Compile Include="Persistence\SqlSyntax\ColumnInfo.cs" />
     <Compile Include="Persistence\SqlSyntax\DbTypes.cs" />
     <Compile Include="Persistence\SqlSyntax\ISqlSyntaxProvider.cs" />
@@ -939,48 +800,21 @@
     <Compile Include="Persistence\UmbracoDatabase.cs" />
     <Compile Include="Persistence\UmbracoDatabaseExtensions.cs" />
     <Compile Include="Persistence\UmbracoDatabaseFactory.cs" />
-    <Compile Include="Persistence\UmbracoPocoDataBuilder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="PropertyEditors\ColorPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\ConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ConfigurationEditorOfTConfiguration.cs" />
+    <Compile Include="PropertyEditors\DefaultPropertyValueConverterAttribute.cs" />
+    <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\DataEditor.cs" />
-    <Compile Include="PropertyEditors\DataEditorAttribute.cs" />
     <Compile Include="PropertyEditors\DataEditorCollection.cs" />
     <Compile Include="PropertyEditors\DataEditorCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\DataValueEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
-    <Compile Include="PropertyEditors\DefaultPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\DefaultPropertyValueConverterAttribute.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexibleConfiguration.cs" />
-    <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
-    <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
-    <Compile Include="PropertyEditors\LabelConfiguration.cs" />
-    <Compile Include="PropertyEditors\LabelConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditorCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorTagsExtensions.cs" />
     <Compile Include="PropertyEditors\PropertyValueConverterBase.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\SliderConfiguration.cs" />
-    <Compile Include="PropertyEditors\TagConfiguration.cs" />
-    <Compile Include="PropertyEditors\Validators\DelimitedValueValidator.cs" />
-    <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
-    <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
+    <Compile Include="PropertyEditors\DataValueEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\CheckboxListValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ColorPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\DatePickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\DecimalValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\EmailAddressValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\IntegerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\JsonValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\LabelValueConverter.cs" />
@@ -995,17 +829,9 @@
     <Compile Include="PropertyEditors\ValueConverters\TinyMceValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\UploadPropertyConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\YesNoValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueListConfiguration.cs" />
-    <Compile Include="PropertyEditors\VoidEditor.cs" />
-    <Compile Include="PublishedContentExtensions.cs" />
-    <Compile Include="PublishedModelFactoryExtensions.cs" />
-    <Compile Include="ReflectionUtilities-Unused.cs" />
     <Compile Include="ReflectionUtilities.cs" />
-    <Compile Include="RuntimeOptions.cs" />
     <Compile Include="RuntimeState.cs" />
-    <Compile Include="Runtime\CoreInitialComponent.cs" />
     <Compile Include="Runtime\CoreInitialComposer.cs" />
-    <Compile Include="Runtime\CoreRuntime.cs" />
     <Compile Include="Scoping\IScope.cs" />
     <Compile Include="Scoping\IScopeAccessor.cs" />
     <Compile Include="Scoping\IScopeProvider.cs" />
@@ -1036,41 +862,26 @@
     <Compile Include="Security\UserAwareMembershipProviderPasswordHasher.cs" />
     <Compile Include="Serialization\CaseInsensitiveDictionaryConverter.cs" />
     <Compile Include="Serialization\ForceInt32Converter.cs" />
-    <Compile Include="Serialization\FuzzyBooleanConverter.cs" />
-    <Compile Include="Serialization\JsonNetSerializer.cs" />
     <Compile Include="Serialization\JsonReadConverter.cs" />
     <Compile Include="Serialization\JsonToStringConverter.cs" />
     <Compile Include="Serialization\KnownTypeUdiJsonConverter.cs" />
     <Compile Include="Serialization\NoTypeConverterJsonConverter.cs" />
+    <Compile Include="Serialization\FuzzyBooleanConverter.cs" />
     <Compile Include="Serialization\UdiJsonConverter.cs" />
     <Compile Include="Serialization\UdiRangeJsonConverter.cs" />
     <Compile Include="ServiceContextExtensions.cs" />
-    <Compile Include="Services\Changes\ContentTypeChange.cs" />
-    <Compile Include="Services\Changes\ContentTypeChangeExtensions.cs" />
-    <Compile Include="Services\ContentServiceExtensions.cs" />
-    <Compile Include="Services\ContentTypeServiceExtensions.cs" />
-    <Compile Include="Services\DateTypeServiceExtensions.cs" />
-    <Compile Include="Services\IContentService.cs" />
     <Compile Include="Services\IContentTypeBaseServiceProvider.cs" />
-    <Compile Include="Services\IContentTypeService.cs" />
-    <Compile Include="Services\IContentTypeServiceBase.cs" />
-    <Compile Include="Services\IDataTypeService.cs" />
-    <Compile Include="Services\IdkMap.cs" />
-    <Compile Include="Services\IEntityService.cs" />
     <Compile Include="Services\IEntityXmlSerializer.cs" />
-    <Compile Include="Services\IMediaService.cs" />
-    <Compile Include="Services\IMediaTypeService.cs" />
-    <Compile Include="Services\IMemberService.cs" />
-    <Compile Include="Services\IMembershipMemberService.cs" />
-    <Compile Include="Services\IMemberTypeService.cs" />
     <Compile Include="Services\Implement\AuditService.cs" />
     <Compile Include="Services\Implement\ConsentService.cs" />
     <Compile Include="Services\Implement\ContentService.cs" />
-    <Compile Include="Services\Implement\ContentTypeBaseServiceProvider.cs" />
+    <Compile Include="Services\ContentServiceExtensions.cs" />
     <Compile Include="Services\Implement\ContentTypeService.cs" />
     <Compile Include="Services\Implement\ContentTypeServiceBase.cs" />
     <Compile Include="Services\Implement\ContentTypeServiceBaseOfTItemTService.cs" />
     <Compile Include="Services\Implement\ContentTypeServiceBaseOfTRepositoryTItemTService.cs" />
+    <Compile Include="Services\ContentTypeServiceExtensions.cs" />
+    <Compile Include="Services\Implement\ContentTypeBaseServiceProvider.cs" />
     <Compile Include="Services\Implement\DataTypeService.cs" />
     <Compile Include="Services\Implement\DomainService.cs" />
     <Compile Include="Services\Implement\EntityService.cs" />
@@ -1104,34 +915,34 @@
     <Compile Include="Services\Implement\RepositoryService.cs" />
     <Compile Include="Services\Implement\ScopeRepositoryService.cs" />
     <Compile Include="Services\Implement\ServerRegistrationService.cs" />
+    <Compile Include="Services\ServiceContext.cs" />
     <Compile Include="Services\Implement\TagService.cs" />
     <Compile Include="Services\Implement\UserService.cs" />
-    <Compile Include="Services\INotificationService.cs" />
-    <Compile Include="Services\IPackagingService.cs" />
-    <Compile Include="Services\IPublicAccessService.cs" />
-    <Compile Include="Services\LocalizedTextServiceExtensions.cs" />
-    <Compile Include="Services\MediaServiceExtensions.cs" />
-    <Compile Include="Services\PropertyValidationService.cs" />
-    <Compile Include="Services\PublicAccessServiceExtensions.cs" />
-    <Compile Include="Services\PublishResult.cs" />
-    <Compile Include="Services\ServiceContext.cs" />
     <Compile Include="Services\UserServiceExtensions.cs" />
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="Strings\DefaultUrlSegmentProvider.cs" />
-    <Compile Include="Strings\IUrlSegmentProvider.cs" />
-    <Compile Include="Strings\UrlSegmentProviderCollection.cs" />
+    <Compile Include="Compose\ManifestWatcherComponent.cs" />
+    <Compile Include="Compose\RelateOnCopyComponent.cs" />
+    <Compile Include="Compose\RelateOnTrashComponent.cs" />
     <Compile Include="Strings\UrlSegmentProviderCollectionBuilder.cs" />
     <Compile Include="Sync\ApplicationUrlHelper.cs" />
     <Compile Include="Sync\DatabaseServerMessenger.cs" />
     <Compile Include="Sync\RefreshInstruction.cs" />
-    <Compile Include="Sync\RefreshInstructionEnvelope.cs" />
     <Compile Include="Sync\ServerMessengerBase.cs" />
-    <Compile Include="TypeExtensions.cs" />
-    <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="UdiEntityTypeHelper.cs" />
     <Compile Include="UdiGetterExtensions.cs" />
     <Compile Include="UdiParserServiceConnectors.cs" />
     <Compile Include="UriExtensions.cs" />
+    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="FileResources\BlockingWeb.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="FileResources\Files.resx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
@@ -1139,11 +950,5 @@
       <Name>Umbraco.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="FileResources\BlockingWeb.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="FileResources\Files.resx" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file