From 28ce895779dd0318a32f914291c84fd93d7004af Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 5 Dec 2025 16:09:27 -0800 Subject: [PATCH 1/2] Updated the agent image to use a variable for public and internal pipelines. Made the build run rename step only run for the internal project. --- eng/pipelines/official.yml | 6 ++++-- eng/pipelines/templates/jobs/workload-build.yml | 2 +- eng/pipelines/templates/jobs/workload-insertion-job.yml | 2 +- eng/pipelines/templates/stages/workload-public-build.yml | 2 +- eng/pipelines/templates/variables/workload-public.yml | 2 ++ src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/official.yml b/eng/pipelines/official.yml index 0b084a260..03d1ac6ad 100644 --- a/eng/pipelines/official.yml +++ b/eng/pipelines/official.yml @@ -125,6 +125,8 @@ parameters: variables: # Variables used: DncEngInternalBuildPool - template: /eng/common/templates-official/variables/pool-providers.yml@source +- name: AgentImageInternal + value: windows.amd64.vs2026.pre.scout ############### ARCADE ############### # Both this (used in Arcade for the MicroBuildSigningPlugin) and DotNetSignType (used in Arcade in Sign.proj) are necessary to set the sign type. # https://github.com/dotnet/arcade/blob/ccae251ef033746eb0213329953f5e3c1687693b/Documentation/ArcadeSdk.md#common-steps-in-azure-devops-pipeline @@ -171,7 +173,7 @@ extends: - repository: source sourceAnalysisPool: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: $(AgentImageInternal) os: windows policheck: enabled: true @@ -224,7 +226,7 @@ extends: environment: DotNet-SDK-Workloads pool: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: $(AgentImageInternal) os: windows templateContext: # Docs: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/releasepipelines/overview diff --git a/eng/pipelines/templates/jobs/workload-build.yml b/eng/pipelines/templates/jobs/workload-build.yml index 762a1340d..c593012cd 100644 --- a/eng/pipelines/templates/jobs/workload-build.yml +++ b/eng/pipelines/templates/jobs/workload-build.yml @@ -25,7 +25,7 @@ jobs: timeoutInMinutes: 120 pool: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: $(AgentImageInternal) os: windows steps: - template: /eng/pipelines/templates/steps/workload-checkout.yml@self diff --git a/eng/pipelines/templates/jobs/workload-insertion-job.yml b/eng/pipelines/templates/jobs/workload-insertion-job.yml index 93698794e..e0fc86fd6 100644 --- a/eng/pipelines/templates/jobs/workload-insertion-job.yml +++ b/eng/pipelines/templates/jobs/workload-insertion-job.yml @@ -14,7 +14,7 @@ jobs: timeoutInMinutes: 120 pool: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: $(AgentImageInternal) os: windows templateContext: type: buildJob diff --git a/eng/pipelines/templates/stages/workload-public-build.yml b/eng/pipelines/templates/stages/workload-public-build.yml index df5e17336..6ded655e3 100644 --- a/eng/pipelines/templates/stages/workload-public-build.yml +++ b/eng/pipelines/templates/stages/workload-public-build.yml @@ -13,7 +13,7 @@ stages: displayName: Build Repo pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64.open + demands: ImageOverride -equals $(AgentImagePublic) artifacts: publish: logs: diff --git a/eng/pipelines/templates/variables/workload-public.yml b/eng/pipelines/templates/variables/workload-public.yml index 5f9a48fca..5094d36cd 100644 --- a/eng/pipelines/templates/variables/workload-public.yml +++ b/eng/pipelines/templates/variables/workload-public.yml @@ -1,4 +1,6 @@ variables: +- name: AgentImagePublic + value: windows.amd64.vs2026.pre.scout.open - name: _SignType value: test - name: _TeamName diff --git a/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj b/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj index 89736dac5..212c2d10e 100644 --- a/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj +++ b/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj @@ -159,7 +159,7 @@ - + From 47ead38af07297264cd19b7320b1a6dd9d7928f4 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 5 Dec 2025 17:36:35 -0800 Subject: [PATCH 2/2] Used the wrong image names (they were the helix names instead of the AzDO agent image names). --- eng/pipelines/official.yml | 2 +- eng/pipelines/templates/variables/workload-public.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/official.yml b/eng/pipelines/official.yml index 03d1ac6ad..7dce2f715 100644 --- a/eng/pipelines/official.yml +++ b/eng/pipelines/official.yml @@ -126,7 +126,7 @@ variables: # Variables used: DncEngInternalBuildPool - template: /eng/common/templates-official/variables/pool-providers.yml@source - name: AgentImageInternal - value: windows.amd64.vs2026.pre.scout + value: windows.vs2026preview.scout.amd64 ############### ARCADE ############### # Both this (used in Arcade for the MicroBuildSigningPlugin) and DotNetSignType (used in Arcade in Sign.proj) are necessary to set the sign type. # https://github.com/dotnet/arcade/blob/ccae251ef033746eb0213329953f5e3c1687693b/Documentation/ArcadeSdk.md#common-steps-in-azure-devops-pipeline diff --git a/eng/pipelines/templates/variables/workload-public.yml b/eng/pipelines/templates/variables/workload-public.yml index 5094d36cd..116e4d3b6 100644 --- a/eng/pipelines/templates/variables/workload-public.yml +++ b/eng/pipelines/templates/variables/workload-public.yml @@ -1,6 +1,6 @@ variables: - name: AgentImagePublic - value: windows.amd64.vs2026.pre.scout.open + value: windows.vs2026preview.scout.amd64.open - name: _SignType value: test - name: _TeamName