Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build/yaml/jobs/codeanalysis/antimalware.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
displayName: Code Analysis - AntiMalware

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/codeanalysis/apiscan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# No dependencies. Requires Build Stages to ensure that binaries are built

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
demands:
- msbuild
- visualstudio
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/codeanalysis/binskim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
# No dependencies. Requires Build Stages to ensure that binaries are built

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/codeanalysis/buildanalyzer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
displayName: Run build analyzer (${{ parameters.Analyzer }}, ${{ parameters.Platform }})

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
demands:
- msbuild
- vstest
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/codeanalysis/policheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
displayName: Code Analysis - PoliCheck

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/codeanalysis/psscriptanalyzer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
displayName: Code Analysis - PSScriptAnalyzer

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/linux/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

pool:
${{ if eq('true', parameters.IsMicroBuildInternal) }}:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
demands:
- msbuild
- vstest
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/postpackage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
Packaging.EnableSBOMSigning: true

pool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable

workspace:
clean: outputs
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/windows/binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

pool:
${{ if eq('true', parameters.IsMicroBuildInternal) }}:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
demands:
- msbuild
- vstest
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/windows/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
${{ insert }}: ${{ parameters.MatrixStrategy }}
pool:
${{ if eq('true', parameters.IsMicroBuildInternal) }}:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
demands:
- msbuild
- vstest
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/jobs/windows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

pool:
${{ if eq('true', parameters.IsMicroBuildInternal) }}:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
demands:
- msbuild
- vstest
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/pipelines/build_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extends:

sdl:
sourceAnalysisPool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows

stages:
Expand Down
4 changes: 2 additions & 2 deletions build/yaml/pipelines/ci_internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ extends:
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
parameters:
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
sdl:
sourceAnalysisPool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
binskim:
enabled: false
Expand Down
4 changes: 2 additions & 2 deletions build/yaml/pipelines/pr_internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ extends:
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
parameters:
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
sdl:
sourceAnalysisPool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
binskim:
enabled: false
Expand Down
4 changes: 2 additions & 2 deletions build/yaml/pipelines/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
sdl:
sourceAnalysisPool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
# This pipeline only consumes already-signed/scanned artifacts and publishes them.
binskim:
Expand Down
6 changes: 4 additions & 2 deletions build/yaml/pipelines/signed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ resources:
extends:
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
parameters:
settings:
networkIsolationPolicy: Permissive,CFSClean2
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
sdl:
sourceAnalysisPool:
name: VSEngSS-MicroBuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
binskim:
scanOutputDirectoryOnly: true # BinSkim will complain about VC.Tools not being Spectre compliant, but we use that for builds. This toggles for BinSkim to only scan the output files/folders.
Expand Down
6 changes: 3 additions & 3 deletions build/yaml/stages/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ stages:
displayName: Approval gate (internal NuGet feed)
environment: CLRIE-Release-Internal-NuGet-Feed
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
templateContext:
type: releaseJob
Expand All @@ -55,7 +55,7 @@ stages:
displayName: Publish NuGets to internal InstrumentationEngine Feed
dependsOn: ApprovalGate
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
templateContext:
inputs:
Expand Down Expand Up @@ -98,7 +98,7 @@ stages:
condition: eq(variables['PromoteToRelease'], 'True')
environment: CLRIE-Release-Promote-Internal-NuGet-Feed
pool:
name: VSEngSS-Microbuild2022-1ES
name: VSEng-MicroBuildVSStable
os: windows
templateContext:
type: releaseJob
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/steps/windows/binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ steps:
displayName: 'Build InstrumentationEngine.sln'
inputs:
solution: InstrumentationEngine.sln
msbuildVersion: 17.0
msbuildVersion: latest
platform: $(Platform)
configuration: $(Configuration)
msbuildArguments: /bl:"$(Build.ArtifactStagingDirectory)\logs\Build_Windows_$(Platform)_$(Configuration).binlog"
Expand Down
2 changes: 1 addition & 1 deletion build/yaml/steps/windows/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ steps:
displayName: 'Build solution InstrumentationEngine.Packages.sln $(Platform)'
inputs:
solution: src/InstrumentationEngine.Packages.sln
msbuildVersion: 17.0
msbuildVersion: latest
platform: $(Platform)
configuration: $(Configuration)
msbuildArguments: '/p:InputBinCfgRoot="${{ parameters.WindowsBinRoot }}" /bl:"$(Build.ArtifactStagingDirectory)\logs\Package_Windows_$(LogPlatform)_$(Configuration).binlog"'
5 changes: 2 additions & 3 deletions build/yaml/steps/windows/vstest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ parameters:
RunTitle: ''

steps:
# https://github.com/microsoft/azure-pipelines-tasks/issues/15537
# Don't specify VsTestVersion
- task: VSTest@2
- task: VSTest@3
displayName: 'Run Tests: $(Platform)\${{ parameters.SubFolder }}*Tests*.dll'
inputs:
vsTestVersion: latest
testAssemblyVer2: '${{ parameters.SubFolder }}*Tests*.dll'
searchFolder: '$(Build.ArtifactStagingDirectory)\binaries-windows-$(Configuration)\$(Platform)'
runInParallel: false
Expand Down
Loading