Skip to content

Commit c9f2c3c

Browse files
TyriarTyriar
authored
Merge branch 'main' into copilot/fix-253029
2 parents 029d601 + eee3294 commit c9f2c3c

File tree

70 files changed

+1348
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1348
-270
lines changed

‎.github/commands.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -545,47 +545,47 @@
545545
"removeLabel": "~chat-rate-limiting",
546546
"action": "close",
547547
"reason": "not_planned",
548-
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2627. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
548+
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode/issues/253124. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
549549
},
550550
{
551551
"type": "label",
552552
"name": "~chat-request-failed",
553553
"removeLabel": "~chat-request-failed",
554554
"action": "close",
555555
"reason": "not_planned",
556-
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/4332. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
556+
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode/issues/253136. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
557557
},
558558
{
559559
"type": "label",
560560
"name": "~chat-rai-content-filters",
561561
"removeLabel": "~chat-rai-content-filters",
562562
"action": "close",
563563
"reason": "not_planned",
564-
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2625. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
564+
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode/issues/253130. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
565565
},
566566
{
567567
"type": "label",
568568
"name": "~chat-public-code-blocking",
569569
"removeLabel": "~chat-public-code-blocking",
570570
"action": "close",
571571
"reason": "not_planned",
572-
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2626. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
572+
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode/issues/253129. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
573573
},
574574
{
575575
"type": "label",
576576
"name": "~chat-lm-unavailable",
577577
"removeLabel": "~chat-lm-unavailable",
578578
"action": "close",
579579
"reason": "not_planned",
580-
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2116. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
580+
"comment": "This issue is a duplicate of https://github.com/microsoft/vscode/issues/253137. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
581581
},
582582
{
583583
"type": "label",
584584
"name": "~chat-authentication",
585585
"removeLabel": "~chat-authentication",
586586
"action": "close",
587587
"reason": "not_planned",
588-
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode-copilot-release/issues/11078, if the bug you are experiencing is not there, please comment on this closed issue thread so we can re-open it.",
588+
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253132, if the bug you are experiencing is not there, please comment on this closed issue thread so we can re-open it.",
589589
"assign": ["TylerLeonhardt"]
590590
},
591591
{
@@ -594,7 +594,7 @@
594594
"removeLabel": "~chat-no-response-returned",
595595
"action": "close",
596596
"reason": "not_planned",
597-
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode-copilot-release/issues/7034. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
597+
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253126. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
598598
},
599599
{
600600
"type": "label",

‎.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,7 @@
185185
"chat.instructionsFilesLocations": {
186186
".github/instructions": true,
187187
".vscode": true
188-
}
188+
},
189+
"githubPullRequests.codingAgent.enabled": true,
190+
"githubPullRequests.codingAgent.uiIntegration": true
189191
}

‎build/npm/preinstall.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const minorNodeVersion = parseInt(nodeVersion[2]);
99
const patchNodeVersion = parseInt(nodeVersion[3]);
1010

1111
if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
12-
if (majorNodeVersion < 20 || (majorNodeVersion === 20 && minorNodeVersion < 18) || (majorNodeVersion === 20 && minorNodeVersion === 18 && patchNodeVersion < 1)) {
13-
console.error('\x1b[1;31m*** Please use Node.js v20.18.1 or later for development.\x1b[0;0m');
12+
if (majorNodeVersion < 22 || (majorNodeVersion === 22 && minorNodeVersion < 15) || (majorNodeVersion === 22 && minorNodeVersion === 15 && patchNodeVersion < 1)) {
13+
console.error('\x1b[1;31m*** Please use Node.js v22.15.1 or later for development.\x1b[0;0m');
1414
throw new Error();
1515
}
1616
}

‎extensions/css-language-features/package-lock.json

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

‎extensions/css-language-features/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@
994994
]
995995
},
996996
"dependencies": {
997-
"vscode-languageclient": "^10.0.0-next.15",
997+
"vscode-languageclient": "^10.0.0-next.16",
998998
"vscode-uri": "^3.1.0"
999999
},
10001000
"devDependencies": {

‎extensions/css-language-features/server/package-lock.json

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

‎extensions/css-language-features/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"browser": "./dist/browser/cssServerMain",
1212
"dependencies": {
1313
"@vscode/l10n": "^0.0.18",
14-
"vscode-css-languageservice": "^6.3.6",
14+
"vscode-css-languageservice": "^6.3.7",
1515
"vscode-languageserver": "^10.0.0-next.13",
1616
"vscode-uri": "^3.1.0"
1717
},

‎extensions/html-language-features/package-lock.json

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

‎extensions/html-language-features/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
},
260260
"dependencies": {
261261
"@vscode/extension-telemetry": "^0.9.8",
262-
"vscode-languageclient": "^10.0.0-next.15",
262+
"vscode-languageclient": "^10.0.0-next.16",
263263
"vscode-uri": "^3.1.0"
264264
},
265265
"devDependencies": {

‎extensions/html-language-features/server/package-lock.json

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

0 commit comments

Comments
 (0)