Skip to content

Commit 10d7b01

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [352ae49 from that repo](AArnott/Library.Template@352ae49).
2 parents f9e8de3 + 352ae49 commit 10d7b01

17 files changed

+33
-36
lines changed

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# You can define any steps you want, and they will run before the agent starts.
2727
# If you do not check out your code, Copilot will do this for you.
2828
steps:
29-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
29+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3030
with:
3131
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3232
- name: ⚙ Install prerequisites

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
url: ${{ steps.deployment.outputs.page_url }}
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
27+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
2828
with:
2929
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3030
- name: ⚙ Install prerequisites

.github/workflows/docs_validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: 📚 Doc validation
1414
runs-on: ubuntu-24.04
1515
steps:
16-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
16+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
1717
with:
1818
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1919
- name: 🔗 Markup Link Checker (mlc)

.github/workflows/libtemplate-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: write
1818
pull-requests: write
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
20+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
2121
with:
2222
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
2323

azure-pipelines/BuildStageVariables.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ variables:
22
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
33
BuildConfiguration: Release
44
NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/
5-
codecov_token: bfce293b-9f33-43bb-be7f-c1a4ed2b518d

azure-pipelines/OptProf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ stages:
4343
parameters:
4444
Is1ESPT: false
4545
RealSign: false
46-
windowsPool: VSEngSS-MicroBuild2022-1ES
46+
windowsPool: VSEng-MicroBuildVSStable
4747
EnableMacOSBuild: false
4848
ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }}
4949
IsOptProf: true
@@ -52,7 +52,7 @@ stages:
5252
- stage: QueueVSBuild
5353
jobs:
5454
- job: QueueOptProf
55-
pool: VSEngSS-MicroBuild2022-1ES
55+
pool: VSEng-MicroBuildVSStable
5656
variables:
5757
InsertPayloadName: VS-MEF
5858
InsertTopicBranch: team/VS-IDE/VSMEF-OptProf-run-$(Build.BuildId)

azure-pipelines/archive-sourcecode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ extends:
3838
settings:
3939
networkIsolationPolicy: Permissive,CFSClean
4040
sdl:
41-
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
41+
sourceAnalysisPool: VSEng-MicroBuildVSStable
4242

4343
stages:
4444
- stage: archive

azure-pipelines/build.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ parameters:
104104
- name: windowsPool
105105
type: object
106106
default:
107-
vmImage: windows-2022
107+
vmImage: windows-2025
108108
- name: linuxPool
109109
type: object
110110
default:
111-
vmImage: ubuntu-22.04
111+
vmImage: ubuntu-24.04
112112
- name: macOSPool
113113
type: object
114114
default:
115-
vmImage: macOS-14
115+
vmImage: macOS-15
116116

117117
jobs:
118118
- job: Windows
@@ -194,9 +194,6 @@ jobs:
194194
- powershell: Write-Host "##vso[task.setvariable variable=PROFILINGINPUTSDROPNAME]$(tools/variables/ProfilingInputsDropName.ps1)"
195195
displayName: ⚙ Set ProfilingInputsDropName for optprof
196196

197-
- ${{ if eq(variables['Build.Reason'], 'Schedule') }}:
198-
- template: schedule-only-steps.yml
199-
200197
- template: install-dependencies.yml
201198

202199
- script: dotnet nbgv cloud -ca

azure-pipelines/dotnet.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ steps:
4242
displayName: 📢 Publish artifacts
4343
condition: succeededOrFailed()
4444

45-
- ${{ if and(ne(variables['codecov_token'], ''), parameters.RunTests) }}:
45+
- ${{ if parameters.RunTests }}:
4646
- powershell: |
4747
$ArtifactStagingFolder = & "tools/Get-ArtifactsStagingDirectory.ps1"
4848
$CoverageResultsFolder = Join-Path $ArtifactStagingFolder "coverageResults-$(Agent.JobName)"
49-
tools/publish-CodeCov.ps1 -CodeCovToken "$(codecov_token)" -PathToCodeCoverage "$CoverageResultsFolder" -Name "$(Agent.JobName) Coverage Results" -Flags "$(Agent.JobName)"
49+
tools/publish-CodeCov.ps1 -CodeCovToken "$(CODECOV_TOKEN)" -PathToCodeCoverage "$CoverageResultsFolder" -Name "$(Agent.JobName) Coverage Results" -Flags "$(Agent.JobName)"
5050
displayName: 📢 Publish code coverage results to codecov.io
5151
timeoutInMinutes: 3
5252
continueOnError: true
53+
# Set the CODECOV_TOKEN variable in your Azure Pipeline to enable code coverage reporting
54+
# Get a token from https://codecov.io/
55+
condition: and(succeeded(), ne(variables['CODECOV_TOKEN'], ''))

azure-pipelines/official.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extends:
4949
settings:
5050
networkIsolationPolicy: Permissive,CFSClean
5151
sdl:
52-
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
52+
sourceAnalysisPool: VSEng-MicroBuildVSStable
5353
codeSignValidation:
5454
enabled: true
5555
break: true
@@ -73,15 +73,15 @@ extends:
7373
RealSign: true
7474
ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }}
7575
EnableAPIScan: ${{ parameters.EnableAPIScan }}
76-
windowsPool: VSEngSS-MicroBuild2022-1ES
76+
windowsPool: VSEng-MicroBuildVSStable
7777
linuxPool:
7878
name: AzurePipelines-EO
7979
demands:
8080
- ImageOverride -equals 1ESPT-Ubuntu22.04
8181
os: Linux
8282
macOSPool:
8383
name: Azure Pipelines
84-
vmImage: macOS-14
84+
vmImage: macOS-15
8585
os: macOS
8686
EnableMacOSBuild: ${{ parameters.EnableMacOSBuild }}
8787
RunTests: ${{ parameters.RunTests }}

0 commit comments

Comments
 (0)