Merge branch 'main' into 2019-webassembly

dotnet · Oct 30, 2024 · 2b02b18 · 2b02b18
2 parents 08a5989 + 778cf77
commit 2b02b18
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1
@@ -54,6 +54,6 @@ else {
 }
 
 # See https://github.com/NuGet/NuGet.Client/pull/4259
-$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
+$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "6,1500"
 
 if ($InstallFailed) { throw "Failed to install the .NET Core SDK" }
diff --git a/eng/common/templates/stages/build-test-publish-repo.yml b/eng/common/templates/stages/build-test-publish-repo.yml
@@ -91,6 +91,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
   - template: /eng/common/templates/jobs/build-images.yml@self
     parameters:
       name: Linux_amd64
@@ -104,6 +105,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}
@@ -122,6 +124,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}
@@ -140,6 +143,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}
@@ -158,6 +162,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}
@@ -176,6 +181,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}
@@ -194,12 +200,14 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}
       publicProjectName: ${{ parameters.publicProjectName }}
       internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
       publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+      isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
   - template: /eng/common/templates/jobs/build-images.yml@self
     parameters:
       name: WindowsLtsc2016_amd64
@@ -213,6 +221,7 @@ stages:
           noCache: ${{ parameters.noCache }}
           internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
           publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+          isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
       noCache: ${{ parameters.noCache }}
       internalProjectName: ${{ parameters.internalProjectName }}

diff --git a/eng/common/templates/steps/common-init-for-matrix-and-build.yml b/eng/common/templates/steps/common-init-for-matrix-and-build.yml
@@ -3,6 +3,7 @@ parameters:
   internalVersionsRepoRef: null
   publicVersionsRepoRef: null
   versionsRepoPath: versions
+  isInternalServicingValidation: false
 
 steps:
 - checkout: self

diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2561667
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2570468
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner

diff --git a/eng/common/templates/variables/dotnet/build-test-publish.yml b/eng/common/templates/variables/dotnet/build-test-publish.yml
@@ -12,7 +12,7 @@ variables:
 - name: testResultsDirectory
   value: tests/Microsoft.DotNet.Docker.Tests/TestResults/
 - name: officialRepoPrefixes
-  value: public/,internal/private/
+  value: public/,internal/private/,unlisted/
 
 - name: mcrDocsRepoInfo.accessToken
   value: $(BotAccount-dotnet-docker-bot-PAT)

diff --git a/src/azurelinux/3.0/net8.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net8.0/crossdeps-builder/amd64/Dockerfile
@@ -51,7 +51,7 @@ RUN gpg --import dimitri_john_ledkov.asc && \
 
 # 1. Obtain signing keys used to sign llvm sources
 RUN wget https://releases.llvm.org/release-keys.asc && \
-    echo "f181a90697e3ea4b7782f1ee48314a570aef058505b4f3a0ab0611094ec13241 release-keys.asc" | sha256sum -c && \
+    echo "972d9449ebf7de947a1dff7f25edf8eea7963e4f7501b20d29328df55162f3b8 release-keys.asc" | sha256sum -c && \
     gpg --import release-keys.asc && \
     rm release-keys.asc && \
 # 2. Download llvm sources and signature, and verify signature

diff --git a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile
@@ -52,7 +52,7 @@ RUN gpg --import dimitri_john_ledkov.asc && \
 
 # 1. Obtain signing keys used to sign llvm sources
 RUN wget https://releases.llvm.org/release-keys.asc && \
-    echo "f181a90697e3ea4b7782f1ee48314a570aef058505b4f3a0ab0611094ec13241 release-keys.asc" | sha256sum -c && \
+    echo "972d9449ebf7de947a1dff7f25edf8eea7963e4f7501b20d29328df55162f3b8 release-keys.asc" | sha256sum -c && \
     gpg --import release-keys.asc && \
     rm release-keys.asc && \
 # 2. Download llvm sources and signature, and verify signature

diff --git a/src/cbl-mariner/2.0/crossdeps-builder/amd64/Dockerfile b/src/cbl-mariner/2.0/crossdeps-builder/amd64/Dockerfile
@@ -49,7 +49,7 @@ RUN gpg --output dimitri_john_ledkov.gpg --dearmor dimitri_john_ledkov.asc && \
 
 # 1. Obtain signing keys used to sign llvm sources
 RUN wget https://releases.llvm.org/release-keys.asc && \
-    echo "f181a90697e3ea4b7782f1ee48314a570aef058505b4f3a0ab0611094ec13241 release-keys.asc" | sha256sum -c && \
+    echo "972d9449ebf7de947a1dff7f25edf8eea7963e4f7501b20d29328df55162f3b8 release-keys.asc" | sha256sum -c && \
     gpg --output release-keys.gpg --dearmor release-keys.asc && \
     rm release-keys.asc && \
 # 2. Download llvm sources and signature, and verify signature