Skip to content

Update image and build run-name on internal only #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MiYanni wants to merge 2 commits into
base: eng
Choose a base branch
from
+10 −6
Open

Update image and build run-name on internal only #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ce895
Updated the agent image to use a variable for public and internal pip…
MiYanni Dec 6, 2025
47ead38
Used the wrong image names (they were the helix names instead of the …
MiYanni Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions eng/pipelines/official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ parameters:
variables:
# Variables used: DncEngInternalBuildPool
- template: /eng/common/templates-official/variables/pool-providers.yml@source
- name: AgentImageInternal
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
Expand Down Expand Up @@ -171,7 +173,7 @@ extends:
- repository: source
sourceAnalysisPool:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: $(AgentImageInternal)
os: windows
policheck:
enabled: true
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/workload-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/workload-insertion-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeoutInMinutes: 120
pool:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: $(AgentImageInternal)
os: windows
templateContext:
type: buildJob
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/workload-public-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/templates/variables/workload-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
variables:
- name: AgentImagePublic
value: windows.vs2026preview.scout.amd64.open
- name: _SignType
value: test
- name: _TeamName
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
</CreateLightCommandPackageDrop>
</Target>

<Target Name="UpdateRunNameWithWorkloadsVersion" AfterTargets="Build" Condition="'$(TF_BUILD)' != ''">
<Target Name="UpdateRunNameWithWorkloadsVersion" AfterTargets="Build" Condition="'$(TF_BUILD)' != '' and '$(SYSTEM_TEAMPROJECT)' == 'internal'">
<!-- SOURCEBRANCHCOMMITMESSAGE is set to the Azure Pipelines environment within the SetRunName step. -->
<!-- We simply pull it out of the environment variables because trying to set it to an MSBuild property can cause issues in the YAML if the message contains special characters. -->
<Message Text="##vso[build.updatebuildnumber]$(OfficialBuildId) • $(WorkloadsVersion) • $(SOURCEBRANCHCOMMITMESSAGE)" Importance="high" />
Expand Down