Skip to content

Commit

Permalink
Merge Node20 build configurations (#20819)
Browse files Browse the repository at this point in the history
* Set mergeBase: true in Node20 configs

* Generated output from node make.js

* make-options update

* Skip downgrading check for this PR, as the changes are mechanical only

* Empty-Commit

* Empty-Commit

* merge NuGetCommandV2 changes make-options.json

* update NugetCommandV2

* Trigger Build

* Trigger Build

* pipeline fix

* Fix registry

* Registry fix

* Update package-lock with npm ci to fix cfs issues

* Fix localbuild after cleanup

* Fix package-lock.json sync

* sync correct package.json

* sync package.json

* merge prep

* merge

* deletes

* sync resources

* merge continued

* merge continued

* wip

* cleanup

* add  --no-launch-profile

* merge AzureTestPlanV0

* merge
  • Loading branch information
merlynomsft authored Feb 4, 2025
1 parent 539fe8c commit c7f2ab4
Show file tree
Hide file tree
Showing 12,846 changed files with 148,302 additions and 1,648,839 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
32 changes: 16 additions & 16 deletions BuildConfigGen/Program.cs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Tasks/ANTV1/.npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
scripts-prepend-node-path=true

registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/

always-auth=true
14 changes: 11 additions & 3 deletions Tasks/ANTV1/Tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

824 changes: 532 additions & 292 deletions Tasks/ANTV1/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Tasks/ANTV1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
},
"dependencies": {
"@types/mocha": "^5.2.7",
"@types/node": "^16.11.39",
"@types/node": "^20.3.1",
"azure-pipelines-task-lib": "^4.15.0",
"azure-pipelines-tasks-codecoverage-tools": "2.201.0",
"azure-pipelines-tasks-java-common": "2.198.1",
"xml2js": "^0.6.2"
},
"devDependencies": {
"typescript": "4.0.2"
"typescript": "5.1.6"
}
}
6 changes: 5 additions & 1 deletion Tasks/ANTV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 1,
"Minor": 246,
"Patch": 2
"Patch": 3
},
"demands": [
"ant"
Expand Down Expand Up @@ -257,6 +257,10 @@
"Node16": {
"target": "anttask.js",
"argumentFormat": ""
},
"Node20_1": {
"target": "anttask.js",
"argumentFormat": ""
}
},
"messages": {
Expand Down
6 changes: 5 additions & 1 deletion Tasks/ANTV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 1,
"Minor": 246,
"Patch": 2
"Patch": 3
},
"demands": [
"ant"
Expand Down Expand Up @@ -257,6 +257,10 @@
"Node16": {
"target": "anttask.js",
"argumentFormat": ""
},
"Node20_1": {
"target": "anttask.js",
"argumentFormat": ""
}
},
"messages": {
Expand Down
2 changes: 2 additions & 0 deletions Tasks/AndroidSigningV2/.npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
scripts-prepend-node-path=true

registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/

always-auth=true
31 changes: 25 additions & 6 deletions Tasks/AndroidSigningV2/Tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c7f2ab4

Please sign in to comment.