From 4bd59c7dfda0b61fe74b330fb648a0867d9b2f7a Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 10:16:17 -0700 Subject: [PATCH 01/13] Fix whitespace and package name --- .vsts-dnup-ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index f0523037a8d6..c1b0c038f30b 100644 --- a/.vsts-dnup-ci.yml +++ b/.vsts-dnup-ci.yml @@ -84,8 +84,7 @@ extends: ignoreDirectories: artifacts, .packages stages: - ############### BUILD STAGE ############### - ############### WINDOWS ############### + ### Windows ### - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self parameters: pool: @@ -115,11 +114,9 @@ extends: publishRetryConfig: true variables: _SignType: real - - ############### PACKAGE STAGE ############### - - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - - stage: publish - displayName: Publish + ### Packaging ### + - stage: package + displayName: ๐Ÿ“ฆ Package dnup dependsOn: [] jobs: - template: /eng/pipelines/templates/jobs/dnup-library-package.yml@self From 2f8b00be0b0a941e3c35b6d8d5c493bab0ca0f12 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 10:26:50 -0700 Subject: [PATCH 02/13] See if we need a separate package step or not, move into job --- .vsts-dnup-ci.yml | 63 ++++++++++--------- .../templates/jobs/dnup-library-package.yml | 58 +++++++++++++++++ 2 files changed, 91 insertions(+), 30 deletions(-) diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index c1b0c038f30b..1dca7cbce5ee 100644 --- a/.vsts-dnup-ci.yml +++ b/.vsts-dnup-ci.yml @@ -84,36 +84,39 @@ extends: ignoreDirectories: artifacts, .packages stages: - ### Windows ### - - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self - parameters: - pool: - name: $($(DncEngInternalBuildPool)) - image: windows.vs2022.amd64 - os: windows - emoji: ๐ŸชŸ - helixTargetQueue: windows.amd64.vs2022.pre - oneESCompat: - templateFolderName: templates-official - publishTaskPrefix: 1ES. - runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - # WORKAROUND: BinSkim requires the folder exist prior to scanning. - preSteps: - - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force - displayName: Create artifacts/bin directory - ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: - timeoutInMinutes: 180 - windowsJobParameterSets: - ### OFFICIAL ### - - categoryName: Official - publishArgument: $(_publishArgument) - signArgument: $(_signArgument) - officialBuildProperties: $(_officialBuildProperties) /p:BuildWorkloads=true - enableDefaultArtifacts: true - runTests: false - publishRetryConfig: true - variables: - _SignType: real + - stage: tests + displayName: ๐Ÿงช dnup tests + jobs: + ### Windows ### + - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self + parameters: + pool: + name: $(DncEngInternalBuildPool) + image: windows.vs2022.amd64 + os: windows + emoji: ๐ŸชŸ + helixTargetQueue: windows.amd64.vs2022.pre + oneESCompat: + templateFolderName: templates-official + publishTaskPrefix: 1ES. + runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + # WORKAROUND: BinSkim requires the folder exist prior to scanning. + preSteps: + - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force + displayName: Create artifacts/bin directory + ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: + timeoutInMinutes: 180 + windowsJobParameterSets: + ### OFFICIAL ### + - categoryName: Official + publishArgument: $(_publishArgument) + signArgument: $(_signArgument) + officialBuildProperties: $(_officialBuildProperties) /p:BuildWorkloads=true + enableDefaultArtifacts: true + runTests: false + publishRetryConfig: true + variables: + _SignType: real ### Packaging ### - stage: package displayName: ๐Ÿ“ฆ Package dnup diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index e69de29bb2d1..2f79e79ed5ed 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -0,0 +1,58 @@ +parameters: + ### GENERAL ### + variables: {} + dependsOn: '' + helixTargetQueue: '' + oneESCompat: + templateFolderName: templates + publishTaskPrefix: '' + container: '' + helixTargetContainer: '' + categoryName: dnup + runTests: true + publishRetryConfig: false + publishXunitResults: false + enableSbom: true + timeoutInMinutes: 150 + +jobs: +- template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml + parameters: + displayName: '${{ parameters.pool.emoji }} dnup package: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})' + pool: ${{ parameters.pool }} + container: ${{ parameters.container }} + strategy: ${{ parameters.strategy }} + helixRepo: dotnet/sdk + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + enableMicrobuild: true + enablePublishBuildAssets: true + enableTelemetry: true + enablePublishUsingPipelines: true + enableSbom: ${{ parameters.enableSbom }} + variables: + - ${{ insert }}: ${{ parameters.variables }} + dependsOn: ${{ parameters.dependsOn }} + preSteps: ${{ parameters.preSteps }} + templateContext: + sdl: + binskim: + analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;-:f|artifacts\bin\**\capstone.dll; + + steps: + - ${{ if eq(parameters.pool.os, 'windows') }}: + - powershell: | + & .\restore.cmd + displayName: ๐Ÿฑ Bootstrap toolset (Windows) + - powershell: | + & .\.dotnet\dotnet restore test\dnup.Tests\dnup.Tests.csproj + displayName: โ™ป๏ธ Restore dnup tests (Windows) + - powershell: | + & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore + displayName: ๐Ÿ’ป Build Windows + - task: PublishBuildArtifacts@1 + displayName: โฌ‡๏ธ Publish test artifacts + condition: always() + inputs: + PathtoPublish: $(Build.SourcesDirectory)/artifacts/dnupTestResults + ArtifactName: dnupTestResults_${{ parameters.pool.os }} + publishLocation: Container From 53ecd31ce02c7ae62141148e9b5e8d3b550d90b3 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 10:28:25 -0700 Subject: [PATCH 03/13] Don't publish any artifact, not allowed as build artifact --- eng/pipelines/templates/jobs/dnup-library-package.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index 2f79e79ed5ed..f875e97249cb 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -49,10 +49,3 @@ jobs: - powershell: | & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore displayName: ๐Ÿ’ป Build Windows - - task: PublishBuildArtifacts@1 - displayName: โฌ‡๏ธ Publish test artifacts - condition: always() - inputs: - PathtoPublish: $(Build.SourcesDirectory)/artifacts/dnupTestResults - ArtifactName: dnupTestResults_${{ parameters.pool.os }} - publishLocation: Container From aece033f232cb7de267ab9a4b1dc046856356f68 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 10:47:37 -0700 Subject: [PATCH 04/13] use pipeline artifact output --- eng/pipelines/templates/jobs/dnup-tests.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/templates/jobs/dnup-tests.yml b/eng/pipelines/templates/jobs/dnup-tests.yml index 0477def2d581..4b670eac75cb 100644 --- a/eng/pipelines/templates/jobs/dnup-tests.yml +++ b/eng/pipelines/templates/jobs/dnup-tests.yml @@ -37,6 +37,13 @@ jobs: sdl: binskim: analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;-:f|artifacts\bin\**\capstone.dll; + outputs: + - output: pipelineArtifact + displayName: '๐ŸŒ Publish Test Artifacts' + condition: always() + targetPath: '$(Build.SourcesDirectory)/artifacts/dnupTestResults' + artifactName: 'dnupTestResults_${{ parameters.pool.os }}' + publishLocation: Container steps: - ${{ if eq(parameters.pool.os, 'windows') }}: @@ -79,10 +86,3 @@ jobs: testResultsFiles: '**/dnup-tests.trx' searchFolder: $(Build.SourcesDirectory)/artifacts/dnupTestResults testRunTitle: 'dnup ${{ parameters.pool.os }}' - - task: PublishBuildArtifacts@1 - displayName: โฌ‡๏ธ Publish test artifacts - condition: always() - inputs: - PathtoPublish: $(Build.SourcesDirectory)/artifacts/dnupTestResults - ArtifactName: dnupTestResults_${{ parameters.pool.os }} - publishLocation: Container From 4a81551d37e9c5da1e3d09d88f3db5a76bac05eb Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 10:58:40 -0700 Subject: [PATCH 05/13] Create dnup library package --- eng/pipelines/templates/jobs/dnup-library-package.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index f875e97249cb..2cf2289785d8 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -37,6 +37,13 @@ jobs: sdl: binskim: analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;-:f|artifacts\bin\**\capstone.dll; + outputs: + - output: pipelineArtifact + displayName: '๐ŸŒ Publish dnup library package' + condition: always() + targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/' + artifactName: 'Microsoft.Dotnet.Installation.1.0.0-alpha.nupkg' # TODO: Replace hard-coded with * or version + publishLocation: Container steps: - ${{ if eq(parameters.pool.os, 'windows') }}: @@ -49,3 +56,6 @@ jobs: - powershell: | & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore displayName: ๐Ÿ’ป Build Windows + - powershell: | + & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj + displayName: ๐Ÿ“ฆ Package dnup library From 66d859ba71d10dcdc23a17e351fe7d77064233a1 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 11:25:08 -0700 Subject: [PATCH 06/13] Create separate arcade build script package step --- .vsts-dnup-ci.yml | 6 ++++++ .../templates/jobs/dnup-library-package.yml | 21 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index 1dca7cbce5ee..ac1e3edff3e5 100644 --- a/.vsts-dnup-ci.yml +++ b/.vsts-dnup-ci.yml @@ -44,11 +44,17 @@ variables: value: -publish - name: _signArgument value: -sign /p:SignCoreSdk=true +- name: _TeamName + value: DotNet-Cli +- name: _BuildConfig + value: Release - name: _officialBuildProperties # The OfficialBuilder property is set to Microsoft for the official build only. # This property is checked in Directory.Build.props and adds the MICROSOFT_ENABLE_TELEMETRY constant. # This constant is used in CompileOptions.cs to set both TelemetryOptOutDefault and TelemetryOptOutDefaultString. value: /p:DotNetPublishUsingPipelines=true /p:OfficialBuilder=Microsoft /p:OfficialBuildId=$(Build.BuildNumber) +- name: _SignType + value: real resources: repositories: diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index 2cf2289785d8..e7392eb234a7 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -39,11 +39,17 @@ jobs: analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;-:f|artifacts\bin\**\capstone.dll; outputs: - output: pipelineArtifact - displayName: '๐ŸŒ Publish dnup library package' + displayName: '๐ŸŒ Publish dnup library package from standard ci' condition: always() targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/' artifactName: 'Microsoft.Dotnet.Installation.1.0.0-alpha.nupkg' # TODO: Replace hard-coded with * or version publishLocation: Container + - output: pipelineArtifact + displayName: '๐ŸŒ Publish dnup library package from Arcade' + condition: always() + targetPath: ' $(System.DefaultWorkingDirectory)/artifacts/packages/Release/Shipping/' + artifactName: 'Microsoft.Dotnet.Installation.1.0.0-alpha.nupkg' # TODO: Replace hard-coded with * or version + publishLocation: Container steps: - ${{ if eq(parameters.pool.os, 'windows') }}: @@ -59,3 +65,16 @@ jobs: - powershell: | & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj displayName: ๐Ÿ“ฆ Package dnup library + - powershell: >- + eng/common/build.ps1 + -restore -build -sign -pack -publish -ci + -verbosity detailed + -binaryLog + -configuration $(_BuildConfig) + -projects src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj;src\Installer\dnup\dnup.csproj + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=true + /p:OfficialBuildId=$(OfficialBuildId) + /p:StabilizePackageVersion=${{ parameters.stabilizePackageVersion }} + displayName: ๐Ÿ“ฆ Package dnup library (arcade) From bcf010dfb43754c922c25a9a225617e6d782af7d Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 27 Oct 2025 11:29:45 -0700 Subject: [PATCH 07/13] Add link to build def id --- .vsts-dnup-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index ac1e3edff3e5..828824581a31 100644 --- a/.vsts-dnup-ci.yml +++ b/.vsts-dnup-ci.yml @@ -1,4 +1,4 @@ -# Pipeline: https://dev.azure.com/dnceng/internal/_build?definitionId= +# Pipeline: https://dev.azure.com/dnceng/internal/_build?definitionId=1544 trigger: batch: true From 7d9979bbfea25f9d9276607c477c288bc6762e5b Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 12:20:58 -0700 Subject: [PATCH 08/13] Produce all packages and separate them based on arcade build --- eng/pipelines/templates/jobs/dnup-library-package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index e7392eb234a7..c19368317d0b 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -39,16 +39,16 @@ jobs: analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;-:f|artifacts\bin\**\capstone.dll; outputs: - output: pipelineArtifact - displayName: '๐ŸŒ Publish dnup library package from standard ci' + displayName: '๐ŸŒ Publish dnup library packages' condition: always() targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/' - artifactName: 'Microsoft.Dotnet.Installation.1.0.0-alpha.nupkg' # TODO: Replace hard-coded with * or version + artifactName: 'dnup-library-packages' publishLocation: Container - output: pipelineArtifact - displayName: '๐ŸŒ Publish dnup library package from Arcade' + displayName: '๐ŸŒ Publish dnup library packages (Arcade)' condition: always() - targetPath: ' $(System.DefaultWorkingDirectory)/artifacts/packages/Release/Shipping/' - artifactName: 'Microsoft.Dotnet.Installation.1.0.0-alpha.nupkg' # TODO: Replace hard-coded with * or version + targetPath: '$(System.DefaultWorkingDirectory)/artifacts/packages/Release/Shipping/' + artifactName: 'dnup-library-packages-arcade' publishLocation: Container steps: From af89b4f563bbab5a2661082c20a2f2cd87f117e2 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 12:46:30 -0700 Subject: [PATCH 09/13] remove arcade logic - it looks like it's trying to sign without arcade, but the signing step fails because its not a release/* branch --- .../templates/jobs/dnup-library-package.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index c19368317d0b..80d4867d6431 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -44,12 +44,6 @@ jobs: targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/' artifactName: 'dnup-library-packages' publishLocation: Container - - output: pipelineArtifact - displayName: '๐ŸŒ Publish dnup library packages (Arcade)' - condition: always() - targetPath: '$(System.DefaultWorkingDirectory)/artifacts/packages/Release/Shipping/' - artifactName: 'dnup-library-packages-arcade' - publishLocation: Container steps: - ${{ if eq(parameters.pool.os, 'windows') }}: @@ -65,16 +59,3 @@ jobs: - powershell: | & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj displayName: ๐Ÿ“ฆ Package dnup library - - powershell: >- - eng/common/build.ps1 - -restore -build -sign -pack -publish -ci - -verbosity detailed - -binaryLog - -configuration $(_BuildConfig) - -projects src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj;src\Installer\dnup\dnup.csproj - /p:DotNetSignType=$(_SignType) - /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=true - /p:OfficialBuildId=$(OfficialBuildId) - /p:StabilizePackageVersion=${{ parameters.stabilizePackageVersion }} - displayName: ๐Ÿ“ฆ Package dnup library (arcade) From 44ccd0c6ff4014722175f517640d18543afb99e5 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 12:54:37 -0700 Subject: [PATCH 10/13] No need to restore in CI --- eng/pipelines/templates/jobs/dnup-library-package.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup-library-package.yml index 80d4867d6431..d061b4613dbf 100644 --- a/eng/pipelines/templates/jobs/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup-library-package.yml @@ -51,10 +51,7 @@ jobs: & .\restore.cmd displayName: ๐Ÿฑ Bootstrap toolset (Windows) - powershell: | - & .\.dotnet\dotnet restore test\dnup.Tests\dnup.Tests.csproj - displayName: โ™ป๏ธ Restore dnup tests (Windows) - - powershell: | - & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore + & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release displayName: ๐Ÿ’ป Build Windows - powershell: | & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj From 1f6af14260b0f5d0c8a7d0bdd13d5643f507d57c Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 13:25:21 -0700 Subject: [PATCH 11/13] Move dnup templates into dnup folder --- .vsts-dnup-ci.yml | 4 ++-- .vsts-dnup-pr.yml | 8 ++++---- .../templates/jobs/{ => dnup}/dnup-library-package.yml | 0 eng/pipelines/templates/jobs/{ => dnup}/dnup-tests.yml | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename eng/pipelines/templates/jobs/{ => dnup}/dnup-library-package.yml (100%) rename eng/pipelines/templates/jobs/{ => dnup}/dnup-tests.yml (100%) diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index 828824581a31..6af482154a3c 100644 --- a/.vsts-dnup-ci.yml +++ b/.vsts-dnup-ci.yml @@ -94,7 +94,7 @@ extends: displayName: ๐Ÿงช dnup tests jobs: ### Windows ### - - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self + - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self parameters: pool: name: $(DncEngInternalBuildPool) @@ -128,7 +128,7 @@ extends: displayName: ๐Ÿ“ฆ Package dnup dependsOn: [] jobs: - - template: /eng/pipelines/templates/jobs/dnup-library-package.yml@self + - template: /eng/pipelines/templates/jobs/dnup/dnup-library-package.yml@self parameters: pool: name: $(DncEngInternalBuildPool) diff --git a/.vsts-dnup-pr.yml b/.vsts-dnup-pr.yml index 7b58f5f735c0..2b95f63586cf 100644 --- a/.vsts-dnup-pr.yml +++ b/.vsts-dnup-pr.yml @@ -29,7 +29,7 @@ stages: displayName: ๐Ÿฐ dnup tests jobs: ############### WINDOWS ############### - - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self + - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self parameters: pool: name: $(DncEngPublicBuildPool) @@ -39,7 +39,7 @@ stages: helixTargetQueue: windows.amd64.vs2022.pre.open ############### LINUX ############### - - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self + - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self parameters: pool: name: $(DncEngPublicBuildPool) @@ -49,7 +49,7 @@ stages: helixTargetQueue: ubuntu.2204.amd64.open ############### MACOS ############### - - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self + - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self parameters: pool: name: Azure Pipelines @@ -60,7 +60,7 @@ stages: ### ARM64 ### - ${{ if eq(parameters.enableArm64Job, true) }}: - - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self + - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self parameters: pool: name: Azure Pipelines diff --git a/eng/pipelines/templates/jobs/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml similarity index 100% rename from eng/pipelines/templates/jobs/dnup-library-package.yml rename to eng/pipelines/templates/jobs/dnup/dnup-library-package.yml diff --git a/eng/pipelines/templates/jobs/dnup-tests.yml b/eng/pipelines/templates/jobs/dnup/dnup-tests.yml similarity index 100% rename from eng/pipelines/templates/jobs/dnup-tests.yml rename to eng/pipelines/templates/jobs/dnup/dnup-tests.yml From 423a7d0b9e02f444ba877ecc24ac7133c99f59e5 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 13:27:06 -0700 Subject: [PATCH 12/13] Disable SDK CI on dnup/release branch checks if only dnup code changes need to confirm if we change sdk code that things still run for the sdk code. --- .vsts-pr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index a0ce56e66843..6ac53bd7ebb9 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -13,6 +13,11 @@ pr: - documentation/* - README.md - CODEOWNERS + - .vsts-dnup-ci.yml + - .vsts-dnup-pr.yml + - /eng/pipelines/templates/jobs/dnup/* + - src/Installer/* + - test/dnup.Tests/* parameters: - name: enableArm64Job From 9f1a36cd2064d5778d7f95c4c5e38ad9e88f79dd Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 14:08:37 -0700 Subject: [PATCH 13/13] add release/dnup --- .vsts-dnup-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-dnup-pr.yml b/.vsts-dnup-pr.yml index 2b95f63586cf..be58e8dfa3a2 100644 --- a/.vsts-dnup-pr.yml +++ b/.vsts-dnup-pr.yml @@ -6,6 +6,7 @@ pr: branches: include: - dnup + - release/dnup paths: include: - src/Installer/dnup/