From e366fe880663f3874c946cf9d54c2af2ca588507 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 23 May 2022 08:56:50 +0100
Subject: [PATCH] Merge release/10.0.0 into v10/dev

commit ff6d064b29e662119cec4ffb121b149927c702aa
Author: Paul Johnson <pmj@umbraco.com>
Date:   Mon May 23 08:43:52 2022 +0100

    Allow for slow integration test runs

commit e6320a12babcaec4d8fed32f5fe8cde7bd466d38
Author: Andy Butland <abutland73@gmail.com>
Date:   Sat May 21 08:10:52 2022 +0200

    Fixed null check in external login.

    (cherry picked from commit 998190753212de591b75b8e2c74c153c812d2cd4)

commit 0f6630861e2674561110a158e778e3da26d5ecdc
Author: Paul Johnson <pmj@umbraco.com>
Date:   Mon May 23 07:25:04 2022 +0100

    static assets nupkg fixes (#12440)

    * Remove duplicate jsonschema build

    * Don't attempt to --no-build for dotnet pack (fixes static assets)

    * Bump version to 10.0.0-rc3

    * Improve restoreKeys

    * update Umbraco.GitVersioning.Extensions to 0.1.1

    (cherry picked from commit 0ef34ab9c54b0b5c5cb5eef5cbaf43192b8d44ac)

    * tag e2e container with current commit

    * cache cypress binaries

# Conflicts:
#	version.json
---
 build/azure-pipelines.yml                | 24 ++++++++++++++++--------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj |  1 -
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 2a7d43655d..dcb71692e6 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -52,7 +52,8 @@ stages:
             inputs:
               key: '"npm_client" | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/package-lock.json'
               restoreKeys: |
-                npm_client | "$(Agent.OS)"
+                "npm_client" | "$(Agent.OS)"
+                "npm_client"
               path: $(npm_config_cache)
           - script: npm ci --no-fund --no-audit --prefer-offline
             workingDirectory:  src/Umbraco.Web.UI.Client
@@ -95,7 +96,7 @@ stages:
                   }
                 }
 
-                dotnet pack --no-build --configuration $(buildConfiguration) umbraco.sln -o $(Build.ArtifactStagingDirectory)/nupkg
+                dotnet pack --configuration $(buildConfiguration) umbraco.sln -o $(Build.ArtifactStagingDirectory)/nupkg
           - task: PublishPipelineArtifact@1
             displayName: Publish nupkg
             inputs:
@@ -239,6 +240,7 @@ stages:
     jobs:
       # Integration Tests (SQLite)
       - job:
+        timeoutInMinutes: 120
         displayName: Integration Tests (SQLite)
         strategy:
           matrix:
@@ -315,6 +317,7 @@ stages:
   - stage: E2E
     variables:
       npm_config_cache: $(Pipeline.Workspace)/.npm_e2e
+      CYPRESS_CACHE_FOLDER: $(Pipeline.Workspace)/cypress_binaries
     displayName: E2E Tests
     dependsOn: Build
     jobs:
@@ -346,10 +349,8 @@ stages:
               vmImage: 'ubuntu-latest'
               dockerfile: umbraco-linux.docker
               dockerImageName: umbraco-linux
-              cypressBinaries: "/home/vsts/.cache/Cypress"
             Windows:
               vmImage: 'windows-latest'
-              cypressBinaries: $(LOCALAPPDATA)/Cypress
         pool:
             vmImage: $(vmImage)
         steps:
@@ -367,8 +368,14 @@ stages:
             inputs:
               key: '"npm_e2e" | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
               restoreKeys: |
-                npm_e2e | "$(Agent.OS)"
+                "npm_e2e" | "$(Agent.OS)"
+                "npm_e2e"
               path: $(npm_config_cache)
+          - task: Cache@2
+            displayName: Cache cypress binaries
+            inputs:
+              key: '"cypress_binaries" | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+              path: $(CYPRESS_CACHE_FOLDER)
           - task: PowerShell@2
             displayName: Generate Cypress.env.json
             inputs:
@@ -392,10 +399,11 @@ stages:
               workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
               targetType: inline
               script: |
-                docker build -t $(dockerImageName) -f $(dockerfile) .
+                $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).tar $(dockerImageName)
-                docker run --name $(dockerImageName) -dp 8080:5000 -e UMBRACO__CMS_GLOBAL__ID=$(UMBRACO__CMS_GLOBAL__ID) $(dockerImageName)
+                docker save -o $(Build.ArtifactStagingDirectory)/docker-images/$(dockerImageName).$sha.tar $(dockerImageName):$sha
+                docker run --name $(dockerImageName) -dp 8080:5000 -e UMBRACO__CMS_GLOBAL__ID=$(UMBRACO__CMS_GLOBAL__ID) $(dockerImageName):$sha
                 docker ps
           # Windows containers take forever.
           # --no-launch-profile stops ASPNETCORE_ENVIRONMENT=Development which breaks the users.ts tests (smtp config = invite user button)
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 54ab69b37e..2274c73327 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -59,7 +59,6 @@
  
   
   <Target Name="JsonSchemaBuild">
-    <Exec Command="dotnet run -c Release --project $(JsonSchemaProjectPath) -o $(ProjectDir)appsettings-schema.json" />
     <Exec Command="dotnet run -c Release --project $(JsonSchemaProjectPath) -o &quot;$(ProjectDir)appsettings-schema.json&quot;" />
   </Target>