Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/AB13489-n…

…o-error-when-exceeding-maxAllowedContentLength
umbraco · Sep 15, 2021 · 7200064 · 7200064
2 parents aaf1b46 + 8d58e31
commit 7200064
Show file tree

Hide file tree

Showing 436 changed files with 10,747 additions and 3,508 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -56,6 +56,13 @@ jobs:
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
       with:
-        config-file: ./.github/codeql-config.yml
-
+        config-file: ./.github/workflows/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"
 
diff --git a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
@@ -1,18 +1,26 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\**\*.*</ContentFilesPath>
+        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\umbraco\**\*.*</ContentFilesPath>
+        <ContentWwwrootFilesPath>$(MSBuildThisFileDirectory)..\content\wwwroot\umbraco\**\*.*</ContentWwwrootFilesPath>
+        <UmbracoWwwrootName Condition="'$(UmbracoWwwrootName)' == ''">umbraco</UmbracoWwwrootName>
     </PropertyGroup>
 
     <Target Name="CopyUmbracoAssets" BeforeTargets="Build">
         <ItemGroup>
 
             <ContentFiles Include="$(ContentFilesPath)" />
+            <ContentWwwrootFiles Include="$(ContentWwwrootFilesPath)" />
         </ItemGroup>
         <Message Text="Copying Umbraco content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files"  Importance="high" />
+        <Message Text="Copying Umbraco wwwroot content files: $(ContentWwwrootFilesPath) - #@(ContentWwwrootFiles->Count()) files"  Importance="high" />
         <Copy
             SourceFiles="@(ContentFiles)"
-            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\%(RecursiveDir)%(Filename)%(Extension)')"
+            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+        <Copy
+            SourceFiles="@(ContentWwwrootFiles)"
+            DestinationFiles="@(ContentWwwrootFiles->'$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\%(RecursiveDir)%(Filename)%(Extension)')"
             SkipUnchangedFiles="true" />
 
     </Target>
@@ -24,7 +32,7 @@
             <UmbracoUmbracoBackOfficeMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoBackOffice\" />
             <UmbracoUmbracoInstallDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoInstall\" />
             <UmbracoUmbracoWebsiteMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoWebsite\" />
-            <WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\umbraco\" />
+            <WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\" />
         </ItemGroup>
         <Message Text="Clear old umbraco data"  Importance="high" />
         <RemoveDir Directories="@(UmbracoConfigPackageDir)"  />

diff --git a/build/build.ps1 b/build/build.ps1
@@ -428,6 +428,7 @@
     &$this.BuildEnv.NuGet Pack "$templates\Umbraco.Templates.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
         -Version "$($this.Version.Semver.ToString())" `
+        -NoDefaultExcludes `
         -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.templates.log"
     if (-not $?) { throw "Failed to pack NuGet Umbraco.Templates." }
 

diff --git a/build/templates/UmbracoPackage/.template.config/template.json b/build/templates/UmbracoPackage/.template.config/template.json
@@ -24,7 +24,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.0.0-rc002",
+            "defaultValue": "9.0.0-rc003",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },