Skip to content

Normalize SDK build leg naming #55400

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

Merged
MichaelSimons merged 3 commits into from
Jul 23, 2026
+46 −67
Merged

Normalize SDK build leg naming #55400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b649e4d
Simplify and normalize SDK build leg naming
MichaelSimons Jul 21, 2026
c8fa2fe
Update AoT -> AOT in comments to match normalized category name
MichaelSimons Jul 22, 2026
d3a2ee9
Remove redundant ARM64 TESTBUILD leg; normalize AoT -> AOT in comments
MichaelSimons Jul 22, 2026
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
13 changes: 6 additions & 7 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ extends:
runTests: false
variables:
_SignType: real
dependsOn: Official_windows_x64
dependsOn: Windows_x64_Official
downloadManifestMsiPackages: true
- categoryName: Official
targetArchitecture: arm64
Expand All @@ -162,7 +162,7 @@ extends:
runTests: false
variables:
_SignType: real
dependsOn: Official_windows_x64
dependsOn: Windows_x64_Official
downloadManifestMsiPackages: true
### TestTemplatesCG ###
# Note: This job is only used to allow the test templates to be built locally on the agent as opposed to Helix.
Expand Down Expand Up @@ -196,7 +196,7 @@ extends:
populateInternalRuntimeVariables: true
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
windowsJobParameterSets:
- categoryName: AoT
- categoryName: AOT
targetArchitecture: arm64
runtimeIdentifier: win-arm64
osProperties: /p:CrossBuild=true
Expand Down Expand Up @@ -308,7 +308,7 @@ extends:
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
timeoutInMinutes: 90
linuxJobParameterSets:
- categoryName: AoT
- categoryName: AOT
container: azureLinuxCrossArm64
targetArchitecture: arm64
runtimeIdentifier: linux-arm64
Expand Down Expand Up @@ -364,7 +364,7 @@ extends:
populateInternalRuntimeVariables: true
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
macOSJobParameterSets:
- categoryName: AoT
- categoryName: AOT
runAoTTests: true
targetArchitecture: arm64
runtimeIdentifier: osx-arm64
Expand All @@ -381,8 +381,7 @@ extends:
populateInternalRuntimeVariables: true
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
macOSJobParameterSets:
- categoryName: TestBuild
targetArchitecture: arm64
- targetArchitecture: arm64
runtimeIdentifier: osx-arm64
Comment thread
MichaelSimons marked this conversation as resolved.
Outdated

############### DOTNET-FORMAT ###############
Expand Down
9 changes: 4 additions & 5 deletions .vsts-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ stages:
os: windows
helixTargetQueue: windows.amd64.vs2026.pre.scout.open
windowsJobParameterSets:
- categoryName: AoT
- categoryName: AOT
targetArchitecture: arm64
runtimeIdentifier: win-arm64
osProperties: /p:CrossBuild=true
Expand Down Expand Up @@ -112,7 +112,7 @@ stages:
helixTargetQueue: ubuntu.2204.amd64.open
timeoutInMinutes: 90
linuxJobParameterSets:
- categoryName: AoT
- categoryName: AOT
container: azureLinuxCrossArm64
targetArchitecture: arm64
runtimeIdentifier: linux-arm64
Expand Down Expand Up @@ -140,7 +140,7 @@ stages:
os: macOS
helixTargetQueue: osx.15.arm64.open
macOSJobParameterSets:
- categoryName: AoT
- categoryName: AOT
runAoTTests: true
targetArchitecture: arm64
runtimeIdentifier: osx-arm64
Expand All @@ -155,8 +155,7 @@ stages:
os: macOS
helixTargetQueue: osx.15.amd64.open
macOSJobParameterSets:
- categoryName: TestBuild
runtimeIdentifier: osx-x64
- runtimeIdentifier: osx-x64

############### DOTNET-FORMAT ###############
- template: /eng/dotnet-format/dotnet-format-integration.yml
18 changes: 9 additions & 9 deletions eng/pipelines/templates/jobs/sdk-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ parameters:
publishTaskPrefix: ''
container: ''
helixTargetContainer: ''
categoryName: Build
categoryName: ''
platformName: ''
runTests: true
testProjects: $(Build.SourcesDirectory)/test/UnitTests.proj
publishRetryConfig: false
Expand Down Expand Up @@ -44,12 +45,12 @@ parameters:
jobs:
- template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
parameters:
${{ if eq(parameters.container, '') }}:
name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.targetArchitecture }}
displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.targetArchitecture }})'
${{ if eq(parameters.categoryName, '') }}:
name: ${{ parameters.platformName }}_${{ parameters.targetArchitecture }}
displayName: '${{ parameters.platformName }} ${{ parameters.targetArchitecture }}'
${{ else }}:
name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.targetArchitecture }}_${{ parameters.container }}
displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.targetArchitecture }}) [${{ parameters.container }}]'
name: ${{ parameters.platformName }}_${{ parameters.targetArchitecture }}_${{ parameters.categoryName }}
displayName: '${{ parameters.platformName }} ${{ parameters.targetArchitecture }} ${{ parameters.categoryName }}'
pool: ${{ parameters.pool }}
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
Expand Down Expand Up @@ -292,9 +293,8 @@ jobs:

# Only the AoT legs build the dotnet-aot NativeAOT library, so only they produce the
# size-analysis files. Gate on the AoT category so these steps run on every AoT leg (including
# the build-only cross-arch legs) and never upload empty artifacts on non-AoT legs like the
# TestBuild/FullFramework jobs.
- ${{ if eq(parameters.categoryName, 'AoT') }}:
# the build-only cross-arch legs) and never upload empty artifacts on non-AoT legs.
- ${{ if eq(parameters.categoryName, 'AOT') }}:
Comment thread
MichaelSimons marked this conversation as resolved.
Outdated
- task: CopyFiles@2
displayName: 🟣 Copy NativeAOT Size Analysis Files
inputs:
Expand Down
21 changes: 10 additions & 11 deletions eng/pipelines/templates/jobs/sdk-job-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,17 @@ parameters:
locBranch: ''
### WINDOWS ###
windowsJobParameterSets:
- categoryName: TestBuild
publishRetryConfig: true
- publishRetryConfig: true
runNativeAotCliTests: true
- categoryName: AOT
runAoTTests: true
- categoryName: FullFramework
testFullMSBuild: true
- categoryName: AoT
runAoTTests: true
### LINUX ###
linuxJobParameterSets:
- categoryName: TestBuild
osProperties: $(linuxOsglibcProperties)
- osProperties: $(linuxOsglibcProperties)
runNativeAotCliTests: true
- categoryName: TestBuild
targetArchitecture: arm64
- targetArchitecture: arm64
runtimeIdentifier: linux-arm64
osProperties: $(linuxOsglibcProperties)
# Don't run the tests on arm64. Only perform the build itself.
Expand All @@ -26,7 +23,7 @@ parameters:
# build dotnet-aot via NativeAOT (producing the .so and its mstat/dgml size-analysis output) and
# run the *.AoT.Tests.csproj test projects. linux-arm64 AoT is covered by a separate cross-build
# leg (see .vsts-pr.yml / .vsts-ci.yml).
- categoryName: AoT
- categoryName: AOT
Comment thread
MichaelSimons marked this conversation as resolved.
Outdated
runAoTTests: true
osProperties: $(linuxOsglibcProperties)
- categoryName: ContainerBased
Expand All @@ -37,8 +34,7 @@ parameters:
disableJob: true
### MACOS ###
macOSJobParameterSets:
- categoryName: TestBuild
targetArchitecture: arm64
- targetArchitecture: arm64
runtimeIdentifier: osx-arm64
runNativeAotCliTests: true

Expand All @@ -62,17 +58,20 @@ jobs:
parameters:
${{ insert }}: ${{ parameters }}
${{ insert }}: ${{ jobParameters }}
platformName: Windows
- ${{ if eq(parameters.pool.os, 'linux') }}:
- ${{ each jobParameters in parameters.linuxJobParameterSets }}:
- ${{ if not(jobParameters.disableJob) }}:
- template: /eng/pipelines/templates/jobs/sdk-build.yml
parameters:
${{ insert }}: ${{ parameters }}
${{ insert }}: ${{ jobParameters }}
platformName: Linux
- ${{ if eq(parameters.pool.os, 'macOS') }}:
- ${{ each jobParameters in parameters.macOSJobParameterSets }}:
- ${{ if not(jobParameters.disableJob) }}:
- template: /eng/pipelines/templates/jobs/sdk-build.yml
parameters:
${{ insert }}: ${{ parameters }}
${{ insert }}: ${{ jobParameters }}
platformName: Mac
Loading