Merge branch 'v9/dev' into v9/feature/update-imagesharp-web

# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
#	src/Umbraco.Web.UI/umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts

Author: Nikolaj Geisle

.editorconfig

@@ -159,7 +159,7 @@ There are two big areas that you should know about:
   You may need to run the following commands to set up gulp properly:
   ```
   npm cache clean --force
-  npm install
+  npm ci
   npm run build
   ```
   The caching for the back office has been described as 'aggressive' so we often find it's best when making back office changes to disable caching in the browser to help you to see the changes you're making.

.github/CONTRIBUTING.md

@@ -56,7 +56,7 @@ jobs:
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
       with:
-        config-file: ./.github/workflows/codeql-config.yml
+        config-file: ./.github/config/codeql-config.yml
 
   # This job is to prevent the workflow status from showing as failed when all other jobs are skipped - See https://github.community/t/workflow-is-failing-if-no-job-can-be-ran-due-to-condition/16873
   always_job:

.github/workflows/codeql-config.yml renamed to .github/config/codeql-config.yml

@@ -19,13 +19,13 @@
 .DS_Store
 ._.DS_Store
 .vs/
-/local/
+.idea/
 
 # Build directories
 [Bb]in/
-[Db]ebug*/
-[Rr]elease*/
-obj/
+[Oo]bj/
+[Db]ebug/
+[Rr]elease/
 
 # Tools
 _ReSharper*/
@@ -35,122 +35,68 @@ _NCrunch_*/
 *.ncrunchproject
 *.crunchsolution.cache
 tools/NDepend/
-
 [Tt]est[Rr]esult*
 [Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
 [sS]ource
 [sS]andbox
-umbraco.config
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Tests/App_Data/*
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/packages/
-src/packages/repositories.config
-
-*.transformed
-
 node_modules
 lib-bower
-
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/vwd.webinfo
-
-src/*.psess
-src/*.vspx
-
+*.psess
+*.vspx
 NDependOut/*
 QueryResult.htm
-
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
+tools/docfx/*
 
 # Ignore rule for clearing out Belle (avoid rebuilding all the time)
 preserve.belle
 
 # Ignore rule for output of generated documentation files from grunt docserve
 src/Umbraco.Web.UI.Docs/api
 src/Umbraco.Web.UI.Docs/package-lock.json
-src/*.boltdata/
-src/umbraco.sln.ide/*
-src/.vs/
-
-src/Umbraco.Tests/[Mm]edia
-tools/docfx/*
-apidocs/_site/*
-src/*/project.lock.json
-src/.idea/*
-
-apidocs/api/*
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-src/packages/
-src/PrecompiledWeb/*
 
 # Build
 build.out/
 build.tmp/
 build/hooks/
 build/temp/
 
-# Acceptance tests
-cypress.env.json
-/src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
-/src/Umbraco.Tests.AcceptanceTest/package-lock.json
-/src/Umbraco.Tests.AcceptanceTest/cypress/videos/
-/src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
-
-/src/Umbraco.Web.UI.Client/TESTS-*.xml
-/src/ApiDocs/api/*
-/src/Umbraco.Web.UI.Client/package-lock.json
-/src/Umbraco.Web.UI/wwwroot/Media/*
-/src/Umbraco.Tests.Integration/App_Data/*
-/src/Umbraco.Tests.Integration/TEMP/*
-/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/*
-/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
-/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
-/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
-/src/Umbraco.Web.UI/wwwroot/App_Data/TEMP/*
-/src/Umbraco.Web.UI/App_Data/Logs/*
-/src/Umbraco.Web.UI/App_Data/TEMP/TypesCache/*
-/src/Umbraco.Web.UI/App_Data/TEMP/*
-/src/Umbraco.Web.UI/App_Data/Smidge/Cache/*
-/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs
-/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/*
-/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/*
-/src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-/src/Umbraco.Web.UI/appsettings.json
-/src/Umbraco.Web.UI/appsettings.Development.json
-/src/Umbraco.Web.UI/appsettings.Local.json
-
-
-src/Umbraco.Tests.Integration/umbraco/Data/
-src/Umbraco.Tests.Integration/umbraco/logs/
-
-src/Umbraco.Tests.Integration/Views/
-
-src/Umbraco.Tests/TEMP/
-
-src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
-src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
-src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
+# Build output
+build/docs.zip
+build/ui-docs.zip
+build/csharp-docs.zip
+build/ApiDocs/*
+build/ApiDocs/Output/*
+src/ApiDocs/api/*
 
+# Environment specific data
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+src/Umbraco.Web.UI.Client/TESTS-*.xml
+src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs
+src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/*
+src/Umbraco.Web.UI/appsettings.Development.json
+src/Umbraco.Web.UI/appsettings.json
+src/Umbraco.Web.UI/appsettings.Local.json
+src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/*
+src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
+src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
+src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
+src/Umbraco.Web.UI/wwwroot/Media/*
+
+# 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.Integration.SqlCe/DatabaseContextTests.sdf
+tests/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
+tests/Umbraco.Tests.Integration/TEMP/*
+tests/Umbraco.Tests.Integration/umbraco/Data/
+tests/Umbraco.Tests.Integration/umbraco/logs/
+tests/Umbraco.Tests.Integration/Views/
+tests/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
+
+# Ignore auto-generated schema
 src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json

.github/workflows/codeql-analysis.yml

@@ -14,6 +14,7 @@
             "args": [],
             "cwd": "${workspaceFolder}/src/Umbraco.Web.UI",
             "stopAtEntry": false,
+            "requireExactSource": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",

.gitignore

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-
     <!-- Package references and additional files which are consumed by all projects -->
     <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
-        <AdditionalFiles Include="$(MSBuildThisFileDirectory)linting\stylecop.json" />
+        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IsImplicitlyDefined="true" />
+        <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
     </ItemGroup>
 
-    <Choose>
-        <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectFile), 'Tests'))">
-            <PropertyGroup>
-                <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)linting\codeanalysis.tests.ruleset</CodeAnalysisRuleSet>
-            </PropertyGroup>
-        </When>
-        <Otherwise>
-            <PropertyGroup>
-                <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)linting\codeanalysis.ruleset</CodeAnalysisRuleSet>
-            </PropertyGroup>
-        </Otherwise>
-    </Choose>
-
+    <!-- Specify rule set for all projects -->
+    <PropertyGroup>
+        <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)codeanalysis.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
 </Project>