Ship two json schema files.. One that reference others, and a CMS one

.devcontainer/Dockerfile

@@ -1,36 +1,15 @@
-# [Choice] .NET Core version: 5.0, 3.1, 2.1
-ARG VARIANT=3.1
-FROM mcr.microsoft.com/vscode/devcontainers/dotnetcore:0-${VARIANT}
+# [Choice] .NET version: 6.0, 3.1, 6.0-bullseye, 3.1-bullseye, 6.0-focal, 3.1-focal
+ARG VARIANT=6.0-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
 
-# [Option] Install Node.js
-ARG INSTALL_NODE="true"
-ARG NODE_VERSION="lts/*"
-RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Option] Install Azure CLI
-ARG INSTALL_AZURE_CLI="false"
-COPY library-scripts/azcli-debian.sh /tmp/library-scripts/
-RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \
-    && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
-
-# Install SQL Tools: SQLPackage and sqlcmd
-COPY mssql/installSQLtools.sh installSQLtools.sh
-RUN bash ./installSQLtools.sh \
-     && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
-
-# Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then groupmod --gid $USER_GID vscode && usermod --uid $USER_UID --gid $USER_GID vscode; fi
+# [Choice] Node.js version: none, lts/*, 18, 16, 14
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
 
 # [Optional] Uncomment this section to install additional OS packages.
-# Following added by Warren...
-# Needed to add as Gifsicle used by gulp-imagemin does not ship a Linux binary and has to be compiled from source
-# And this Linux package is needed in order to build it
-# https://github.com/imagemin/imagemin-gifsicle/issues/40#issuecomment-616487214
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends dh-autoreconf chromium-browser
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
 
 # [Optional] Uncomment this line to install global node packages.
 # RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
@@ -42,7 +21,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # Needing to set unsafe-perm as root is the user setup
 # https://docs.npmjs.com/cli/v6/using-npm/config#unsafe-perm
 # Default: false if running as root, true otherwise (we are ROOT)
-RUN npm -g config set user vscode && npm -g config set unsafe-perm
+#RUN npm -g config set user vscode && npm -g config set unsafe-perm
 
 # Generate and trust a local developer certificate for Kestrel
 # This is needed for Kestrel to bind on https

.devcontainer/devcontainer.json

@@ -1,41 +1,25 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.158.0/containers/dotnet-mssql
+// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
 {
-	"name": "C# (.NET) and MS SQL",
+	"name": "C# (.NET) Umbraco & SMTP4Dev",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
 	"workspaceFolder": "/workspace",
-
+	
 	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash",
-		"mssql.connections": [
-			{
-				"server": "localhost,1433",
-				"database": "",
-				"authenticationType": "SqlLogin",
-				"user": "sa",
-				"password": "P@ssw0rd",
-				"emptyPasswordInput": false,
-				"savePassword": false,
-				"profileName": "mssql-container"
-			}
-		],
+	"settings": {		
 		"omnisharp.defaultLaunchSolution": "umbraco.sln",
 		"omnisharp.enableDecompilationSupport": true,
 		"omnisharp.enableRoslynAnalyzers": true
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"ms-dotnettools.csharp",
-		"ms-mssql.mssql"
+		"ms-dotnettools.csharp"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// 1433 for SQL if you want to connect from local into the one running inside the container
-	// Can connect to the SQL Server running in the image on local with 'host.docker.internal' as hostname
-	"forwardPorts": [1433, 9000, 5000, 25],
+	"forwardPorts": [9000, 5000, 25]
 
 	// [Optional] To reuse of your local HTTPS dev cert:
 	//
@@ -56,6 +40,4 @@
 	//      2. Drag ~/.aspnet/https/aspnetapp.pfx into the root of the file explorer
 	//      3. Open a terminal in VS Code and run "mkdir -p /home/vscode/.aspnet/https && mv aspnetapp.pfx /home/vscode/.aspnet/https"
 
-	// postCreateCommand.sh parameters: $1=SA password, $2=dacpac path, $3=sql script(s) path
-	"postCreateCommand": "bash .devcontainer/mssql/postCreateCommand.sh 'P@ssw0rd' './bin/Debug/' './.devcontainer/mssql/'"	
 }

.devcontainer/docker-compose.yml

@@ -6,25 +6,17 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # [Choice] Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
-        VARIANT: 5.0
+        # [Choice] .NET version: 6.0, 3.1, 6.0-bullseye, 3.1-bullseye, 6.0-focal, 3.1-focal
+        VARIANT: 6.0-bullseye
         # Options
-        INSTALL_NODE: "true"
         NODE_VERSION: "lts/*"
-        INSTALL_AZURE_CLI: "false"
-        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
-        USER_UID: 1000
-        USER_GID: 1000
 
     volumes:
       - ..:/workspace:cached
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: service:db
-
     # Uncomment the next line to use a non-root user for all processes.
     # user: vscode
 
@@ -34,7 +26,8 @@ services:
     # DotNetCore ENV Variables
     # https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-5.0#environment-variables
     environment:
-    - ConnectionStrings__umbracoDbDSN=server=localhost;database=UmbracoUnicore;user id=sa;password='P@ssw0rd'
+    - ConnectionStrings__umbracoDbDSN=Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True
+    - ConnectionStrings__umbracoDbDSN_ProviderName=Microsoft.Data.Sqlite
     - Umbraco__CMS__Unattended__InstallUnattended=true
     - Umbraco__CMS__Unattended__UnattendedUserName=Admin
     - Umbraco__CMS__Unattended__UnattendedUserEmail=test@umbraco.com
@@ -43,16 +36,6 @@ services:
     - Umbraco__CMS__Global__Smtp__Port=25
     - Umbraco__CMS__Global__Smtp__From=noreply@umbraco.test
 
-  db:
-    image: mcr.microsoft.com/mssql/server:2019-latest
-    restart: unless-stopped
-    environment:
-      SA_PASSWORD: P@ssw0rd
-      ACCEPT_EULA: Y
-
-    # Add "forwardPorts": ["1433"] to **devcontainer.json** to forward MSSQL locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
-
   smtp4dev:
     image: rnwood/smtp4dev:v3
     restart: always

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -6,7 +6,7 @@ body:
 - type: input
   id: "version"
   attributes:
-    label: "Which *exact* Umbraco version are you using? For example: 9.0.1 - don't just write v9"
+    label: "Which Umbraco version are you using? (Please write the *exact* version, example: 10.1.0)"
     description: "Use the help icon in the Umbraco backoffice to find the version you're using"
   validations:
     required: true

.github/New BackOffice - README.md

@@ -1,13 +1,13 @@
-# New Backoffice
+# New backoffice
 
 > **Warning**:
-> This is an early WIP, and is set not to be packable since we don't want to release this yet. There will be breaking changes in these projects
+> This is an early WIP and is set not to be packable since we don't want to release this yet. There will be breaking changes in these projects.
 
-This solution folder contains the projects for the new BackOffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts.
+This solution folder contains the projects for the new backoffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts.
 
 ### Project structure
 
-Since the new backoffice API is still very much a work in progress we've created new projects for the new backoffice API:
+Since the new backoffice API is still very much a work in progress, we've created new projects for the new backoffice API:
 
 * Umbrao.Cms.ManagementApi - The "presentation layer" for the management API
 * "New" versions of existing projects, should be merged with the existing projects when the new API is released:

.github/workflows/add-issues-to-review-project.yml

@@ -5,6 +5,9 @@ on:
     types:
       - opened
 
+permissions:
+  contents: read
+
 jobs:
   get-user-type:
     runs-on: ubuntu-latest
@@ -43,6 +46,8 @@ jobs:
             core.setOutput("ignored", isIgnoredUser);
             console.log("Ignored is", isIgnoredUser);
   add-to-project:
+    permissions:
+      repository-projects: write # for actions/add-to-project
     if: needs.get-user-type.outputs.ignored == 'false'
     runs-on: ubuntu-latest
     needs: [get-user-type]

.github/workflows/codeql-analysis.yml

@@ -7,9 +7,16 @@ on:
     # The branches below must be a subset of the branches above
     branches: ['*/dev','*/contrib']
 
+permissions:
+  contents: read
+
 jobs:
   CodeQL-Build:
 
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/analyze to upload SARIF results
     runs-on: ubuntu-latest
     permissions:
       actions: read

.gitignore

@@ -104,5 +104,9 @@ cypress.env.json
 /tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/
 
 # Ignore auto-generated schema
+/src/Umbraco.Cms.Targets/appsettings-schema.json
 /src/Umbraco.Web.UI/appsettings-schema.json
+/src/Umbraco.Web.UI/appsettings-schema.umbraco.json
+/tests/Umbraco.Tests.Integration/appsettings-schema.json
 /src/Umbraco.Cms/appsettings-schema.json
+/src/Umbraco.Cms/appsettings-schema.umbraco.json

.vscode/launch.json

@@ -9,9 +9,8 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "Dotnet build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Umbraco.Web.UI/bin/Debug/net5.0/Umbraco.Web.UI.dll",
-            "args": [],
+            "program": "dotnet",
+            "args": ["run"],
             "cwd": "${workspaceFolder}/src/Umbraco.Web.UI",
             "stopAtEntry": false,
             "requireExactSource": false,

.vscode/tasks.json

@@ -54,7 +54,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/src/umbraco.sln",
+                "${workspaceFolder}/umbraco.sln",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -69,6 +69,7 @@
             "args": [
                 "watch",
                 "run",
+                "--project",
                 "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"