Merge branch 'v9/dev' into v9/contrib

Author: nul800sebastiaan

.github/config/codeql-config.yml

@@ -1,14 +1,8 @@
 name: "CodeQL config"
-on:
-  push:
-    branches: [v8/contrib,v8/dev]
-paths-ignore: 
-  - node_modules
-  - Umbraco.TestData
-  - Umbraco.Tests
-  - Umbraco.Tests.AcceptanceTest
-  - Umbraco.Tests.Benchmarks
-  - bin
-  - build.tmp
+
 paths:
-  - src   
+  - src
+
+paths-ignore:
+  - '**/node_modules'
+  - 'src/Umbraco.Web.UI/wwwroot'

.github/workflows/codeql-analysis.yml

@@ -2,67 +2,28 @@ name: "Code scanning - action"
 
 on:
   push:
-    branches: [v8/contrib,v8/dev,v8/bug,v8/feature]
+    branches: ['*/dev','*/contrib']
   pull_request:
     # The branches below must be a subset of the branches above
-  schedule:
-    - cron: '0 7 * * 2'
+    branches: ['*/dev','*/contrib']
 
 jobs:
   CodeQL-Build:
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
-      # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-    
-    - name: configure Pagefile
-      uses: al-cheb/[email protected]
       with:
-          minimum-size: 8GB
-          maximum-size: 32GB
-          
-    - run: |
-        echo "Run Umbraco-CMS build"
-        pwsh -command .\build\build.ps1
+        config-file: ./.github/config/codeql-config.yml
+
+    - name: dotnet build
+      run: dotnet build umbraco-netcore-only.sln
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
-      with:
-        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:
-    name: Always run job
-    runs-on: ubuntu-latest    
-    steps:
-      - name: Always run
-        run: echo "This job is to prevent the workflow status from showing as failed when all other jobs are skipped"
-

build/templates/UmbracoPackage/.template.config/template.json

@@ -24,7 +24,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.2.0-rc",
+            "defaultValue": "9.3.0-rc",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

build/templates/UmbracoProject/.template.config/template.json

@@ -57,7 +57,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.2.0-rc",
+            "defaultValue": "9.3.0-rc",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },