Skip to content

Commit cc8e74d

Browse files
Merge branch 'master' into upgrade-node-20
2 parents 3eda1ea + 585e4db commit cc8e74d

File tree

4 files changed

+32
-27
lines changed

4 files changed

+32
-27
lines changed

.azure-pipelines/azure-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extends:
3737
# baselineFile: $(Build.SourcesDirectory)/.gdn/.gdnbaselines
3838
pool:
3939
name: 1ES-ABTT-Shared-Pool
40-
image: abtt-windows-2022
40+
image: abtt-windows-2025
4141
os: windows
4242
stages:
4343
- stage: stage

.azure-pipelines/release-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extends:
1919

2020
pool:
2121
name: 1ES-ABTT-Shared-Pool
22-
image: abtt-windows-2022
22+
image: abtt-windows-2025
2323
os: windows
2424
stages:
2525
- stage: Build

package-lock.json

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,18 @@
3434
"test:extension-server-integration": "npm run build:tests && mocha \"_tests/tests/extension-server-integration-tests.js\"",
3535
"test:extension-consolidated": "npm run test:extension-local && npm run test:extension-server-integration"
3636
},
37+
"overrides": {
38+
"archiver-utils": {
39+
"glob": "^10.5.0"
40+
}
41+
},
3742
"dependencies": {
3843
"app-root-path": "1.0.0",
3944
"archiver": "^7.0.1",
4045
"azure-devops-node-api": "^14.0.0",
4146
"clipboardy": "^4.0.0",
4247
"colors": "~1.3.0",
43-
"glob": "^11.0.3",
48+
"glob": "^11.1.0",
4449
"jju": "^1.4.0",
4550
"json-in-place": "^1.0.1",
4651
"jszip": "^3.10.1",

0 commit comments

Comments
 (0)