Merge branch 'release/10.8.11' into v10/dev

# Conflicts:
#	version.json

.github/README.md

@@ -25,7 +25,7 @@ If you want to DIY, then you can [download Umbraco]((https://our.umbraco.com/dow
 
 ## Documentation
 
-The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
+The documentation for Umbraco CMS can be found [on Our Umbraco](https://docs.umbraco.com/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
 
 ## Join the Umbraco community
 

.github/workflows/pr-first-response.yml

@@ -11,15 +11,10 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - name: Install dependencies
-        run: |
-          npm install node-fetch@2
       - name: Fetch random comment 🗣️ and add it to the PR
         uses: actions/github-script@v6
         with:
           script: |
-            const fetch = require('node-fetch')
-
             const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment', {
               method: 'post',
               body: JSON.stringify({
@@ -46,13 +41,13 @@ jobs:
                     });
                 } else {
                     console.log("Returned data not indicate success.");
-                    
+
                     if(response.status !== 200) {
                       console.log("Status code:", response.status)
                     }
 
                     console.log("Returned data:", data);
-                    
+
                     if(data === '') {
                       console.log("An empty response usually indicates that either no comment was found or the actor user was not eligible for getting an automated response (HQ users are not getting auto-responses).")
                     }

.gitignore

@@ -90,10 +90,7 @@ preserve.belle
 /src/Umbraco.Web.UI/appsettings.Local.json
 
 # Tests
-cypress.env.json
-/tests/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
-/tests/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
-/tests/Umbraco.Tests.AcceptanceTest/cypress/videos/
+/tests/Umbraco.Tests.AcceptanceTest/.env
 /tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
 /tests/Umbraco.Tests.Integration.SqlCe/[Uu]mbraco/[Dd]ata/TEMP/
 /tests/Umbraco.Tests.Integration/appsettings.Tests.Local.json

Directory.Build.props

@@ -49,4 +49,5 @@
   <PropertyGroup>
     <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
   </PropertyGroup>
+
 </Project>

build/azure-pipelines.yml

@@ -21,9 +21,33 @@ parameters:
     displayName: Upload API docs
     type: boolean
     default: false
+  - name: forceReleaseTestFilter
+    displayName: Force to use the release test filters
+    type: boolean
+    default: false
+  - name: integrationNonReleaseTestFilter
+    displayName: TestFilter used for non-release type builds
+    type: string
+    default: '--filter TestCategory!=LongRunning&TestCategory!=NonCritical'
+  - name: integrationReleaseTestFilter
+    displayName: TestFilter used for release type builds
+    type: string
+    default: ' '
+  - name: nonWindowsIntegrationNonReleaseTestFilter
+    displayName: TestFilter used for non-release type builds on non windows agents
+    type: string
+    default: '--filter TestCategory!=LongRunning&TestCategory!=NonCritical'
+  - name: nonWindowsIntegrationReleaseTestFilter
+    displayName: TestFilter used for release type builds on non windows agents
+    type: string
+    default: ' '
+  - name: isNightly
+    displayName: 'Is nightly build (used for MyGet feed)'
+    type: boolean
+    default: false
 
 variables:
-  nodeVersion: 14.18.1
+  nodeVersion: 20
   dotnetVersion: 6.x
   dotnetIncludePreviewVersions: false
   solution: umbraco.sln
@@ -49,6 +73,7 @@ stages:
         steps:
           - task: NodeTool@0
             displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
             inputs:
               versionSpec: $(nodeVersion)
           - task: Cache@2
@@ -61,9 +86,9 @@ stages:
               path: $(npm_config_cache)
           - script: npm ci --no-fund --no-audit --prefer-offline
             workingDirectory:  src/Umbraco.Web.UI.Client
-            displayName: Run npm ci
+            displayName: Run npm ci (Backoffice)
           - task: gulp@0
-            displayName: Run gulp build
+            displayName: Run gulp build (Backoffice)
             inputs:
               gulpFile: src/Umbraco.Web.UI.Client/gulpfile.js
               targets: coreBuild
@@ -80,44 +105,12 @@ stages:
               command: restore
               projects: $(solution)
           - task: DotNetCoreCLI@2
-            displayName: Run dotnet build
+            name: build
+            displayName: Run dotnet build and generate NuGet packages
             inputs:
               command: build
               projects: $(solution)
-              arguments: '--configuration $(buildConfiguration) --no-restore -p:ContinuousIntegrationBuild=true'
-          - script: |
-              version="$(Build.BuildNumber)"
-              echo "varsion: $version"
-
-              major="$(echo $version | cut -d '.' -f 1)"
-              echo "major version: $major"
-
-              echo "##vso[task.setvariable variable=majorVersion;isOutput=true]$major"
-            displayName: Set major version
-            name: determineMajorVersion
-          - task: PowerShell@2
-            displayName: Prepare nupkg
-            inputs:
-              targetType: inline
-              script: |
-                $umbracoVersion = "$(Build.BuildNumber)" -replace "\+",".g"
-                $templatePaths = Get-ChildItem 'templates/**/.template.config/template.json'
-
-                foreach ($templatePath in $templatePaths) {
-                  $a = Get-Content $templatePath -Raw | ConvertFrom-Json
-                  if ($a.symbols -and $a.symbols.UmbracoVersion) {
-                    $a.symbols.UmbracoVersion.defaultValue = $umbracoVersion
-                    $a | ConvertTo-Json -Depth 32 | Set-Content $templatePath
-                  }
-                }
-
-                dotnet pack $(solution) --configuration $(buildConfiguration) -p:BuildProjectReferences=false --output $(Build.ArtifactStagingDirectory)/nupkg
-          - script: |
-              sha="$(Build.SourceVersion)"
-              sha=${sha:0:7}
-              buildnumber="$(Build.BuildNumber)_$(Build.BuildId)_$sha"
-              echo "##vso[build.updatebuildnumber]$buildnumber"
-            displayName: Update build number
+              arguments: '--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg'
           - task: PublishPipelineArtifact@1
             displayName: Publish nupkg
             inputs:
@@ -130,11 +123,11 @@ stages:
               artifactName: build_output
 
   - stage: Build_Docs
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.buildApiDocs}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.buildApiDocs}}))
     displayName: Prepare API Documentation
     dependsOn: Build
     variables:
-      umbracoMajorVersion: $[ stageDependencies.Build.A.outputs['determineMajorVersion.majorVersion'] ]
+      umbracoMajorVersion: $[ stageDependencies.Build.A.outputs['build.NBGV_VersionMajor'] ]
     jobs:
       # C# API Reference
       - job:
@@ -147,7 +140,7 @@ stages:
             inputs:
               targetType: inline
               script: |
-                choco install docfx --version=2.59.2 -y
+                choco install docfx --version=2.59.4 -y
                 if ($lastexitcode -ne 0){
                     throw ("Error installing DocFX")
                 }
@@ -188,9 +181,10 @@ stages:
           vmImage: 'ubuntu-latest'
         steps:
           - task: NodeTool@0
-            displayName: Use Node.js 10.15.0
+            displayName: Use Node.js 10.15.x
+            retryCountOnTaskFailure: 3
             inputs:
-              versionSpec: 10.15.0 # Won't work with higher versions
+              versionSpec: 10.15.x # Won't work with higher versions
           - script: |
               npm ci --no-fund --no-audit --prefer-offline
               npx gulp docs
@@ -259,6 +253,8 @@ stages:
   - stage: Integration
     displayName: Integration Tests
     dependsOn: Build
+    variables:
+      releaseTestFilter: eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True')
     jobs:
       # Integration Tests (SQLite)
       - job:
@@ -286,12 +282,30 @@ stages:
               performMultiLevelLookup: true
               includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
-            displayName: Run dotnet test
+            displayName: Run dotnet test Windows
+            condition: eq(variables['Agent.OS'],'Windows_NT')
             inputs:
               command: test
               projects: '**/*.Tests.Integration.csproj'
-              arguments: '--configuration $(buildConfiguration) --no-build'
               testRunTitle: Integration Tests SQLite - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.integrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) ${{parameters.integrationNonReleaseTestFilter}}'
+            env:
+              Tests__Database__DatabaseType: 'Sqlite'
+              Umbraco__CMS__Global__MainDomLock: 'FileSystemMainDomLock'
+          - task: DotNetCoreCLI@2
+            displayName: Run dotnet test Non Windows
+            condition: ne(variables['Agent.OS'],'Windows_NT')
+            inputs:
+              command: test
+              projects: '**/*.Tests.Integration.csproj'
+              testRunTitle: Integration Tests SQLite - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.nonWindowsIntegrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) ${{parameters.nonWindowsIntegrationNonReleaseTestFilter}}'
             env:
               Tests__Database__DatabaseType: 'Sqlite'
               Umbraco__CMS__Global__MainDomLock: 'FileSystemMainDomLock'
@@ -299,7 +313,7 @@ stages:
       # Integration Tests (SQL Server)
       - job:
         timeoutInMinutes: 120
-        condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.sqlServerIntegrationTests}})
+        condition: or(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), ${{parameters.sqlServerIntegrationTests}})
         displayName: Integration Tests (SQL Server)
         strategy:
           matrix:
@@ -310,7 +324,7 @@ stages:
             Linux:
               vmImage: 'ubuntu-latest'
               testDb: SqlServer
-              connectionString: 'Server=localhost,1433;User Id=sa;Password=$(SA_PASSWORD);'
+              connectionString: 'Server=localhost,1433;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=true'
         pool:
           vmImage: $(vmImage)
         variables:
@@ -321,6 +335,11 @@ stages:
             inputs:
               artifact: build_output
               path: $(Build.SourcesDirectory)
+          - task: UseDotNet@2
+            displayName: Use .NET $(dotnetVersion)
+            inputs:
+              version: $(dotnetVersion)
+              includePreviewVersions: $(dotnetIncludePreviewVersions)
           - powershell: sqllocaldb start mssqllocaldb
             displayName: Start localdb (Windows only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
@@ -328,12 +347,31 @@ stages:
             displayName: Start SQL Server (Linux only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
           - task: DotNetCoreCLI@2
-            displayName: Run dotnet test
+            displayName: Run dotnet test Windows
+            condition: eq(variables['Agent.OS'],'Windows_NT')
             inputs:
               command: test
               projects: '**/*.Tests.Integration.csproj'
-              arguments: '--configuration $(buildConfiguration) --no-build'
               testRunTitle: Integration Tests SQL Server - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.integrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.integrationNonReleaseTestFilter}}'
+            env:
+              Tests__Database__DatabaseType: $(testDb)
+              Tests__Database__SQLServerMasterConnectionString: $(connectionString)
+              Umbraco__CMS__Global__MainDomLock: 'SqlMainDomLock'
+          - task: DotNetCoreCLI@2
+            displayName: Run dotnet test NonWindows
+            condition: ne(variables['Agent.OS'],'Windows_NT')
+            inputs:
+              command: test
+              projects: '**/*.Tests.Integration.csproj'
+              testRunTitle: Integration Tests SQL Server - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.nonWindowsIntegrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.nonWindowsIntegrationNonReleaseTestFilter}}'
             env:
               Tests__Database__DatabaseType: $(testDb)
               Tests__Database__SQLServerMasterConnectionString: $(connectionString)
@@ -349,24 +387,10 @@ stages:
       - job:
         displayName: E2E Tests
         variables:
-          - name: Umbraco__CMS__Unattended__InstallUnattended  # Windows only
-            value: true
-          - name: Umbraco__CMS__Unattended__UnattendedUserName  # Windows only
-            value: Playwright Test
-          - name: Umbraco__CMS__Unattended__UnattendedUserEmail  # Windows only
-            value: playwright@umbraco.com
-          - name: Umbraco__CMS__Unattended__UnattendedUserPassword  # Windows only
-            value: UmbracoAcceptance123!
-          - name: Umbraco__CMS__Global__InstallMissingDatabase  # Windows only
-            value: true
-          - name: UmbracoDatabaseServer # Windows only
-            value: (LocalDB)\MSSQLLocalDB
-          - name: UmbracoDatabaseName  # Windows only
-            value: Playwright
-          - name: ConnectionStrings__umbracoDbDSN  # Windows only
-            value: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
-          - name: PLAYWRIGHT_BASE_URL
-            value: https://localhost:8443
+          Umbraco__CMS__Unattended__UnattendedUserName: Playwright Test
+          Umbraco__CMS__Unattended__UnattendedUserPassword: UmbracoAcceptance123!
+          Umbraco__CMS__Unattended__UnattendedUserEmail: playwright@umbraco.com
+          ASPNETCORE_URLS: https://localhost:8443
         strategy:
           matrix:
             Linux:
@@ -375,6 +399,21 @@ stages:
               dockerImageName: umbraco-linux
             Windows:
               vmImage: 'windows-latest'
+              DOTNET_GENERATE_ASPNET_CERTIFICATE: true # Automatically generate HTTPS development certificate on Windows
+              # Enable console logging in Release mode
+              Serilog__WriteTo__0__Name: Async
+              Serilog__WriteTo__0__Args__configure__0__Name: Console
+              # Set unattended install settings
+              Umbraco__CMS__Unattended__InstallUnattended: true
+              Umbraco__CMS__Global__InstallMissingDatabase: true
+              UmbracoDatabaseServer: (LocalDB)\MSSQLLocalDB
+              UmbracoDatabaseName: AcceptanceTestDB
+              ConnectionStrings__umbracoDbDSN: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
+              # Custom Umbraco settings
+              Umbraco__CMS__Global__VersionCheckPeriod: 0
+              Umbraco__CMS__Global__UseHttps: true
+              Umbraco__CMS__HealthChecks__Notification__Enabled: false
+              Umbraco__CMS__KeepAlive__DisableKeepAliveTask: true
         pool:
           vmImage: $(vmImage)
         steps:
@@ -385,6 +424,7 @@ stages:
               path: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/misc/nupkg
           - task: NodeTool@0
             displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
             inputs:
               versionSpec: $(nodeVersion)
           - task: Cache@2
@@ -395,22 +435,19 @@ stages:
                 "npm_e2e" | "$(Agent.OS)"
                 "npm_e2e"
               path: $(npm_config_cache)
-          - task: PowerShell@2
+          - pwsh: |
+              New-Item -Path "." -Name ".env" -ItemType "file" -Value "UMBRACO_USER_LOGIN=$(Umbraco__CMS__Unattended__UnattendedUserEmail)
+              UMBRACO_USER_PASSWORD=$(Umbraco__CMS__Unattended__UnattendedUserPassword)
+              URL=$(ASPNETCORE_URLS)"
             displayName: Generate .env
-            inputs:
-              targetType: inline
-              workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/
-              script: |
-                New-Item -Path "." -Name ".env" -ItemType "file" -Value "UMBRACO_USER_LOGIN=$(Umbraco__CMS__Unattended__UnattendedUserEmail)
-                UMBRACO_USER_PASSWORD=$(Umbraco__CMS__Unattended__UnattendedUserPassword)
-                URL=$(PLAYWRIGHT_BASE_URL)"
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/
           - script: npm ci --no-fund --no-audit --prefer-offline
             workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/
             displayName: Run npm ci
-          - powershell: sqllocaldb start mssqllocaldb
+          - pwsh: sqllocaldb start mssqllocaldb
             displayName: Start localdb (Windows only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-          - powershell:  Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer
+          - pwsh: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer
             displayName: Create database (Windows only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
           - task: UseDotNet@2
@@ -419,56 +456,50 @@ stages:
               version: $(dotnetVersion)
               performMultiLevelLookup: true
               includePreviewVersions: $(dotnetIncludePreviewVersions)
-          # Linux containers smooth
-          - task: PowerShell@2
+          - pwsh: |
+              $sha = 'g$(Build.SourceVersion)'.substring(0, 8)
+              docker build -t $(dockerImageName):$sha -f $(dockerfile) .
+              mkdir -p $(Build.ArtifactStagingDirectory)/docker-images
+              docker save -o $(Build.ArtifactStagingDirectory)/docker-images/$(dockerImageName).$sha.tar $(dockerImageName):$sha
+              dotnet dev-certs https -ep ${HOME}/.aspnet/https/aspnetapp.pfx -p $(Umbraco__CMS__Unattended__UnattendedUserPassword)
+              docker run --name $(dockerImageName) -dp 8080:5000 -dp 8443:5001 -e UMBRACO__CMS__GLOBAL__ID=$(UMBRACO__CMS__GLOBAL__ID) -e ASPNETCORE_Kestrel__Certificates__Default__Password="$(Umbraco__CMS__Unattended__UnattendedUserPassword)" -e ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx -v ${HOME}/.aspnet/https:/https/ $(dockerImageName):$sha
+              docker ps
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-            displayName: Build & run container (Linux only)
-            inputs:
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
-              targetType: inline
-              script: |
-                $sha = 'g$(Build.SourceVersion)'.substring(0, 8)
-                docker build -t $(dockerImageName):$sha -f $(dockerfile) .
-                mkdir -p $(Build.ArtifactStagingDirectory)/docker-images
-                docker save -o $(Build.ArtifactStagingDirectory)/docker-images/$(dockerImageName).$sha.tar $(dockerImageName):$sha
-                dotnet dev-certs https -ep ${HOME}/.aspnet/https/aspnetapp.pfx -p UmbracoAcceptance123!
-                docker run --name $(dockerImageName) -dp 8080:5000 -dp 8443:5001 -e UMBRACO__CMS__GLOBAL__ID=$(UMBRACO__CMS__GLOBAL__ID) -e ASPNETCORE_Kestrel__Certificates__Default__Password="UmbracoAcceptance123!" -e ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx -v ${HOME}/.aspnet/https:/https/ $(dockerImageName):$sha
-                docker ps
-          # Urls matching docker setup.
-          - task: PowerShell@2
+            displayName: Build and run container (Linux only)
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
+          - pwsh: |
+              dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg
+              dotnet new umbraco --name AcceptanceTestProject --no-restore --output .
+              dotnet restore --configfile ./nuget.config
+              dotnet build --configuration $(buildConfiguration) --no-restore
+              dotnet dev-certs https
+              $process = Start-Process -FilePath "dotnet" -ArgumentList "run --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
+              Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-            displayName: Build & run app (Windows only)
-            inputs:
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
-              targetType: inline
-              script: |
-                dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg
-                dotnet new umbraco --name Playwright --no-restore --output .
-                dotnet restore --configfile ./nuget.config
-                dotnet build --configuration $(buildConfiguration) --no-restore
-                dotnet dev-certs https
-                Start-Process -FilePath "dotnet" -ArgumentList "run --configuration $(buildConfiguration) --no-build --no-launch-profile --urls $(PLAYWRIGHT_BASE_URL)"
-          - task: PowerShell@2
+            displayName: Build and run app (Windows only)
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
+          - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS)
             displayName: Wait for app
-            inputs:
-              targetType: inline
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-              script: |
-                npm i -g wait-on
-                wait-on -v --interval 1000 --timeout 120000 $(PLAYWRIGHT_BASE_URL)
-          - task: PowerShell@2
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+          - pwsh: npx playwright install --with-deps
             displayName: Install Playwright
-            inputs:
-              targetType: inline
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-              script: npx playwright install
-          - task: PowerShell@2
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+          - pwsh: npm run test --ignore-certificate-errors
             displayName: Run Playwright (Desktop)
             continueOnError: true
-            inputs:
-              targetType: inline
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-              script: 'npm run test --ignore-certificate-errors'
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+            env:
+              CI: true
+              CommitId: $(Build.SourceVersion)
+              AgentOs: $(Agent.OS)
+          - pwsh: |
+              docker logs $(dockerImageName) > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1
+              docker stop $(dockerImageName)
+            condition: eq(variables['Agent.OS'], 'Linux')
+            displayName: Stop app (Linux only)
+          - pwsh: Stop-Process $env:AcceptanceTestProcessId
+            condition: eq(variables['Agent.OS'], 'Windows_NT')
+            displayName: Stop app (Windows only)
           - task: PowerShell@2
             displayName: Check if artifacts folder exists
             inputs:
@@ -483,12 +514,13 @@ stages:
               sourceFolder: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/results/
               targetFolder: $(Build.ArtifactStagingDirectory)/playwright
           - task: PublishPipelineArtifact@1
-            displayName: "Publish test artifacts"
-            condition: eq(variables.resultFolderExists, 'True')
+            condition: always()
+            displayName: Publish test artifacts
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
               artifact: 'E2E artifacts - $(Agent.OS) - Attempt #$(System.JobAttempt)'
 
+
   ###############################################
   ## Release
   ###############################################
@@ -498,9 +530,11 @@ stages:
       - Unit
       - Integration
       # - E2E # TODO: Enable when stable.
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.myGetDeploy}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.myGetDeploy}}))
     jobs:
       - job:
+        pool:
+          vmImage: "windows-latest" # NuGetCommand@2 is no longer supported on Ubuntu 24.04 so we'll use windows until an alternative is available.
         displayName: Push to pre-release feed
         steps:
           - checkout: none
@@ -515,16 +549,20 @@ stages:
               command: 'push'
               packagesToPush: $(Build.ArtifactStagingDirectory)/**/*.nupkg
               nuGetFeedType: 'external'
-              publishFeedCredentials: 'MyGet - Pre-releases'
-
+              ${{ if eq(parameters.isNightly, true) }}:
+                publishFeedCredentials: 'MyGet - Umbraco Nightly'
+              ${{ else }}:
+                publishFeedCredentials: 'MyGet - Pre-releases'
   - stage: Deploy_NuGet
     displayName: NuGet release
     dependsOn:
       - Deploy_MyGet
       - Build_Docs
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.nuGetDeploy}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.nuGetDeploy}}))
     jobs:
       - job:
+        pool:
+          vmImage: "windows-latest" # NuGetCommand@2 is no longer supported on Ubuntu 24.04 so we'll use windows until an alternative is available.
         displayName: Push to NuGet
         steps:
           - checkout: none
@@ -545,12 +583,12 @@ stages:
     pool:
       vmImage: 'windows-latest' # Apparently AzureFileCopy is windows only :(
     variables:
-      umbracoMajorVersion:  $[ stageDependencies.Build.A.outputs['determineMajorVersion.majorVersion'] ]
+      umbracoMajorVersion:  $[ stageDependencies.Build.A.outputs['build.NBGV_VersionMajor'] ]
     displayName: Upload API Documention
     dependsOn:
       - Build
       - Deploy_NuGet
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.uploadApiDocs}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.uploadApiDocs}}))
     jobs:
       - job:
         displayName: Upload C# Docs

build/nightly-build-trigger.yml

@@ -0,0 +1,35 @@
+name: Nightly_$(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+pr: none
+trigger: none
+
+schedules:
+- cron: '0 0 * * *'
+  displayName: Daily midnight build
+  branches:
+    include:
+    - v10/dev
+    - v12/dev
+    - v13/dev
+    - v14/dev
+
+steps:
+- checkout: none
+- task: TriggerBuild@4
+  inputs:
+    definitionIsInCurrentTeamProject: true
+    buildDefinition: '301'
+    queueBuildForUserThatTriggeredBuild: true
+    ignoreSslCertificateErrors: false
+    useSameSourceVersion: false
+    useCustomSourceVersion: false
+    useSameBranch: true
+    waitForQueuedBuildsToFinish: false
+    storeInEnvironmentVariable: false
+    templateParameters: 'sqlServerIntegrationTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true'
+    authenticationMethod: 'OAuth Token'
+    enableBuildInQueueCondition: false
+    dependentOnSuccessfulBuildCondition: false
+    dependentOnFailedBuildCondition: false
+    checkbuildsoncurrentbranch: false
+    failTaskIfConditionsAreNotFulfilled: false

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.300",
+    "rollForward": "latestFeature"
+  }
+}

src/Directory.Packages.props

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <NoWarn>NU1507</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
+    <PackageVersion Include="Examine" Version="3.0.1" />
+    <PackageVersion Include="Examine.Core" Version="3.0.1" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.54" />
+    <PackageVersion Include="IPNetwork2" Version="2.6.618" />
+    <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.6" />
+    <PackageVersion Include="MailKit" Version="3.2.0" />
+    <PackageVersion Include="Markdown" Version="2.2.1" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="6.0.24" />
+    <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
+    <PackageVersion Include="MiniProfiler.Shared" Version="4.2.22" />
+    <PackageVersion Include="ncrontab" Version="3.3.3" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NPoco.SqlServer" Version="5.3.2" />
+    <PackageVersion Include="Serilog" Version="2.12.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageVersion Include="Serilog.Enrichers.Process" Version="2.0.2" />
+    <PackageVersion Include="Serilog.Enrichers.Thread" Version="3.1.0" />
+    <PackageVersion Include="Serilog.Expressions" Version="3.4.1" />
+    <PackageVersion Include="Serilog.Extensions.Hosting" Version="4.2.0" />
+    <PackageVersion Include="Serilog.Formatting.Compact" Version="1.1.0" />
+    <PackageVersion Include="Serilog.Formatting.Compact.Reader" Version="1.0.5" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.10" />
+    <PackageVersion Include="SixLabors.ImageSharp.Web" Version="2.0.2" />
+    <PackageVersion Include="Smidge.InMemory" Version="4.3.0" />
+    <PackageVersion Include="Smidge.Nuglify" Version="4.2.1" />
+    <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageVersion Include="System.Runtime.Caching" Version="6.0.0" />
+    <PackageVersion Include="Umbraco.CSharpTest.Net.Collections" Version="14.906.1403.1085" />
+    <!--   Add dependencies that we force an update to, even that we do not use them explicitly and they seems to be taken from the framework instead of from Nuget -->
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="6.0.1" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+</Project>

src/JsonSchema/AppSettings.cs

@@ -51,6 +51,7 @@ namespace JsonSchema
                 public ImagingSettings? Imaging { get; set; }
 
                 public IndexCreatorSettings? Examine { get; set; }
+                public IndexingSettings? Indexing { get; set; }
 
                 public KeepAliveSettings? KeepAlive { get; set; }
 
@@ -88,9 +89,25 @@ namespace JsonSchema
 
                 public HelpPageSettings? HelpPage { get; set; }
 
-                public InstallDefaultDataSettings? DefaultDataCreation { get; set; }
+                public InstallDefaultData? InstallDefaultData { get; set; }
 
                 public DataTypesSettings? DataTypes { get; set; }
+
+                public MarketplaceSettings? Marketplace { get; set; }
+            }
+
+            /// <summary>
+            ///     Configurations for the Umbraco CMS InstallDefaultData configuration.
+            /// </summary>
+            public class InstallDefaultData
+            {
+                public InstallDefaultDataSettings? Languages { get; set; }
+
+                public InstallDefaultDataSettings? DataTypes { get; set; }
+
+                public InstallDefaultDataSettings? MediaTypes { get; set; }
+
+                public InstallDefaultDataSettings? MemberTypes { get; set; }
             }
 
             /// <summary>

src/JsonSchema/JsonSchema.csproj

@@ -3,16 +3,17 @@
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
     <EnablePackageValidation>false</EnablePackageValidation>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="NJsonSchema" Version="10.7.2" />
+    <PackageReference Include="NJsonSchema" Version="10.9.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
-    <PackageReference Include="Umbraco.Deploy.Core" Version="10.1.0" />
-    <PackageReference Include="Umbraco.Forms.Core" Version="10.1.0" />
+    <PackageReference Include="Umbraco.Deploy.Core" Version="10.4.0" />
+    <PackageReference Include="Umbraco.Forms.Core" Version="10.5.4" />
   </ItemGroup>
 </Project>

src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj

@@ -4,6 +4,7 @@
     <Description>Contains the presentation layer for the Umbraco CMS Management API.</Description>
     <IsPackable>false</IsPackable>
     <EnablePackageValidation>false</EnablePackageValidation>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,7 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
     <PackageReference Include="NSwag.AspNetCore" Version="13.16.1" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     <ProjectReference Include="..\Umbraco.New.Cms.Core\Umbraco.New.Cms.Core.csproj" />
@@ -20,7 +21,7 @@
     <ProjectReference Include="..\Umbraco.New.Cms.Web.Common\Umbraco.New.Cms.Web.Common.csproj" />
     <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <EmbeddedResource Include="OpenApi.json" />
   </ItemGroup>

src/Umbraco.Cms.Persistence.SqlServer/Constants.cs

@@ -1,12 +1,12 @@
 namespace Umbraco.Cms.Persistence.SqlServer;
 
 /// <summary>
-///     Constants related to SQLite.
+///     Constants related to SQL Server.
 /// </summary>
 public static class Constants
 {
     /// <summary>
-    ///     SQLite provider name.
+    ///     SQL Server provider name.
     /// </summary>
     public const string ProviderName = "Microsoft.Data.SqlClient";
 }

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlAzureDatabaseProviderMetadata.cs

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using Microsoft.Data.SqlClient;
 using Umbraco.Cms.Core.Install.Models;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Extensions;
@@ -50,6 +51,25 @@ public class SqlAzureDatabaseProviderMetadata : IDatabaseProviderMetadata
     /// <inheritdoc />
     public bool ForceCreateDatabase => false;
 
+    /// <inheritdoc />
+    public bool CanRecognizeConnectionString(string? connectionString)
+    {
+        if (connectionString is null)
+        {
+            return false;
+        }
+
+        try
+        {
+            var builder = new SqlConnectionStringBuilder(connectionString);
+
+            return string.IsNullOrEmpty(builder.AttachDBFilename) && builder.DataSource.Contains("database.windows.net");
+        }
+        catch (ArgumentException)
+        {
+            return false;
+        }
+    }
     /// <inheritdoc />
     public string GenerateConnectionString(DatabaseModel databaseModel)
     {

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlLocalDbDatabaseProviderMetadata.cs

@@ -51,6 +51,27 @@ public class SqlLocalDbDatabaseProviderMetadata : IDatabaseProviderMetadata
     /// <inheritdoc />
     public bool ForceCreateDatabase => true;
 
+    /// <inheritdoc />
+    public bool CanRecognizeConnectionString(string? connectionString)
+    {
+        if (connectionString is null)
+        {
+            return false;
+        }
+
+        try
+        {
+            var builder = new SqlConnectionStringBuilder(connectionString);
+
+            return !string.IsNullOrEmpty(builder.AttachDBFilename);
+
+        }
+        catch (ArgumentException)
+        {
+            return false;
+        }
+    }
+
     /// <inheritdoc />
     public string GenerateConnectionString(DatabaseModel databaseModel)
     {

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerDatabaseProviderMetadata.cs

@@ -1,6 +1,9 @@
+using System.Data.Common;
 using System.Runtime.Serialization;
+using Microsoft.Data.SqlClient;
 using Umbraco.Cms.Core.Install.Models;
 using Umbraco.Cms.Infrastructure.Persistence;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Persistence.SqlServer.Services;
 
@@ -49,6 +52,26 @@ public class SqlServerDatabaseProviderMetadata : IDatabaseProviderMetadata
     /// <inheritdoc />
     public bool ForceCreateDatabase => false;
 
+    /// <inheritdoc />
+    public bool CanRecognizeConnectionString(string? connectionString)
+    {
+        if (connectionString is null)
+        {
+            return false;
+        }
+
+        try
+        {
+            var builder = new SqlConnectionStringBuilder(connectionString);
+
+            return string.IsNullOrEmpty(builder.AttachDBFilename);
+        }
+        catch (ArgumentException)
+        {
+            return false;
+        }
+    }
+
     /// <inheritdoc />
     public string GenerateConnectionString(DatabaseModel databaseModel) =>
         databaseModel.IntegratedAuth

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerDistributedLockingMechanism.cs

@@ -134,9 +134,10 @@ public class SqlServerDistributedLockingMechanism : IDistributedLockingMechanism
 
             const string query = "SELECT value FROM umbracoLock WITH (REPEATABLEREAD)  WHERE id=@id";
 
-            db.Execute("SET LOCK_TIMEOUT " + _timeout.TotalMilliseconds + ";");
+            var lockTimeoutQuery = $"SET LOCK_TIMEOUT {_timeout.TotalMilliseconds}";
 
-            var i = db.ExecuteScalar<int?>(query, new { id = LockId });
+            // execute the lock timeout query and the actual query in a single server roundtrip
+            var i = db.ExecuteScalar<int?>($"{lockTimeoutQuery};{query}", new { id = LockId });
 
             if (i == null)
             {
@@ -169,9 +170,10 @@ public class SqlServerDistributedLockingMechanism : IDistributedLockingMechanism
             const string query =
                 @"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id";
 
-            db.Execute("SET LOCK_TIMEOUT " + _timeout.TotalMilliseconds + ";");
+            var lockTimeoutQuery = $"SET LOCK_TIMEOUT {_timeout.TotalMilliseconds}";
 
-            var i = db.Execute(query, new { id = LockId });
+            // execute the lock timeout query and the actual query in a single server roundtrip
+            var i = db.Execute($"{lockTimeoutQuery};{query}", new { id = LockId });
 
             if (i == 0)
             {

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerSpecificMapperFactory.cs

@@ -0,0 +1,11 @@
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Infrastructure.Persistence;
+
+namespace Umbraco.Cms.Persistence.SqlServer.Services;
+
+public class SqlServerSpecificMapperFactory : IProviderSpecificMapperFactory
+{
+    public string ProviderName => Constants.ProviderName;
+
+    public NPocoMapperCollection Mappers => new(() => new[] { new UmbracoDefaultMapper() });
+}

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerSyntaxProvider.cs

@@ -272,6 +272,13 @@ where tbl.[name]=@0 and col.[name]=@1;",
         return !constraintName.IsNullOrWhiteSpace();
     }
 
+    public override bool DoesPrimaryKeyExist(IDatabase db, string tableName, string primaryKeyName)
+    {
+        IEnumerable<SqlPrimaryKey>? keys = db.Fetch<SqlPrimaryKey>($"select * from sysobjects where xtype='pk' and  parent_obj in (select id from sysobjects where name='{tableName}')")
+            .Where(x => x.Name == primaryKeyName);
+        return keys.FirstOrDefault() is not null;
+    }
+
     public override bool DoesTableExist(IDatabase db, string tableName)
     {
         var result =
@@ -453,4 +460,9 @@ _sqlInspector ??= new SqlInspectionUtilities();
     }
 
     #endregion
+
+    private class SqlPrimaryKey
+    {
+        public string Name { get; set; } = null!;
+    }
 }

src/Umbraco.Cms.Persistence.SqlServer/UmbracoBuilderExtensions.cs

@@ -22,6 +22,8 @@ public static class UmbracoBuilderExtensions
     /// </summary>
     public static IUmbracoBuilder AddUmbracoSqlServerSupport(this IUmbracoBuilder builder)
     {
+        builder.Services.TryAddEnumerable(ServiceDescriptor
+            .Singleton<IProviderSpecificMapperFactory, SqlServerSpecificMapperFactory>());
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ISqlSyntaxProvider, SqlServerSyntaxProvider>());
         builder.Services.TryAddEnumerable(ServiceDescriptor
             .Singleton<IBulkSqlInsertProvider, SqlServerBulkSqlInsertProvider>());

src/Umbraco.Cms.Persistence.Sqlite/Mappers/SqlitePocoGuidMapper.cs

@@ -1,3 +1,4 @@
+using System.Globalization;
 using NPoco;
 
 namespace Umbraco.Cms.Persistence.Sqlite.Mappers;
@@ -28,6 +29,24 @@ public class SqlitePocoGuidMapper : DefaultMapper
             };
         }
 
+        if (destType == typeof(decimal))
+        {
+            return value =>
+            {
+                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+                return result;
+            };
+        }
+
+        if (destType == typeof(decimal?))
+        {
+            return value =>
+            {
+                var result = Convert.ToDecimal(value, CultureInfo.InvariantCulture);
+                return result;
+            };
+        }
+
         return base.GetFromDbConverter(destType, sourceType);
     }
 }

src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteDatabaseCreator.cs

@@ -69,7 +69,9 @@ public class SqliteDatabaseCreator : IDatabaseCreator
          * always initializing in this way and it probably helps for non azure scenarios also (anytime persisting on a cifs mount for example).
          */
 
-        var tempFile = Path.GetTempFileName();
+        // Create a random file name using cryptographically strong random number generator (RNGCryptoServiceProvider)
+        var tempFile = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+
         var tempConnectionString = new SqliteConnectionStringBuilder { DataSource = tempFile, Pooling = false };
 
         using (var connection = new SqliteConnection(tempConnectionString.ConnectionString))

src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteDatabaseProviderMetadata.cs

@@ -56,6 +56,26 @@ public class SqliteDatabaseProviderMetadata : IDatabaseProviderMetadata
     /// </remarks>
     public bool ForceCreateDatabase => true;
 
+    /// <inheritdoc />
+    public bool CanRecognizeConnectionString(string? connectionString)
+    {
+        if (connectionString is null)
+        {
+            return false;
+        }
+
+        try
+        {
+            var builder = new SqliteConnectionStringBuilder(connectionString);
+
+            return !string.IsNullOrEmpty(builder.DataSource);
+
+        }
+        catch (ArgumentException)
+        {
+            return false;
+        }
+    }
     /// <inheritdoc />
     public string GenerateConnectionString(DatabaseModel databaseModel)
     {

src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteDistributedLockingMechanism.cs

@@ -154,7 +154,7 @@ public class SqliteDistributedLockingMechanism : IDistributedLockingMechanism
 
             try
             {
-                var i = command.ExecuteNonQuery();
+                var i = db.ExecuteNonQuery(command);
 
                 if (i == 0)
                 {

src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteSyntaxProvider.cs

@@ -174,6 +174,14 @@ public class SqliteSyntaxProvider : SqlSyntaxProviderBase<SqliteSyntaxProvider>
         return false;
     }
 
+    public override bool DoesPrimaryKeyExist(IDatabase db, string tableName, string primaryKeyName)
+    {
+        IEnumerable<string> items = db.Fetch<string>($"select sql from sqlite_master where type = 'table' and name = '{tableName}'")
+            .Where(x => x.Contains($"CONSTRAINT {primaryKeyName} PRIMARY KEY"));
+
+        return items.Any();
+    }
+
     public override string GetFieldNameForUpdate<TDto>(Expression<Func<TDto, object?>> fieldSelector, string? tableAlias = null)
     {
         var field = ExpressionHelper.FindProperty(fieldSelector).Item1 as PropertyInfo;
@@ -326,7 +334,7 @@ public class SqliteSyntaxProvider : SqlSyntaxProviderBase<SqliteSyntaxProvider>
     {
         IEnumerable<string> tables = GetTablesInSchema(db);
 
-        db.OpenSharedConnection();
+        db.BeginTransaction();
         foreach (var table in tables)
         {
             DbCommand? cmd = db.CreateCommand(db.Connection, CommandType.Text, $"PRAGMA table_info({table})");
@@ -341,6 +349,8 @@ public class SqliteSyntaxProvider : SqlSyntaxProviderBase<SqliteSyntaxProvider>
                 yield return new ColumnInfo(table, columnName, ordinal, notNull, type);
             }
         }
+
+        db.CompleteTransaction();
     }
 
     /// <inheritdoc />

src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Data.Sqlite" />
   </ItemGroup>
 
   <ItemGroup>

src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml

@@ -35,7 +35,7 @@
             <div ng-switch-when="ysod">
                 <h1>A server error occurred</h1>
                 <p>This is most likely due to an error during application startup</p>
-                <iframe id="ysod"></iframe>
+                <iframe id="ysod" title="Error details"></iframe>
             </div>
             <div ng-switch-default>
                 <div ng-include="installer.current.view"></div>

src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml

@@ -0,0 +1,69 @@
+@using Microsoft.Extensions.Options
+@using Umbraco.Cms.Core.Configuration.Models
+@using Umbraco.Cms.Core.Hosting
+@using Umbraco.Cms.Core.Routing
+@using Umbraco.Extensions
+@inject IHostingEnvironment hostingEnvironment
+@inject IOptions<GlobalSettings> globalSettings
+@{
+    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
+}
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+
+    <title>Website is Under Maintainance</title>
+
+    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~"), "/assets/css/nonodes.style.min.css")" />
+    <style type="text/css">
+        body {
+            color:initial;
+        }
+
+        section {
+            background: none;
+        }
+
+        section a, section a:focus, section a:visited {
+            color:initial;
+            border-color:currentColor;
+        }
+    </style>
+</head>
+<body>
+
+    <section>
+        <article>
+            <div>
+                <h1>Website is Under Maintenance</h1>
+
+                    <div class="cta"></div>
+
+                    <div class="row">
+                        <div class="col">
+                            <h2>This page can be replaced</h2>
+                            <p>
+                                Custom error handling might make your site look more on-brand and minimize the impact of errors on user experience - for example, a custom 404 with some helpful links (or a search function) could bring some value to the site.
+                            </p>
+
+                            <a href="https://umbra.co/custom-error-pages" target="_blank" rel="noopener">Implementing custom error pages &rarr;</a>
+                        </div>
+
+                        <div class="col">
+                            <h2>Finish the maintenance</h2>
+                            <p>If you are an administrator, you finish the maintanance by going to backoffice.</p>
+
+                            <a href="@backOfficePath">Handle the upgrade &rarr;</a>
+                        </div>
+                    </div>
+
+            </div>
+        </article>
+
+    </section>
+
+</body>
+</html>

src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoHeadlineBlock.html

@@ -1,11 +1,4 @@
 <style>
-
-    :host {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
-        box-sizing: border-box;
-    }
     
     button {
         position: relative;
@@ -33,5 +26,4 @@
 
 <button type="button" ng-click="block.edit()" ng-focus="block.focus">
     <h1 style="margin: 0 20px;">{{block.data.headline}}</h1>
-</button>
-<slot name="area-container" part="area-container"></slot>
+</button>

src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoImageBlock.html

@@ -1,12 +1,7 @@
 <style>
 
     :host {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
         min-height: 160px;
-        box-sizing: border-box;
-        //border: 1px solid #BBBABF;
     }
     
     button > * {
@@ -31,7 +26,7 @@
         overflow:hidden;
     }
     button:hover {
-        color: #2152A3;// TODO: Set right colors:
+        color: #2152A3;
     }
     img {
         object-fit: cover;
@@ -67,24 +62,26 @@
         bottom: 0;
         right: 0;
 
-        opacity: var(--umb-block-grid__block--show-ui, 0);
+        opacity: var(--umb-block-grid--block-ui-opacity, 0);
         transition: opacity 120ms;
     }
-    /*
-    :host(:focus-within) .file-name, 
-    :host(:hover) .file-name {
+
+    .is-trashed {
+        background-color: #d42054 !important;
+        color:white !important;
+    }
+    .is-trashed .file-name {
         opacity: 1;
     }
-    */
 
 </style>
-<script>
-    <!-- TODO: what can we do? -->
-</script>
 
-<button ng-controller="Umbraco.PropertyEditors.BlockEditor.MediaBlockEditor as bc" type="button" ng-click="block.edit()" ng-focus="block.focus">
-    <img ng-if="bc.isImage || bc.fileExtension === 'svg'" ng-src="{{bc.imageSource}}" alt="{{bc.mediaName}}" />
-    <umb-icon ng-if="!bc.isImage && bc.fileExtension !== 'svg'" icon="{{bc.icon}} color-black" class="icon"></umb-icon>
-    <span ng-if="bc.mediaName" class="file-name">{{bc.mediaName}}</span>
-</button>
-<slot name="area-container" part="area-container"></slot>
+<button type="button" ng-click="block.edit()" ng-focus="block.focus" ng-class="{'is-trashed': mediaItem.trashed}">
+    {{mediaItem = (block.data.image[0].mediaKey | mediaItemResolver); ""}}
+    <img ng-if="mediaItem !== null && (mediaItem.mediaLink.indexOf('jpg') !== -1 || mediaItem.mediaLink.indexOf('png') !== -1 || mediaItem.mediaLink.indexOf('webp') !== -1 || mediaItem.mediaLink.indexOf('gif') !== -1) && !mediaItem.trashed" ng-src="{{mediaItem.mediaLink}}" alt="{{mediaItem.name}}" />
+    <umb-icon ng-if="mediaItem !== null && mediaItem.mediaLink.indexOf('jpg') === -1 && mediaItem.mediaLink.indexOf('png') === -1 && mediaItem.mediaLink.indexOf('webp') === -1 && mediaItem.mediaLink.indexOf('gif') === -1 || mediaItem.trashed" icon="{{mediaItem.contentType.icon}}" class="icon"></umb-icon>
+    <span ng-if="mediaItem !== null && mediaItem.name" class="file-name">
+        <span ng-if="mediaItem.trashed"><localize key="mediaPicker_trashed">Trashed</localize>:</span>
+        {{mediaItem.name}}
+    </span>
+</button>

src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html

@@ -1,13 +1,5 @@
 <style>
 
-    :host {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
-        box-sizing: border-box;
-        //border: 1px solid #BBBABF;
-    }
-    
     .text {
         position: relative;
         display: block;
@@ -30,5 +22,4 @@
 </style>
 
 <div class="text" ng-click="block.edit()" ng-focus="block.focus" ng-bind-html="block.data.richText" style="margin: 0 20px;">
-</div>
-<slot name="area-container" part="area-container"></slot>
+</div>

src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoTwoColumnLayoutBlock.html

@@ -1,50 +1,3 @@
-<style>
-
-    :host {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
-        box-sizing: border-box;
-        //border: 1px solid #BBBABF;
-    }
-    /*
-    button {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        cursor: pointer;
-        color: black;
-        background-color: white;
-        text-align: left;
-        user-select: none;
-        border: none;
-        opacity: 0;
-        transition: border-color 120ms, background-color 120ms, opacity 120ms;
-
-        position: absolute;
-        z-index: 2;
-        min-height: 20px;
-        top:0;
-        left:0;
-        padding: 2px 6px;
-    }
-    button:hover {
-        color: #2152A3;// TODO: Set right colors:
-        background-color: #F9F9FA;
-    }
-
-    :host(:focus-within) button, 
-    :host(:hover) button {
-        opacity: 1;
-    }
-    */
-
-</style>
 <section ng-style="{'background-color': block.data.backgroundColor}">
-    <!--
-    <button type="button" ng-click="block.edit()" ng-focus="block.focus">
-        <span class="file-name">{{block.label}}</span>
-    </button>
-    -->
-    <slot name="area-container" part="area-container"></slot>
+    <umb-block-grid-render-area-slots></umb-block-grid-render-area-slots>
 </section>

src/Umbraco.Cms/Umbraco.Cms.csproj

@@ -4,6 +4,7 @@
     <Description>Installs Umbraco CMS with all default dependencies in your ASP.NET Core project.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,6 +27,6 @@
   </PropertyGroup>
   <Target Name="GenerateAppsettingsSchema" BeforeTargets="Build" Condition="!Exists('$(JsonSchemaPath)')">
     <Message Text="Generating appsettings-schema.json because it doesn't exist" Importance="high" />
-    <Exec WorkingDirectory="$(JsonSchemaProjectPath)" Command="dotnet run -c Release -o &quot;$(JsonSchemaPath)&quot;" />
+    <Exec WorkingDirectory="$(JsonSchemaProjectPath)" Command="dotnet run --configuration Release -- --outputFile &quot;$(JsonSchemaPath)&quot;" />
   </Target>
 </Project>

src/Umbraco.Core/Actions/ActionAssignDomain.cs

@@ -8,17 +8,17 @@ namespace Umbraco.Cms.Core.Actions;
 /// </summary>
 public class ActionAssignDomain : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter" />
     public const char ActionLetter = 'I';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias" />
+    public const string ActionAlias = "assigndomain";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    // This is all lower-case because of case sensitive filesystems, see issue: https://github.com/umbraco/Umbraco-CMS/issues/11670
-    public string Alias => "assigndomain";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.AdministrationCategory;

src/Umbraco.Core/Actions/ActionBrowse.cs

@@ -16,14 +16,18 @@ namespace Umbraco.Cms.Core.Actions;
 /// </remarks>
 public class ActionBrowse : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter" />
     public const char ActionLetter = 'F';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias" />
+    public const string ActionAlias = "browse";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
+
     /// <inheritdoc />
     public bool ShowInNotifier => false;
 
@@ -33,8 +37,6 @@ public class ActionBrowse : IAction
     /// <inheritdoc />
     public string Icon => string.Empty;
 
-    /// <inheritdoc />
-    public string Alias => "browse";
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;

src/Umbraco.Core/Actions/ActionCopy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
@@ -8,16 +8,17 @@ namespace Umbraco.Cms.Core.Actions;
 /// </summary>
 public class ActionCopy : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter" />
     public const char ActionLetter = 'O';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias" />
+    public const string ActionAlias = "copy";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "copy";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.StructureCategory;

src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs

@@ -8,8 +8,17 @@ namespace Umbraco.Cms.Core.Actions;
 /// </summary>
 public class ActionCreateBlueprintFromContent : IAction
 {
-    /// <inheritdoc />
-    public char Letter => 'ï';
+    /// <inheritdoc cref="IAction.ActionLetter"/>
+    public const char ActionLetter = 'ï';
+
+    /// <inheritdoc cref="IAction.ActionAlias" />
+    public const string ActionAlias = "createblueprint";
+
+    /// <inheritdoc/>
+    public char Letter => ActionLetter;
+
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public bool ShowInNotifier => false;
@@ -20,9 +29,6 @@ public class ActionCreateBlueprintFromContent : IAction
     /// <inheritdoc />
     public string Icon => Constants.Icons.Blueprint;
 
-    /// <inheritdoc />
-    public string Alias => "createblueprint";
-
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
 }

src/Umbraco.Core/Actions/ActionDelete.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
@@ -8,16 +8,12 @@ namespace Umbraco.Cms.Core.Actions;
 /// </summary>
 public class ActionDelete : IAction
 {
-    /// <summary>
-    /// The unique action alias
-    /// </summary>
-    public const string ActionAlias = "delete";
-
-    /// <summary>
-    /// The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'D';
 
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "delete";
+
     /// <inheritdoc/>
     public char Letter => ActionLetter;
 

src/Umbraco.Core/Actions/ActionMove.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked upon creation of a document, media, member
+///     This action is invoked upon creation of a document, media, member.
 /// </summary>
 public class ActionMove : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'M';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "move";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "move";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.StructureCategory;

src/Umbraco.Core/Actions/ActionNew.cs

@@ -1,27 +1,23 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked upon creation of a document
+///     This action is invoked upon creation of a document.
 /// </summary>
 public class ActionNew : IAction
 {
-    /// <summary>
-    ///     The unique action alias
-    /// </summary>
-    public const string ActionAlias = "create";
-
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'C';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "create";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     public string Alias => ActionAlias;
 
     /// <inheritdoc />

src/Umbraco.Core/Actions/ActionNotify.cs

@@ -1,15 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked upon modifying the notification of a content
+///     This action is invoked upon modifying the notification of a content.
 /// </summary>
 public class ActionNotify : IAction
 {
-    /// <inheritdoc />
-    public char Letter => 'N';
+    /// <inheritdoc cref="IAction.ActionLetter"/>
+    public const char ActionLetter = 'N';
+
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "notify";
+
+    /// <inheritdoc/>
+    public char Letter => ActionLetter;
+
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public bool ShowInNotifier => false;
@@ -20,9 +29,6 @@ public class ActionNotify : IAction
     /// <inheritdoc />
     public string Icon => "icon-megaphone";
 
-    /// <inheritdoc />
-    public string Alias => "notify";
-
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
 }

src/Umbraco.Core/Actions/ActionProtect.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when a document is protected or unprotected
+///     This action is invoked when a document is protected or unprotected.
 /// </summary>
 public class ActionProtect : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'P';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "protect";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "protect";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.AdministrationCategory;

src/Umbraco.Core/Actions/ActionPublish.cs

@@ -4,20 +4,21 @@
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when a document is being published
+///     This action is invoked when a document is being published.
 /// </summary>
 public class ActionPublish : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'U';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "publish";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "publish";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;

src/Umbraco.Core/Actions/ActionRestore.cs

@@ -1,22 +1,23 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when the content/media item is to be restored from the recycle bin
+///     This action is invoked when the content/media item is to be restored from the recycle bin.
 /// </summary>
 public class ActionRestore : IAction
 {
-    /// <summary>
-    ///     The unique action alias
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
+    public const char ActionLetter = 'V';
+
+    /// <inheritdoc cref="IAction.ActionAlias"/>
     public const string ActionAlias = "restore";
 
-    /// <inheritdoc />
-    public char Letter => 'V';
+    /// <inheritdoc/>
+    public char Letter => ActionLetter;
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     public string Alias => ActionAlias;
 
     /// <inheritdoc />

src/Umbraco.Core/Actions/ActionRights.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when rights are changed on a document
+///     This action is invoked when rights are changed on a document.
 /// </summary>
 public class ActionRights : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'R';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "rights";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "rights";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;

src/Umbraco.Core/Actions/ActionRollback.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when copying a document is being rolled back
+///     This action is invoked when copying a document is being rolled back.
 /// </summary>
 public class ActionRollback : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'K';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "rollback";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "rollback";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.AdministrationCategory;

src/Umbraco.Core/Actions/ActionSort.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when children to a document, media, member is being sorted
+///     This action is invoked when children to a document, media, member is being sorted.
 /// </summary>
 public class ActionSort : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'S';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "sort";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "sort";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.StructureCategory;

src/Umbraco.Core/Actions/ActionToPublish.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when children to a document is being sent to published (by an editor without publishrights)
+///     This action is invoked when children to a document is being sent to published (by an editor without publishrights).
 /// </summary>
 public class ActionToPublish : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'H';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "sendtopublish";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "sendtopublish";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;

src/Umbraco.Core/Actions/ActionUnpublish.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when a document is being unpublished
+///     This action is invoked when a document is being unpublished.
 /// </summary>
 public class ActionUnpublish : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'Z';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "unpublish";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "unpublish";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;

src/Umbraco.Core/Actions/ActionUpdate.cs

@@ -1,23 +1,24 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 namespace Umbraco.Cms.Core.Actions;
 
 /// <summary>
-///     This action is invoked when copying a document or media
+///     This action is invoked when copying a document or media.
 /// </summary>
 public class ActionUpdate : IAction
 {
-    /// <summary>
-    ///     The unique action letter
-    /// </summary>
+    /// <inheritdoc cref="IAction.ActionLetter"/>
     public const char ActionLetter = 'A';
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IAction.ActionAlias"/>
+    public const string ActionAlias = "update";
+
+    /// <inheritdoc/>
     public char Letter => ActionLetter;
 
-    /// <inheritdoc />
-    public string Alias => "update";
+    /// <inheritdoc/>
+    public string Alias => ActionAlias;
 
     /// <inheritdoc />
     public string Category => Constants.Conventions.PermissionCategories.ContentCategory;

src/Umbraco.Core/Actions/IAction.cs

@@ -13,8 +13,14 @@ namespace Umbraco.Cms.Core.Actions;
 /// </remarks>
 public interface IAction : IDiscoverable
 {
+    /// <inheritdoc cref="Letter"/>
+    const char ActionLetter = default;
+
+    /// <inheritdoc cref="Alias"/>
+    const string ActionAlias = default;
+
     /// <summary>
-    ///     Gets the letter used to assign a permission (must be unique)
+    ///     Gets the letter used to assign a permission (must be unique).
     /// </summary>
     char Letter { get; }
 
@@ -34,7 +40,8 @@ public interface IAction : IDiscoverable
     string Icon { get; }
 
     /// <summary>
-    ///     Gets the alias for this action (must be unique)
+    ///     Gets the alias for this action (must be unique).
+    ///     This is all lower-case because of case sensitive filesystems, see issue: https://github.com/umbraco/Umbraco-CMS/issues/11670.
     /// </summary>
     string Alias { get; }
 

src/Umbraco.Core/Cache/ContentCacheRefresher.cs

@@ -84,8 +84,8 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
                 isolatedCache.ClearOfType<IContent>((k, v) => v.Path?.Contains(pathid) ?? false);
             }
 
-            // if the item is being completely removed, we need to refresh the domains cache if any domain was assigned to the content
-            if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.Remove))
+            // if the item is not a blueprint and is being completely removed, we need to refresh the domains cache if any domain was assigned to the content
+            if (payload.Blueprint is false && payload.ChangeTypes.HasTypesAny(TreeChangeTypes.Remove))
             {
                 idsRemoved.Add(payload.Id);
             }
@@ -120,7 +120,11 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
         // should rename it, and then, this is only for Deploy, and then, ???
         // if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache)
         //   ...
-        NotifyPublishedSnapshotService(_publishedSnapshotService, AppCaches, payloads);
+        if (payloads.Any(x => x.Blueprint is false))
+        {
+            // Only notify if the payload contains actual (non-blueprint) contents
+            NotifyPublishedSnapshotService(_publishedSnapshotService, AppCaches, payloads);
+        }
 
         base.Refresh(payloads);
     }
@@ -157,8 +161,13 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
         }
     }
 
+    // TODO (V14): Change into a record
     public class JsonPayload
     {
+        public JsonPayload()
+        { }
+
+        [Obsolete("Use the default constructor and property initializers.")]
         public JsonPayload(int id, Guid? key, TreeChangeTypes changeTypes)
         {
             Id = id;
@@ -166,11 +175,13 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
             ChangeTypes = changeTypes;
         }
 
-        public int Id { get; }
+        public int Id { get; init; }
 
-        public Guid? Key { get; }
+        public Guid? Key { get; init; }
 
-        public TreeChangeTypes ChangeTypes { get; }
+        public TreeChangeTypes ChangeTypes { get; init; }
+
+        public bool Blueprint { get; init; }
     }
 
     #endregion

src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs

@@ -88,10 +88,6 @@ public sealed class DataTypeCacheRefresher : PayloadCacheRefresherBase<DataTypeC
             }
         }
 
-        // TODO: not sure I like these?
-        TagsValueConverter.ClearCaches();
-        SliderValueConverter.ClearCaches();
-
         // refresh the models and cache
         _publishedModelFactory.WithSafeLiveFactoryReset(() =>
             _publishedSnapshotService.Notify(payloads));

src/Umbraco.Core/Cache/LanguageCacheRefresher.cs

@@ -134,8 +134,14 @@ public sealed class LanguageCacheRefresher : PayloadCacheRefresherBase<LanguageC
             ContentCacheRefresher.RefreshContentTypes(AppCaches); // we need to evict all IContent items
 
             // now refresh all nucache
-            ContentCacheRefresher.JsonPayload[] clearContentPayload =
-                new[] { new ContentCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) };
+            ContentCacheRefresher.JsonPayload[] clearContentPayload = new[]
+            {
+                new ContentCacheRefresher.JsonPayload()
+                {
+                    ChangeTypes = TreeChangeTypes.RefreshAll
+                }
+            };
+
             ContentCacheRefresher.NotifyPublishedSnapshotService(_publishedSnapshotService, AppCaches, clearContentPayload);
         }
 

src/Umbraco.Core/Cache/ObjectCacheAppCache.cs

@@ -9,6 +9,9 @@ namespace Umbraco.Cms.Core.Cache;
 /// </summary>
 public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
 {
+    private static readonly TimeSpan _readLockTimeout = TimeSpan.FromSeconds(5);
+    private static readonly TimeSpan _writeLockTimeout = TimeSpan.FromSeconds(5);
+
     private readonly ReaderWriterLockSlim _locker = new(LockRecursionPolicy.SupportsRecursion);
     private bool _disposedValue;
 
@@ -33,7 +36,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
         Lazy<object?>? result;
         try
         {
-            _locker.EnterReadLock();
+            if (_locker.TryEnterReadLock(_readLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cache when getting item");
+            }
             result = MemoryCache.Get(key) as Lazy<object?>; // null if key not found
         }
         finally
@@ -195,7 +201,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
     {
         try
         {
-            _locker.EnterWriteLock();
+            if (_locker.TryEnterWriteLock(_writeLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cache when clearing item");
+            }
             if (MemoryCache[key] == null)
             {
                 return;
@@ -223,8 +232,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
         var isInterface = type.IsInterface;
         try
         {
-            _locker.EnterWriteLock();
-
+            if (_locker.TryEnterWriteLock(_writeLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cache when clearing by type");
+            }
             // ToArray required to remove
             foreach (var key in MemoryCache
                          .Where(x =>
@@ -259,7 +270,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
     {
         try
         {
-            _locker.EnterWriteLock();
+            if (_locker.TryEnterWriteLock(_writeLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cache when clearing by generic type");
+            }
             Type typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
 
@@ -296,7 +310,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
     {
         try
         {
-            _locker.EnterWriteLock();
+            if (_locker.TryEnterWriteLock(_writeLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cache when clearing generic type with predicate");
+            }
             Type typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
 
@@ -338,7 +355,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
     {
         try
         {
-            _locker.EnterWriteLock();
+            if (_locker.TryEnterWriteLock(_writeLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cache when clearing with prefix");
+            }
 
             // ToArray required to remove
             foreach (var key in MemoryCache
@@ -365,7 +385,10 @@ public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
 
         try
         {
-            _locker.EnterWriteLock();
+            if (_locker.TryEnterWriteLock(_writeLockTimeout) is false)
+            {
+                throw new TimeoutException("Timeout exceeded to the memory cach when clearing by regex");
+            }
 
             // ToArray required to remove
             foreach (var key in MemoryCache

src/Umbraco.Core/Composing/BuilderCollectionBase.cs

@@ -3,30 +3,26 @@ using System.Collections;
 namespace Umbraco.Cms.Core.Composing;
 
 /// <summary>
-///     Provides a base class for builder collections.
+/// Provides a base class for builder collections.
 /// </summary>
 /// <typeparam name="TItem">The type of the items.</typeparam>
 public abstract class BuilderCollectionBase<TItem> : IBuilderCollection<TItem>
 {
     private readonly LazyReadOnlyCollection<TItem> _items;
 
-    /// Initializes a new instance of the
-    /// <see cref="BuilderCollectionBase{TItem}" />
-    /// with items.
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BuilderCollectionBase{TItem}" /> with items.
     /// </summary>
     /// <param name="items">The items.</param>
-    public BuilderCollectionBase(Func<IEnumerable<TItem>> items) => _items = new LazyReadOnlyCollection<TItem>(items);
+    public BuilderCollectionBase(Func<IEnumerable<TItem>> items)
+        => _items = new LazyReadOnlyCollection<TItem>(items);
 
     /// <inheritdoc />
     public int Count => _items.Count;
 
-    /// <summary>
-    ///     Gets an enumerator.
-    /// </summary>
+    /// <inheritdoc />
     public IEnumerator<TItem> GetEnumerator() => _items.GetEnumerator();
 
-    /// <summary>
-    ///     Gets an enumerator.
-    /// </summary>
+    /// <inheritdoc />
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 }

src/Umbraco.Core/Composing/IBuilderCollection.cs

@@ -1,13 +1,16 @@
 namespace Umbraco.Cms.Core.Composing;
 
 /// <summary>
-///     Represents a builder collection, ie an immutable enumeration of items.
+/// Represents a builder collection, ie an immutable enumeration of items.
 /// </summary>
 /// <typeparam name="TItem">The type of the items.</typeparam>
 public interface IBuilderCollection<out TItem> : IEnumerable<TItem>
 {
     /// <summary>
-    ///     Gets the number of items in the collection.
+    /// Gets the number of items in the collection.
     /// </summary>
+    /// <value>
+    /// The count.
+    /// </value>
     int Count { get; }
 }

src/Umbraco.Core/Composing/TypeFinder.cs

@@ -21,7 +21,7 @@ public class TypeFinder : ITypeFinder
     ///     its an exact name match
     ///     NOTE this means that "foo." will NOT exclude "foo.dll" but only "foo.*.dll"
     /// </remarks>
-    internal static readonly string[] KnownAssemblyExclusionFilter =
+    internal static string[] KnownAssemblyExclusionFilter =
     {
         "mscorlib,", "netstandard,", "System,", "Antlr3.", "AutoMapper,", "AutoMapper.", "Autofac,", // DI
         "Autofac.", "AzureDirectory,", "Castle.", // DI, tests
@@ -49,11 +49,20 @@ public class TypeFinder : ITypeFinder
     private string[]? _assembliesAcceptingLoadExceptions;
     private volatile HashSet<Assembly>? _localFilteredAssemblyCache;
 
+    [Obsolete("Please use the constructor taking all parameters. This constructor will be removed in V14.")]
     public TypeFinder(ILogger<TypeFinder> logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig? typeFinderConfig = null)
+        : this(logger, assemblyProvider, null, typeFinderConfig)
+    { }
+
+    public TypeFinder(ILogger<TypeFinder> logger, IAssemblyProvider assemblyProvider, string[]? additionalExlusionAssemblies, ITypeFinderConfig? typeFinderConfig = null)
     {
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _assemblyProvider = assemblyProvider;
         _typeFinderConfig = typeFinderConfig;
+        if (additionalExlusionAssemblies is not null)
+        {
+            KnownAssemblyExclusionFilter = KnownAssemblyExclusionFilter.Union(additionalExlusionAssemblies).ToArray();
+        }
     }
 
     /// <inheritdoc />

src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs

@@ -10,9 +10,9 @@ public static class ContentSettingsExtensions
     ///     Allow upload if extension is whitelisted OR if there is no whitelist and extension is NOT blacklisted.
     /// </summary>
     public static bool IsFileAllowedForUpload(this ContentSettings contentSettings, string extension) =>
-        contentSettings.AllowedUploadFiles.Any(x => x.InvariantEquals(extension)) ||
-        (contentSettings.AllowedUploadFiles.Any() == false &&
-         contentSettings.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension)) == false);
+        contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) ||
+        (contentSettings.AllowedUploadedFileExtensions.Any() == false &&
+         contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) == false);
 
     /// <summary>
     ///     Gets the auto-fill configuration for a specified property alias.

src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs

@@ -7,7 +7,8 @@ namespace Umbraco.Cms.Core.Configuration.Models;
 ///     Typed configuration options for active directory settings.
 /// </summary>
 [UmbracoOptions(Constants.Configuration.ConfigActiveDirectory)]
-[Obsolete("This is not used anymore. Will be removed in Umbraco 12")]public class ActiveDirectorySettings
+[Obsolete("This is not used anymore. Will be removed in Umbraco 12")]
+public class ActiveDirectorySettings
 {
     /// <summary>
     ///     Gets or sets a value for the Active Directory domain.

src/Umbraco.Core/Configuration/Models/ContentSettings.cs

@@ -196,11 +196,13 @@ public class ContentSettings
     ///     Gets or sets a value for the collection of file extensions that are disallowed for upload.
     /// </summary>
     [DefaultValue(StaticDisallowedUploadFiles)]
+    [Obsolete("Please use DisAllowedUploadedFileExtensions instead, scheduled for removal in V13")]
     public IEnumerable<string> DisallowedUploadFiles { get; set; } = StaticDisallowedUploadFiles.Split(',');
 
     /// <summary>
     ///     Gets or sets a value for the collection of file extensions that are allowed for upload.
     /// </summary>
+    [Obsolete("Please use AllowedUploadedFileExtensions instead, scheduled for removal in V13")]
     public IEnumerable<string> AllowedUploadFiles { get; set; } = Array.Empty<string>();
 
     /// <summary>
@@ -249,4 +251,20 @@ public class ContentSettings
     /// </summary>
     [DefaultValue(StaticAllowEditInvariantFromNonDefault)]
     public bool AllowEditInvariantFromNonDefault { get; set; } = StaticAllowEditInvariantFromNonDefault;
+
+    /// <summary>
+    ///     Gets or sets a value for the collection of file extensions that are allowed for upload.
+    /// </summary>
+    public string[] AllowedUploadedFileExtensions { get; set; } = Array.Empty<string>();
+
+    /// <summary>
+    ///     Gets or sets a value for the collection of file extensions that are disallowed for upload.
+    /// </summary>
+    [DefaultValue(StaticDisallowedUploadFiles)]
+    public string[] DisallowedUploadedFileExtensions { get; set; } = StaticDisallowedUploadFiles.Split(',');
+
+    /// <summary>
+    /// Gets or sets the allowed external host for media. If empty only relative paths are allowed.
+    /// </summary>
+    public string[] AllowedMediaHosts { get; set; } = Array.Empty<string>();
 }

src/Umbraco.Core/Configuration/Models/GlobalSettings.cs

@@ -33,6 +33,7 @@ public class GlobalSettings
     internal const bool StaticSanitizeTinyMce = false;
     internal const int StaticMainDomReleaseSignalPollingInterval = 2000;
     private const bool StaticForceCombineUrlPathLeftToRight = true;
+    private const bool StaticShowMaintenancePageWhenInUpgradeState = true;
 
     /// <summary>
     ///     Gets or sets a value for the reserved URLs (must end with a comma).
@@ -252,4 +253,7 @@ public class GlobalSettings
     /// </example>
     [DefaultValue(StaticForceCombineUrlPathLeftToRight)]
     public bool ForceCombineUrlPathLeftToRight { get; set; }  = StaticForceCombineUrlPathLeftToRight;
+
+    [DefaultValue(StaticShowMaintenancePageWhenInUpgradeState)]
+    public bool ShowMaintenancePageWhenInUpgradeState { get; set; } = StaticShowMaintenancePageWhenInUpgradeState;
 }

src/Umbraco.Core/Configuration/Models/HealthChecksNotificationSettings.cs

@@ -39,6 +39,6 @@ public class HealthChecksNotificationSettings
     /// <summary>
     ///     Gets or sets a value for the collection of health checks that are disabled for notifications.
     /// </summary>
-    public IEnumerable<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
-        Enumerable.Empty<DisabledHealthCheckSettings>();
+    public List<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
+        new List<DisabledHealthCheckSettings>();
 }

src/Umbraco.Core/Configuration/Models/HealthChecksSettings.cs

@@ -12,8 +12,8 @@ public class HealthChecksSettings
     /// <summary>
     ///     Gets or sets a value for the collection of healthchecks that are disabled.
     /// </summary>
-    public IEnumerable<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
-        Enumerable.Empty<DisabledHealthCheckSettings>();
+    public List<DisabledHealthCheckSettings> DisabledChecks { get; set; } =
+        new List<DisabledHealthCheckSettings>();
 
     /// <summary>
     ///     Gets or sets a value for the healthcheck notification settings.

src/Umbraco.Core/Configuration/Models/IndexingSettings.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel;
+
+namespace Umbraco.Cms.Core.Configuration.Models;
+
+/// <summary>
+///     Typed configuration options for index creator settings.
+/// </summary>
+[UmbracoOptions(Constants.Configuration.ConfigIndexing)]
+public class IndexingSettings
+{
+    private const bool StaticExplicitlyIndexEachNestedProperty = true;
+
+    /// <summary>
+    /// Gets or sets a value for whether each nested property should have it's own indexed value. Requires a rebuild of indexes when changed.
+    /// </summary>
+    [DefaultValue(StaticExplicitlyIndexEachNestedProperty)]
+    public bool ExplicitlyIndexEachNestedProperty { get; set; } = StaticExplicitlyIndexEachNestedProperty;
+}

src/Umbraco.Core/Configuration/Models/MarketplaceSettings.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+namespace Umbraco.Cms.Core.Configuration.Models;
+
+/// <summary>
+/// Configuration options for the Marketplace.
+/// </summary>
+[UmbracoOptions(Constants.Configuration.ConfigMarketplace)]
+public class MarketplaceSettings
+{
+    /// <summary>
+    /// Gets or sets the additional parameters that are sent to the Marketplace.
+    /// </summary>
+    public Dictionary<string, string> AdditionalParameters { get; set; } = new ();
+}

src/Umbraco.Core/Configuration/Models/NuCacheSettings.cs

@@ -14,6 +14,7 @@ public class NuCacheSettings
     internal const string StaticNuCacheSerializerType = "MessagePack";
     internal const int StaticSqlPageSize = 1000;
     internal const int StaticKitBatchSize = 1;
+    internal const bool StaticUsePagedSqlQuery = true;
 
     /// <summary>
     ///     Gets or sets a value defining the BTree block size.
@@ -40,4 +41,7 @@ public class NuCacheSettings
     public int KitBatchSize { get; set; } = StaticKitBatchSize;
 
     public bool UnPublishedContentCompression { get; set; } = false;
+
+    [DefaultValue(StaticUsePagedSqlQuery)]
+    public bool UsePagedSqlQuery { get; set; } = true;
 }

src/Umbraco.Core/Configuration/Models/RichTextEditorSettings.cs

@@ -116,18 +116,18 @@ public class RichTextEditorSettings
         new Dictionary<string, string> { ["entity_encoding"] = "raw" };
 
     /// <summary>
-    ///     HTML RichText Editor TinyMCE Commands
+    ///     HTML RichText Editor TinyMCE Commands.
     /// </summary>
     /// WB-TODO Custom Array of objects
     public RichTextEditorCommand[] Commands { get; set; } = Default_commands;
 
     /// <summary>
-    ///     HTML RichText Editor TinyMCE Plugins
+    ///     HTML RichText Editor TinyMCE Plugins.
     /// </summary>
     public string[] Plugins { get; set; } = Default_plugins;
 
     /// <summary>
-    ///     HTML RichText Editor TinyMCE Custom Config
+    ///     HTML RichText Editor TinyMCE Custom Config.
     /// </summary>
     /// WB-TODO Custom Dictionary
     public IDictionary<string, string> CustomConfig { get; set; } = Default_custom_config;
@@ -138,7 +138,7 @@ public class RichTextEditorSettings
     public string ValidElements { get; set; } = StaticValidElements;
 
     /// <summary>
-    ///     Invalid HTML elements for RichText Editor
+    ///     Invalid HTML elements for RichText Editor.
     /// </summary>
     [DefaultValue(StaticInvalidElements)]
     public string InvalidElements { get; set; } = StaticInvalidElements;

src/Umbraco.Core/Configuration/Models/SecuritySettings.cs

@@ -2,6 +2,7 @@
 // See LICENSE for more details.
 
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace Umbraco.Cms.Core.Configuration.Models;
 
@@ -22,6 +23,11 @@ public class SecuritySettings
     internal const string StaticAllowedUserNameCharacters =
         "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+\\";
 
+    internal const int StaticMemberDefaultLockoutTimeInMinutes = 30 * 24 * 60;
+    internal const int StaticUserDefaultLockoutTimeInMinutes = 30 * 24 * 60;
+    private const long StaticUserDefaultFailedLoginDurationInMilliseconds = 1000;
+    private const long StaticUserMinimumFailedLoginDurationInMilliseconds = 250;
+
     /// <summary>
     ///     Gets or sets a value indicating whether to keep the user logged in.
     /// </summary>
@@ -65,12 +71,14 @@ public class SecuritySettings
     /// <summary>
     ///     Gets or sets a value for the user password settings.
     /// </summary>
-    public UserPasswordConfigurationSettings? UserPassword { get; set; }
+    [Obsolete("This no longer works. You can now inject this by using IOptions<UserPasswordConfigurationSettings> instead, scheduled for removal in v13")]
+    public UserPasswordConfigurationSettings? UserPassword { get; set; } = new();
 
     /// <summary>
     ///     Gets or sets a value for the member password settings.
     /// </summary>
-    public MemberPasswordConfigurationSettings? MemberPassword { get; set; }
+    [Obsolete("This no longer works. You can now inject this by using IOptions<MemberPasswordConfigurationSettings> instead, scheduled for removal in v13")]
+    public MemberPasswordConfigurationSettings? MemberPassword { get; set; } = new();
 
     /// <summary>
     ///     Gets or sets a value indicating whether to bypass the two factor requirement in Umbraco when using external login
@@ -86,10 +94,44 @@ public class SecuritySettings
     [DefaultValue(StaticUserBypassTwoFactorForExternalLogins)]
     public bool UserBypassTwoFactorForExternalLogins { get; set; } = StaticUserBypassTwoFactorForExternalLogins;
 
+    /// <summary>
+    ///     Gets or sets a value for how long (in minutes) a member is locked out when a lockout occurs.
+    /// </summary>
+    [DefaultValue(StaticMemberDefaultLockoutTimeInMinutes)]
+    public int MemberDefaultLockoutTimeInMinutes { get; set; } = StaticMemberDefaultLockoutTimeInMinutes;
+
+    /// <summary>
+    ///     Gets or sets a value for how long (in minutes) a user is locked out when a lockout occurs.
+    /// </summary>
+    [DefaultValue(StaticUserDefaultLockoutTimeInMinutes)]
+    public int UserDefaultLockoutTimeInMinutes { get; set; } = StaticUserDefaultLockoutTimeInMinutes;
+
     /// <summary>
     /// Gets or sets a value indicating whether to allow editing invariant properties from a non-default language variation.
     /// </summary>
     [Obsolete("Use ContentSettings.AllowEditFromInvariant instead")]
     [DefaultValue(StaticAllowEditInvariantFromNonDefault)]
     public bool AllowEditInvariantFromNonDefault { get; set; } = StaticAllowEditInvariantFromNonDefault;
+
+    /// <summary>
+    /// Gets or sets the default duration (in milliseconds) of failed login attempts.
+    /// </summary>
+    /// <value>
+    /// The default duration (in milliseconds) of failed login attempts.
+    /// </value>
+    /// <remarks>
+    /// The user login endpoint ensures that failed login attempts take at least as long as the average successful login.
+    /// However, if no successful logins have occurred, this value is used as the default duration.
+    /// </remarks>
+    [DefaultValue(StaticUserDefaultFailedLoginDurationInMilliseconds)]
+    public long UserDefaultFailedLoginDurationInMilliseconds { get; set; } = StaticUserDefaultFailedLoginDurationInMilliseconds;
+
+    /// <summary>
+    /// Gets or sets the minimum duration (in milliseconds) of failed login attempts.
+    /// </summary>
+    /// <value>
+    /// The minimum duration (in milliseconds) of failed login attempts.
+    /// </value>
+    [DefaultValue(StaticUserMinimumFailedLoginDurationInMilliseconds)]
+    public long UserMinimumFailedLoginDurationInMilliseconds { get; set; } = StaticUserMinimumFailedLoginDurationInMilliseconds;
 }

src/Umbraco.Core/Configuration/Models/TypeFinderSettings.cs

@@ -22,4 +22,9 @@ public class TypeFinderSettings
     ///     scanning for plugins based on different root referenced assemblies you can add the assembly name to this list.
     /// </summary>
     public IEnumerable<string>? AdditionalEntryAssemblies { get; set; }
+
+    /// <summary>
+    ///     Gets or sets a value for the assemblies that will be excluded from scanning.
+    /// </summary>
+    public string[] AdditionalAssemblyExclusionEntries { get; set; } = Array.Empty<string>();
 }

src/Umbraco.Core/Configuration/Models/UmbracoPluginSettings.cs

@@ -19,7 +19,7 @@ public class UmbracoPluginSettings
         ".css", // styles
         ".js", // scripts
         ".jpg", ".jpeg", ".gif", ".png", ".svg", // images
-        ".eot", ".ttf", ".woff", // fonts
+        ".eot", ".ttf", ".woff", ".woff2", // fonts
         ".xml", ".json", ".config", // configurations
         ".lic", // license
         ".map", // js map files

src/Umbraco.Core/Constants-Configuration.cs

@@ -27,6 +27,7 @@ public static partial class Constants
         public const string ConfigHostingDebug = ConfigHostingPrefix + "Debug";
         public const string ConfigCustomErrorsMode = ConfigCustomErrorsPrefix + "Mode";
         public const string ConfigActiveDirectory = ConfigPrefix + "ActiveDirectory";
+        public const string ConfigMarketplace = ConfigPrefix + "Marketplace";
         public const string ConfigLegacyPasswordMigration = ConfigPrefix + "LegacyPasswordMigration";
         public const string ConfigContent = ConfigPrefix + "Content";
         public const string ConfigCoreDebug = ConfigCorePrefix + "Debug";
@@ -37,6 +38,7 @@ public static partial class Constants
         public const string ConfigHosting = ConfigPrefix + "Hosting";
         public const string ConfigImaging = ConfigPrefix + "Imaging";
         public const string ConfigExamine = ConfigPrefix + "Examine";
+        public const string ConfigIndexing = ConfigPrefix + "Indexing";
         public const string ConfigKeepAlive = ConfigPrefix + "KeepAlive";
         public const string ConfigLogging = ConfigPrefix + "Logging";
         public const string ConfigMemberPassword = ConfigPrefix + "Security:MemberPassword";

src/Umbraco.Core/Constants-Conventions.cs

@@ -338,7 +338,7 @@ public static partial class Constants
             public const string RelateParentMediaFolderOnDeleteAlias = "relateParentMediaFolderOnDelete";
 
             /// <summary>
-            ///     Returns the types of relations that are automatically tracked
+            ///     Returns the types of relations that are automatically tracked.
             /// </summary>
             /// <remarks>
             ///     Developers should not manually use these relation types since they will all be cleared whenever an entity
@@ -346,7 +346,12 @@ public static partial class Constants
             /// </remarks>
             public static string[] AutomaticRelationTypes { get; } = { RelatedMediaAlias, RelatedDocumentAlias };
 
-            // TODO: return a list of built in types so we can use that to prevent deletion in the uI
+            // TODO: return a list of built in types so we can use that to prevent deletion in the UI
+        }
+
+        public static class Udi
+        {
+            public const string Prefix = "umb://";
         }
     }
 }

src/Umbraco.Core/Constants-Marketplace.cs

@@ -0,0 +1,12 @@
+namespace Umbraco.Cms.Core;
+
+public static partial class Constants
+{
+    /// <summary>
+    /// Defines the constants used for the Umbraco Marketplace.
+    /// </summary>
+    public static class Marketplace
+    {
+        public const string Url = "https://marketplace.umbraco.com";
+    }
+}

src/Umbraco.Core/Constants-PackageRepository.cs

@@ -5,6 +5,7 @@ public static partial class Constants
     /// <summary>
     ///     Defines the constants used for the Umbraco package repository
     /// </summary>
+    [Obsolete("This is no longer used and will be removed in Umbraco 13")]
     public static class PackageRepository
     {
         public const string RestApiBaseUrl = "https://our.umbraco.com/webapi/packages/v1";

src/Umbraco.Core/Constants-PropertyEditors.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Core;
@@ -44,7 +43,6 @@ public static partial class Constants
             /// <summary>
             /// Block Grid.
             /// </summary>
-            [EditorBrowsable(EditorBrowsableState.Never)] // TODO: Remove this for V11/V10.4
             public const string BlockGrid = "Umbraco.BlockGrid";
 
                 /// <summary>

src/Umbraco.Core/Constants-SqlTemplates.cs

@@ -10,6 +10,7 @@ public static partial class Constants
             public const string GetVersion = "Umbraco.Core.VersionableRepository.GetVersion";
             public const string GetVersions = "Umbraco.Core.VersionableRepository.GetVersions";
             public const string EnsureUniqueNodeName = "Umbraco.Core.VersionableRepository.EnsureUniqueNodeName";
+            public const string SortOrderExists = "Umbraco.Core.VersionableRepository.SortOrderExists";
             public const string GetSortOrder = "Umbraco.Core.VersionableRepository.GetSortOrder";
             public const string GetParentNode = "Umbraco.Core.VersionableRepository.GetParentNode";
             public const string GetReservedId = "Umbraco.Core.VersionableRepository.GetReservedId";

src/Umbraco.Core/Constants-Telemetry.cs

@@ -28,5 +28,6 @@ public static partial class Constants
         public static string IsDebug = "IsDebug";
         public static string DatabaseProvider = "DatabaseProvider";
         public static string CurrentServerRole = "CurrentServerRole";
+        public static string BackofficeExternalLoginProviderCount = "BackofficeExternalLoginProviderCount";
     }
 }

src/Umbraco.Core/Dashboards/AnalyticsDashboard.cs

@@ -4,7 +4,7 @@ public class AnalyticsDashboard : IDashboard
 {
     public string Alias => "settingsAnalytics";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] { Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/analytics.html";
 

src/Umbraco.Core/Dashboards/ContentDashboard.cs

@@ -7,7 +7,7 @@ public class ContentDashboard : IDashboard
 {
     public string Alias => "contentIntro";
 
-    public string[] Sections => new[] { "content" };
+    public string[] Sections => new[] { Constants.Applications.Content };
 
     public string View => "views/dashboard/default/startupdashboardintro.html";
 

src/Umbraco.Core/Dashboards/ExamineDashboard.cs

@@ -7,7 +7,7 @@ public class ExamineDashboard : IDashboard
 {
     public string Alias => "settingsExamine";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] { Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/examinemanagement.html";
 

src/Umbraco.Core/Dashboards/HealthCheckDashboard.cs

@@ -7,7 +7,7 @@ public class HealthCheckDashboard : IDashboard
 {
     public string Alias => "settingsHealthCheck";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] { Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/healthcheck.html";
 

src/Umbraco.Core/Dashboards/MediaDashboard.cs

@@ -7,7 +7,7 @@ public class MediaDashboard : IDashboard
 {
     public string Alias => "mediaFolderBrowser";
 
-    public string[] Sections => new[] { "media" };
+    public string[] Sections => new[] { Constants.Applications.Media };
 
     public string View => "views/dashboard/media/mediafolderbrowser.html";
 

src/Umbraco.Core/Dashboards/MembersDashboard.cs

@@ -7,7 +7,7 @@ public class MembersDashboard : IDashboard
 {
     public string Alias => "memberIntro";
 
-    public string[] Sections => new[] { "member" };
+    public string[] Sections => new[] { Constants.Applications.Members };
 
     public string View => "views/dashboard/members/membersdashboardvideos.html";
 

src/Umbraco.Core/Dashboards/ModelsBuilderDashboard.cs

@@ -7,7 +7,7 @@ public class ModelsBuilderDashboard : IDashboard
 {
     public string Alias => "settingsModelsBuilder";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] {Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/modelsbuildermanagement.html";
 

src/Umbraco.Core/Dashboards/ProfilerDashboard.cs

@@ -7,7 +7,7 @@ public class ProfilerDashboard : IDashboard
 {
     public string Alias => "settingsProfiler";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] { Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/profiler.html";
 

src/Umbraco.Core/Dashboards/PublishedStatusDashboard.cs

@@ -7,7 +7,7 @@ public class PublishedStatusDashboard : IDashboard
 {
     public string Alias => "settingsPublishedStatus";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] { Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/publishedstatus.html";
 

src/Umbraco.Core/Dashboards/RedirectUrlDashboard.cs

@@ -7,7 +7,7 @@ public class RedirectUrlDashboard : IDashboard
 {
     public string Alias => "contentRedirectManager";
 
-    public string[] Sections => new[] { "content" };
+    public string[] Sections => new[] { Constants.Applications.Content };
 
     public string View => "views/dashboard/content/redirecturls.html";
 

src/Umbraco.Core/Dashboards/SettingsDashboards.cs

@@ -7,7 +7,7 @@ public class SettingsDashboard : IDashboard
 {
     public string Alias => "settingsWelcome";
 
-    public string[] Sections => new[] { "settings" };
+    public string[] Sections => new[] { Constants.Applications.Settings };
 
     public string View => "views/dashboard/settings/settingsdashboardintro.html";
 

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs

@@ -1,5 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Dashboards;
+using Umbraco.Cms.Core.Manifest;
 using Umbraco.Cms.Core.Media;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Routing;
@@ -60,6 +61,18 @@ public static partial class UmbracoBuilderExtensions
         return builder;
     }
 
+    /// <summary>
+    /// Register a manifest filter
+    /// </summary>
+    /// <typeparam name="T">The type of the manifest filter.</typeparam>
+    /// <param name="builder">The Builder.</param>
+    public static IUmbracoBuilder AddManifestFilter<T>(this IUmbracoBuilder builder)
+        where T : class, IManifestFilter
+    {
+        builder.ManifestFilters().Append<T>();
+        return builder;
+    }
+
     /// <summary>
     ///     Register a media url provider.
     /// </summary>

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs

@@ -50,6 +50,8 @@ public static partial class UmbracoBuilderExtensions
         builder
             .AddUmbracoOptions<ModelsBuilderSettings>()
             .AddUmbracoOptions<ActiveDirectorySettings>()
+            .AddUmbracoOptions<IndexCreatorSettings>()
+            .AddUmbracoOptions<MarketplaceSettings>()
             .AddUmbracoOptions<ContentSettings>()
             .AddUmbracoOptions<CoreDebugSettings>()
             .AddUmbracoOptions<ExceptionFilterSettings>()
@@ -63,7 +65,7 @@ public static partial class UmbracoBuilderExtensions
             .AddUmbracoOptions<HealthChecksSettings>()
             .AddUmbracoOptions<HostingSettings>()
             .AddUmbracoOptions<ImagingSettings>()
-            .AddUmbracoOptions<IndexCreatorSettings>()
+            .AddUmbracoOptions<IndexingSettings>()
             .AddUmbracoOptions<KeepAliveSettings>()
             .AddUmbracoOptions<LoggingSettings>()
             .AddUmbracoOptions<MemberPasswordConfigurationSettings>()
@@ -119,6 +121,32 @@ public static partial class UmbracoBuilderExtensions
             }
         });
 
+        // TODO: Remove this in V13
+        // This is to avoid a breaking change in ContentSettings, if the old AllowedFileUploads has a value, and the new
+        // AllowedFileUploadExtensions does not, copy the value over, if the new has a value, use that instead.
+        builder.Services.Configure<ContentSettings>(settings =>
+        {
+            // We have to use Config.GetSection().Get<string[]>, as the GetSection.GetValue<string[]> simply cannot retrieve a string array
+            var allowedUploadedFileExtensionsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.AllowedUploadedFileExtensions)}").Get<string[]>();
+            var allowedUploadFilesValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.AllowedUploadFiles)}").Get<string[]>();
+
+            if (allowedUploadedFileExtensionsValue is null && allowedUploadFilesValue is not null)
+            {
+                settings.AllowedUploadedFileExtensions = allowedUploadFilesValue;
+            }
+        });
+
+        // TODO: Remove this in V13
+        builder.Services.Configure<ContentSettings>(settings =>
+        {
+            var disallowedUploadedFileExtensionsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.DisallowedUploadedFileExtensions)}").Get<string[]>();
+            var disallowedUploadFilesValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.DisallowedUploadFiles)}").Get<string[]>();
+
+            if (disallowedUploadedFileExtensionsValue is null && disallowedUploadFilesValue is not null)
+            {
+                settings.DisallowedUploadedFileExtensions = disallowedUploadFilesValue;
+            }
+        });
         return builder;
     }
 }

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs

@@ -318,14 +318,19 @@ namespace Umbraco.Cms.Core.DependencyInjection
             Services.AddSingleton<ConflictingPackageData>();
             Services.AddSingleton<CompiledPackageXmlParser>();
 
-            // Register a noop IHtmlSanitizer to be replaced
+            // Register a noop IHtmlSanitizer & IMarkdownSanitizer to be replaced
             Services.AddUnique<IHtmlSanitizer, NoopHtmlSanitizer>();
+            Services.AddUnique<IMarkdownSanitizer, NoopMarkdownSanitizer>();
 
             Services.AddUnique<IPropertyTypeUsageService, PropertyTypeUsageService>();
             Services.AddUnique<IDataTypeUsageService, DataTypeUsageService>();
 
             Services.AddUnique<ICultureImpactFactory>(provider => new CultureImpactFactory(provider.GetRequiredService<IOptionsMonitor<ContentSettings>>()));
             Services.AddUnique<IDictionaryService, DictionaryService>();
+            Services.AddUnique<ITemporaryMediaService, TemporaryMediaService>();
+
+            // Register filestream security analyzers
+            Services.AddUnique<IFileStreamSecurityValidator,FileStreamSecurityValidator>();
         }
     }
 }

src/Umbraco.Core/EmbeddedResources/BlockGrid/area.cshtml

@@ -0,0 +1,10 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridArea>
+
+<div class="umb-block-grid__area"
+     data-area-col-span="@Model.ColumnSpan"
+     data-area-row-span="@Model.RowSpan"
+     data-area-alias="@Model.Alias"
+     style="--umb-block-grid--grid-columns: @Model.ColumnSpan;--umb-block-grid--area-column-span: @Model.ColumnSpan; --umb-block-grid--area-row-span: @Model.RowSpan;">
+    @await Html.GetBlockGridItemsHtmlAsync(Model)
+</div>

src/Umbraco.Core/EmbeddedResources/BlockGrid/areas.cshtml

@@ -8,12 +8,6 @@
      style="--umb-block-grid--area-grid-columns: @(Model.AreaGridColumns?.ToString() ?? Model.GridColumns?.ToString() ?? "12");">
     @foreach (var area in Model.Areas)
     {
-        <div class="umb-block-grid__area"
-         data-area-col-span="@area.ColumnSpan"
-         data-area-row-span="@area.RowSpan"
-         data-area-alias="@area.Alias"
-         style="--umb-block-grid--grid-columns: @area.ColumnSpan;--umb-block-grid--area-column-span: @area.ColumnSpan; --umb-block-grid--area-row-span: @area.RowSpan;">
-            @await Html.GetBlockGridItemsHtmlAsync(area)
-        </div>
+        @await Html.GetBlockGridItemAreaHtmlAsync(area)
     }
 </div>

src/Umbraco.Core/EmbeddedResources/BlockGrid/items.cshtml

@@ -7,8 +7,6 @@
 <div class="umb-block-grid__layout-container">
     @foreach (var item in Model)
     {
-        bool attrForceLeft = item.ForceLeft;
-        bool attrForceRight = item.ForceRight;
         <div
             class="umb-block-grid__layout-item"
             data-content-element-type-alias="@item.Content.ContentType.Alias"
@@ -16,8 +14,6 @@
             data-element-udi="@item.ContentUdi"
             data-col-span="@item.ColumnSpan"
             data-row-span="@item.RowSpan"
-            @(attrForceLeft ? "data-force-left" : null)
-            @(attrForceRight ? "data-force-right" : null)
             style=" --umb-block-grid--item-column-span: @item.ColumnSpan; --umb-block-grid--item-row-span: @item.RowSpan; ">
             @{
                 var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias;