See if we need a separate package step or not, move into job

Author: nagilson

.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

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