From 1be548b680a6f533ae81b61d55c8739f9dd50649 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:38:14 +0100
Subject: [PATCH] Update nightly build (#15359)

* cherry-pick templateParameters from v14/dev

* add isNightly parameter

* remove v9

* add parameter check for myget isNightly
---
 build/azure-pipelines.yml       | 50 ++++++++++++++++++---------------
 build/nightly-build-trigger.yml |  1 -
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 74fae6c65d..3cbc329a11 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -90,7 +90,7 @@ stages:
           - task: Cache@2
             displayName: Cache node_modules
             inputs:
-              key: '"npm_client" | "$(Agent.OS)"| $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/package-lock.json | $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client/package-lock.json'
+              key: '"npm_client" | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/package-lock.json'
               restoreKeys: |
                 "npm_client" | "$(Agent.OS)"
                 "npm_client"
@@ -117,6 +117,7 @@ stages:
             displayName: Use .NET $(dotnetVersion)
             inputs:
               version: $(dotnetVersion)
+              performMultiLevelLookup: true
               includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
             displayName: Run dotnet restore
@@ -230,6 +231,7 @@ stages:
             submodules: true
           - task: NodeTool@0
             displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
             inputs:
               versionSpec: $(nodeVersion)
           - task: Cache@2
@@ -293,6 +295,7 @@ stages:
             displayName: Use .NET $(dotnetVersion)
             inputs:
               version: $(dotnetVersion)
+              performMultiLevelLookup: true
               includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
             displayName: Run dotnet test
@@ -333,6 +336,7 @@ stages:
             displayName: Use .NET $(dotnetVersion)
             inputs:
               version: $(dotnetVersion)
+              performMultiLevelLookup: true
               includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
             displayName: Run dotnet test Windows
@@ -703,28 +707,28 @@ stages:
       - Deploy_MyGet # Change to "Deploy_Nuget" after release of v14
     condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.uploadApiDocs}}))
     jobs:
-#      - job:
-#        displayName: Upload C# Docs
-#        steps:
-#          - checkout: none
-#          - task: DownloadPipelineArtifact@2
-#            displayName: Download artifact
-#            inputs:
-#              artifact: csharp-docs
-#              path: $(Build.SourcesDirectory)
-#          - task: ExtractFiles@1
-#            inputs:
-#              archiveFilePatterns: $(Build.SourcesDirectory)/csharp-docs.zip
-#              destinationFolder: $(Build.ArtifactStagingDirectory)/csharp-docs
-#          - task: AzureFileCopy@4
-#            displayName: 'Copy C# Docs to blob storage'
-#            inputs:
-#              SourcePath: '$(Build.ArtifactStagingDirectory)/csharp-docs/*'
-#              azureSubscription: umbraco-storage
-#              Destination: AzureBlob
-#              storage: umbracoapidocs
-#              ContainerName: '$web'
-#              BlobPrefix: v$(umbracoMajorVersion)/csharp
+      - job:
+        displayName: Upload C# Docs
+        steps:
+          - checkout: none
+          - task: DownloadPipelineArtifact@2
+            displayName: Download artifact
+            inputs:
+              artifact: csharp-docs
+              path: $(Build.SourcesDirectory)
+          - task: ExtractFiles@1
+            inputs:
+              archiveFilePatterns: $(Build.SourcesDirectory)/csharp-docs.zip
+              destinationFolder: $(Build.ArtifactStagingDirectory)/csharp-docs
+          - task: AzureFileCopy@4
+            displayName: 'Copy C# Docs to blob storage'
+            inputs:
+              SourcePath: '$(Build.ArtifactStagingDirectory)/csharp-docs/*'
+              azureSubscription: umbraco-storage
+              Destination: AzureBlob
+              storage: umbracoapidocs
+              ContainerName: '$web'
+              BlobPrefix: v$(umbracoMajorVersion)/csharp
       - job:
         displayName: Upload js Docs
         steps:
diff --git a/build/nightly-build-trigger.yml b/build/nightly-build-trigger.yml
index 1d11232c0f..7e128b2af7 100644
--- a/build/nightly-build-trigger.yml
+++ b/build/nightly-build-trigger.yml
@@ -8,7 +8,6 @@ schedules:
   displayName: Daily midnight build
   branches:
     include:
-    - v9/dev
     - v10/dev
     - v12/dev
     - v13/dev