Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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
jkoritzinsky merged 7 commits into from
Oct 6, 2023
Merged

Convert AllConfigurations and NETFX jobs to use the global build templates #93082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6f69b7
Move AllConfigurations build in PR to use the global build template.
jkoritzinsky Oct 4, 2023
a1694d8
Move .NETFX job to also use the global build templates.
jkoritzinsky Oct 5, 2023
5a8b69c
Fix remaining cases of extraStepsTemplates (including typos)
jkoritzinsky Oct 5, 2023
beff7df
We'll never call run-test-job with the net48 framework (we run tests …
jkoritzinsky Oct 5, 2023
0dc2fb9
Pass BuildTargetFramework for netfx test runs
jkoritzinsky Oct 5, 2023
042d258
Remove specified-by-default -restore and -build
jkoritzinsky Oct 5, 2023
0e2b741
Add back the dependency on the libraries build job.
jkoritzinsky Oct 6, 2023
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: 10 additions & 3 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/libraries/build-job.yml
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: Release
platforms:
- windows_x64
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
framework: net48
runTests: true
testScope: innerloop
buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
nameSuffix: Libraries_NET48
timeoutInMinutes: 150
postBuildSteps:
- template: /eng/pipelines/libraries/helix.yml
parameters:
creator: dotnet-bot
testRunNamePrefixSuffix: NET48_$(_BuildConfig)
extraHelixArguments: /p:BuildTargetFramework=net48
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/global-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
- SourceBuild_linux_x64
jobParameters:
nameSuffix: PortableSourceBuild
extraStepsParameters:
name: SourceBuildPackages
timeoutInMinutes: 95
condition:
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)
1 change: 0 additions & 1 deletion eng/pipelines/installer/jobs/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
container: ''
buildSteps: []
dependsOn: []
dependsOnGlobalBuild: false
dependOnEvaluatePaths: false
globalBuildSuffix: ''
variables: []
Expand Down
16 changes: 2 additions & 14 deletions eng/pipelines/libraries/base-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
osSubgroup: ''
crossBuild: false
framework: 'net9.0'
isOfficialAllConfigurations: false
isSourceBuild: false
liveRuntimeBuildConfig: ''
runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
- template: /eng/common/templates/job/job.yml
parameters:
${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
- _finalFrameworkArg: -framework ${{ parameters.framework }}
- _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

- ${{ if eq(parameters.framework, 'allConfigurations') }}:
- _finalFrameworkArg: -allConfigurations
- _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

- ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
- librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

- ${{ if eq(parameters.isOfficialBuild, true) }}:
- _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down
118 changes: 26 additions & 92 deletions eng/pipelines/libraries/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
crossBuild: false
framework: 'net9.0'
isOfficialBuild: false
isOfficialAllConfigurations: false
runtimeVariant: ''
platform: ''

# When set to a non-empty value (Debug / Release), it determines the runtime's
# build configuration to use for building libraries and tests. Setting this
# property implies a dependency of this job on the appropriate runtime build
# and is used to construct the name of the Azure artifact representing
# runtime build to use for building the libraries and library tests.
liveRuntimeBuildConfig: ''
runtimeFlavor: 'coreclr'
testScope: ''

timeoutInMinutes: 150
preBuildSteps: []
container: ''
condition: true
dependOnEvaluatePaths: false
disableComponentGovernance: false
shouldContinueOnError: false
variables: {}
pool: ''
# Run tests as part of the build job (instead of running them in a separate job)
runTests: false
# Package up the test builds so they can be sent to Helix
useHelix: true
testScope: ''

jobs:
- template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
crossBuild: ${{ parameters.crossBuild }}
framework: ${{ parameters.framework }}
isOfficialBuild: ${{ parameters.isOfficialBuild }}
isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
runtimeFlavor: ${{ parameters.runtimeFlavor }}
runTests: ${{ parameters.runTests }}
runTests: false
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
preBuildSteps: ${{ parameters.preBuildSteps }}
container: ${{ parameters.container }}
condition: ${{ parameters.condition }}
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
name: build
displayName: 'Build'

${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
dependsOn:
# Use full product dependency for test runs
- ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

variables:
- librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- _subset: tools+libs+libs.tests
- ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
- _subset: tools+libs
- _buildAction: ''
- _additionalBuildArguments: ''
- ${{ parameters.variables }}

# Tests only run for 'allConfiguration' and 'net48' build-jobs
# Only pass -test for when we aren't running tests using Helix.
- ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
- _buildAction: -restore -build -test
- ${{ if eq(parameters.useHelix, true) }}:
- _additionalBuildArguments: /p:ArchiveTests=true

- _additionalBuildArguments: '/p:ArchiveTests=true'
- ${{ parameters.variables }}

steps:
- ${{ if eq(parameters.isOfficialBuild, true) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml

- ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
df -h
displayName: Disk Usage after Build

- ${{ if eq(parameters.runTests, false) }}:
- template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
parameters:
isOfficialBuild: ${{ parameters.isOfficialBuild }}

- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
includeRootFolder: false
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: $(librariesBuildArtifactName)
displayName: Build Assets

# Upload test assets if we are sending tests to Helix and not running them directly in this job.
- ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: $(Build.SourcesDirectory)/artifacts/helix
includeRootFolder: true
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: $(librariesTestsArtifactName)
displayName: Test Assets

# Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
# platform-specific jobs' nupkgs automatically flow through the matching platform-specific
# Installer build, but AllConfigurations should only be uploaded once, here.
- ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
parameters:
name: Libraries_AllConfigurations
publishPackagesCondition: >-
or(
eq(variables['_librariesBuildProducedPackages'], true),
eq(variables['Build.SourceBranchName'], 'main'),
eq(variables['System.PullRequest.TargetBranch'], 'main'))

- ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
- template: /eng/pipelines/libraries/helix.yml
parameters:
osGroup: ${{ parameters.osGroup }}
targetRid: ${{ parameters.targetRid }}
archType: ${{ parameters.archType }}
buildConfig: ${{ parameters.buildConfig }}
helixQueues: ${{ parameters.helixQueues }}
testScope: ${{ parameters.testScope }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
creator: dotnet-bot
testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
extraHelixArguments: $(_extraHelixArguments)
- template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
includeRootFolder: false
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: $(librariesBuildArtifactName)
displayName: Build Assets

# Upload test assets
# We'll pull them down in another job to send to Helix
- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: $(Build.SourcesDirectory)/artifacts/helix
includeRootFolder: true
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: $(librariesTestsArtifactName)
displayName: Test Assets
5 changes: 2 additions & 3 deletions eng/pipelines/libraries/run-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
- ${{ if ne(parameters.dependsOn[0], '') }}:
- ${{ parameters.dependsOn }}
- ${{ if eq(parameters.dependsOn[0], '') }}:
- ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
- ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
- ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
# SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
SpmiLogsLocation: $(SpmiLogsLocation)
SuperPmiMcsPath: $(SuperPmiMcsPath)
PythonScript: $(PythonScript)
PipScript: $(PipScript)
PipScript: $(PipScript)
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-android-grpc-client-tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
timeoutInMinutes: 180
# extra steps, run tests
extraStepsTemplats:
postBuildSteps:
- template: /eng/pipelines/libraries/helix.yml
parameters:
creator: dotnet-bot
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-linker-tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
eq(variables['isRollingBuild'], true))
buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
- template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

#
Expand Down
50 changes: 30 additions & 20 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
eq(variables['isRollingBuild'], true))
# extra steps, run tests
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
extraStepsParameters:
creator: dotnet-bot
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
condition: >-
or(
eq(variables['librariesContainsChange'], true),
eq(variables['monoContainsChange'], true),
eq(variables['isRollingBuild'], true))
postBuildSteps:
- template: /eng/pipelines/libraries/helix.yml
parameters:
creator: dotnet-bot
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
condition: >-
or(
eq(variables['librariesContainsChange'], true),
eq(variables['monoContainsChange'], true),
eq(variables['isRollingBuild'], true))

#
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
condition: >-
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

#
# Build and test libraries for .NET Framework
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/libraries/build-job.yml
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: Release
platforms:
- windows_x86
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
framework: net48
runTests: true
testScope: innerloop
buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
nameSuffix: Libraries_NET48
timeoutInMinutes: 150
postBuildSteps:
- template: /eng/pipelines/libraries/helix.yml
parameters:
creator: dotnet-bot
testRunNamePrefixSuffix: NET48_$(_BuildConfig)
extraHelixArguments: /p:BuildTargetFramework=net48
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(variables['isRollingBuild'], true))

#
# Build and test libraries AllConfigurations
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/libraries/build-job.yml
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
platforms:
- windows_x64
jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
- SourceBuild_centos8_x64
jobParameters:
nameSuffix: centos8SourceBuild
extraStepsParameters:
name: SourceBuildPackages
timeoutInMinutes: 95
condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
- SourceBuild_banana24_x64
jobParameters:
nameSuffix: banana24SourceBuild
extraStepsParameters:
name: SourceBuildPackages
timeoutInMinutes: 95
condition: eq(variables['isRollingBuild'], true)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Convert AllConfigurations and NETFX jobs to use the global build templates#93082

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

jkoritzinsky
merged 7 commits into

from

Oct 6, 2023
 Merged


Convert AllConfigurations and NETFX jobs to use the global build templates
#93082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e6f69b7

Move AllConfigurations build in PR to use the global build template.


jkoritzinsky Oct 4, 2023
a1694d8

Move .NETFX job to also use the global build templates.


jkoritzinsky Oct 5, 2023
5a8b69c

Fix remaining cases of extraStepsTemplates (including typos)


jkoritzinsky Oct 5, 2023
beff7df

We'll never call run-test-job with the net48 framework (we run tests …


jkoritzinsky Oct 5, 2023
0dc2fb9

Pass BuildTargetFramework for netfx test runs


jkoritzinsky Oct 5, 2023
042d258

Remove specified-by-default -restore and -build


jkoritzinsky Oct 5, 2023
0e2b741

Add back the dependency on the libraries build job.


jkoritzinsky Oct 6, 2023

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: 10 additions & 3 deletions
eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,15 +75,22 @@ jobs:
# Run net48 tests on win-x64
- template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x64
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand Down

2 changes: 0 additions & 2 deletions
eng/pipelines/global-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,8 +172,6 @@ extends:
 - SourceBuild_linux_x64
 jobParameters:
 nameSuffix: PortableSourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

1 change: 0 additions & 1 deletion
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ parameters:
 container: ''
 buildSteps: []
 dependsOn: []
 dependsOnGlobalBuild: false
 dependOnEvaluatePaths: false
 globalBuildSuffix: ''
 variables: []
Expand Down

16 changes: 2 additions & 14 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ parameters:
 osSubgroup: ''
 crossBuild: false
 framework: 'net9.0'
 isOfficialAllConfigurations: false
 isSourceBuild: false
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
Expand All@@ -28,12 +27,8 @@ parameters:
jobs:
 - template: /eng/common/templates/job/job.yml
 parameters:
 ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
 displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

 enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
 container: ${{ parameters.container }}
Expand DownExpand Up@@ -79,13 +74,6 @@ jobs:
 - _finalFrameworkArg: -framework ${{ parameters.framework }}
 - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}

 - ${{ if eq(parameters.framework, 'allConfigurations') }}:
 - _finalFrameworkArg: -allConfigurations
 - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true

 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations'

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)

Expand Down

118 changes: 26 additions & 92 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,32 +7,18 @@ parameters:
 crossBuild: false
 framework: 'net9.0'
 isOfficialBuild: false
 isOfficialAllConfigurations: false
 runtimeVariant: ''
 platform: ''

 # When set to a non-empty value (Debug / Release), it determines the runtime's
 # build configuration to use for building libraries and tests. Setting this
 # property implies a dependency of this job on the appropriate runtime build
 # and is used to construct the name of the Azure artifact representing
 # runtime build to use for building the libraries and library tests.
 liveRuntimeBuildConfig: ''
 runtimeFlavor: 'coreclr'
 testScope: ''

 timeoutInMinutes: 150
 preBuildSteps: []
 container: ''
 condition: true
 dependOnEvaluatePaths: false
 disableComponentGovernance: false
 shouldContinueOnError: false
 variables: {}
 pool: ''
 # Run tests as part of the build job (instead of running them in a separate job)
 runTests: false
 # Package up the test builds so they can be sent to Helix
 useHelix: true
 testScope: ''

jobs:
 - template: /eng/pipelines/libraries/base-job.yml
Expand All@@ -44,12 +30,9 @@ jobs:
 crossBuild: ${{ parameters.crossBuild }}
 framework: ${{ parameters.framework }}
 isOfficialBuild: ${{ parameters.isOfficialBuild }}
 isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
 liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
 runTests: ${{ parameters.runTests }}
 runTests: false
 timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 preBuildSteps: ${{ parameters.preBuildSteps }}
 container: ${{ parameters.container }}
 condition: ${{ parameters.condition }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand All@@ -60,33 +43,14 @@ jobs:
 name: build
 displayName: 'Build'

 ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
 dependsOn:
 # Use full product dependency for test runs
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - _subset: tools+libs+libs.tests
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, false)) }}:
 - _subset: tools+libs
 - _buildAction: ''
 - _additionalBuildArguments: ''
 - ${{ parameters.variables }}

 # Tests only run for 'allConfiguration' and 'net48' build-jobs
 # Only pass -test for when we aren't running tests using Helix.
 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, false)) }}:
 - _buildAction: -restore -build -test
 - ${{ if eq(parameters.useHelix, true) }}:
 - _additionalBuildArguments: /p:ArchiveTests=true

 - _additionalBuildArguments: '/p:ArchiveTests=true'
 - ${{ parameters.variables }}

 steps:
 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml

 - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }}
 displayName: Install Build Dependencies
Expand All@@ -109,56 +73,26 @@ jobs:
 df -h
 displayName: Disk Usage after Build

 - ${{ if eq(parameters.runTests, false) }}:
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml
 parameters:
 isOfficialBuild: ${{ parameters.isOfficialBuild }}

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets if we are sending tests to Helix and not running them directly in this job.
 - ${{ if and(eq(parameters.runTests, false), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

 # Save AllConfigurations artifacts using the prepare-signed-artifacts format. The
 # platform-specific jobs' nupkgs automatically flow through the matching platform-specific
 # Installer build, but AllConfigurations should only be uploaded once, here.
 - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
 - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
 parameters:
 name: Libraries_AllConfigurations
 publishPackagesCondition: >-
 or(
 eq(variables['_librariesBuildProducedPackages'], true),
 eq(variables['Build.SourceBranchName'], 'main'),
 eq(variables['System.PullRequest.TargetBranch'], 'main'))

 - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 osGroup: ${{ parameters.osGroup }}
 targetRid: ${{ parameters.targetRid }}
 archType: ${{ parameters.archType }}
 buildConfig: ${{ parameters.buildConfig }}
 helixQueues: ${{ parameters.helixQueues }}
 testScope: ${{ parameters.testScope }}
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 creator: dotnet-bot
 testRunNamePrefixSuffix: $(_testRunNamePrefixSuffix)
 extraHelixArguments: $(_extraHelixArguments)
 - template: /eng/pipelines/libraries/prepare-for-bin-publish.yml

 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.ArtifactStagingDirectory)/artifacts
 includeRootFolder: false
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesBuildArtifactName)
 displayName: Build Assets

 # Upload test assets
 # We'll pull them down in another job to send to Helix
 - template: /eng/pipelines/common/upload-artifact-step.yml
 parameters:
 rootFolder: $(Build.SourcesDirectory)/artifacts/helix
 includeRootFolder: true
 archiveType: $(archiveType)
 archiveExtension: $(archiveExtension)
 tarCompression: $(tarCompression)
 artifactName: $(librariesTestsArtifactName)
 displayName: Test Assets

5 changes: 2 additions & 3 deletions
eng/pipelines/libraries/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,8 +68,7 @@ jobs:
 - ${{ if ne(parameters.dependsOn[0], '') }}:
 - ${{ parameters.dependsOn }}
 - ${{ if eq(parameters.dependsOn[0], '') }}:
 - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 # SuperPMI collection needs to run mcs.exe on the AzDO machine. Assume that's an x64 machine, and download an x64 product build if needed.
Expand DownExpand Up@@ -259,4 +258,4 @@ jobs:
 SpmiLogsLocation: $(SpmiLogsLocation)
 SuperPmiMcsPath: $(SuperPmiMcsPath)
 PythonScript: $(PythonScript)
 PipScript: $(PipScript)
 PipScript: $(PipScript)

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-android-grpc-client-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ extends:
 buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunGrpcTestsOnly=true /p:BuildGrpcServerDockerImage=true
 timeoutInMinutes: 180
 # extra steps, run tests
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/runtime-linker-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 buildArgs: -s clr+libs+tools.illink -c $(_BuildConfig)
extraStepsTemplats:
postBuildSteps:
 - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

 #
Expand Down

50 changes: 30 additions & 20 deletions
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -658,15 +658,16 @@ extends:
 eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
 eq(variables['isRollingBuild'], true))
 # extra steps, run tests
 extraStepsTemplate: /eng/pipelines/libraries/helix.yml
 extraStepsParameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 condition: >-
 or(
 eq(variables['librariesContainsChange'], true),
 eq(variables['monoContainsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand DownExpand Up@@ -1107,32 +1108,45 @@ extends:
 condition: >-
 eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true)

 #
 # Build and test libraries for .NET Framework
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: Release
 platforms:
 - windows_x86
 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
 jobParameters:
 framework: net48
 runTests: true
 testScope: innerloop
 buildArgs: -s tools+libs+libs.tests -framework net48 -c $(_BuildConfig) -testscope innerloop /p:ArchiveTests=true
 nameSuffix: Libraries_NET48
 timeoutInMinutes: 150
 postBuildSteps:
 - template: /eng/pipelines/libraries/helix.yml
 parameters:
 creator: dotnet-bot
 testRunNamePrefixSuffix: NET48_$(_BuildConfig)
 extraHelixArguments: /p:BuildTargetFramework=net48
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
 eq(variables['isRollingBuild'], true))

 #
 # Build and test libraries AllConfigurations
 #
 - template: /eng/pipelines/common/platform-matrix.yml
 parameters:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 jobTemplate: /eng/pipelines/common/global-build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - windows_x64
 jobParameters:
framework: allConfigurations
runTests: true
useHelix: false
buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
nameSuffix: Libraries_AllConfigurations
timeoutInMinutes: 150
 condition: >-
 or(
 eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
Expand DownExpand Up@@ -1602,8 +1616,6 @@ extends:
 - SourceBuild_centos8_x64
 jobParameters:
 nameSuffix: centos8SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)

Expand All@@ -1616,7 +1628,5 @@ extends:
 - SourceBuild_banana24_x64
 jobParameters:
 nameSuffix: banana24SourceBuild
 extraStepsParameters:
 name: SourceBuildPackages
 timeoutInMinutes: 95
 condition: eq(variables['isRollingBuild'], true)