Skip to content

Commit 663e109

Browse files
authored
Merge branch 'main' into copilot/fix-190253
2 parents d227b16 + dafc6c5 commit 663e109

File tree

1,322 files changed

+46226
-14574
lines changed

Some content is hidden

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

1,322 files changed

+46226
-14574
lines changed

.config/guardian/.gdnbaselines

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -296,21 +296,6 @@
296296
"expirationDate": "2025-11-19 21:48:17Z",
297297
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
298298
},
299-
"216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
300-
"signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
301-
"alternativeSignatures": [
302-
"07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
303-
],
304-
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
305-
"memberOf": [
306-
"default"
307-
],
308-
"tool": "binskim",
309-
"ruleId": "BA2008",
310-
"createdDate": "2025-06-02 21:46:49Z",
311-
"expirationDate": "2025-11-19 21:48:17Z",
312-
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
313-
},
314299
"1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef": {
315300
"signature": "1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef",
316301
"alternativeSignatures": [
@@ -326,21 +311,6 @@
326311
"expirationDate": "2025-11-19 21:48:17Z",
327312
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
328313
},
329-
"77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
330-
"signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
331-
"alternativeSignatures": [
332-
"4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
333-
],
334-
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
335-
"memberOf": [
336-
"default"
337-
],
338-
"tool": "binskim",
339-
"ruleId": "BA2008",
340-
"createdDate": "2025-06-02 21:46:49Z",
341-
"expirationDate": "2025-11-19 21:48:17Z",
342-
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
343-
},
344314
"21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101": {
345315
"signature": "21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101",
346316
"alternativeSignatures": [
@@ -416,21 +386,6 @@
416386
"expirationDate": "2025-11-19 21:48:17Z",
417387
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
418388
},
419-
"30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
420-
"signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
421-
"alternativeSignatures": [
422-
"b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
423-
],
424-
"target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
425-
"memberOf": [
426-
"default"
427-
],
428-
"tool": "binskim",
429-
"ruleId": "BA2008",
430-
"createdDate": "2025-06-02 21:46:49Z",
431-
"expirationDate": "2025-11-19 21:48:17Z",
432-
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
433-
},
434389
"d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000": {
435390
"signature": "d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000",
436391
"alternativeSignatures": [
@@ -462,4 +417,4 @@
462417
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
463418
}
464419
}
465-
}
420+
}

.config/guardian/.gdnsuppress

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,36 @@
4141
"default"
4242
],
4343
"createdDate": "2025-03-17 11:52:32Z"
44+
},
45+
"9d60fae9db4b8d511637e4a0f902820fbabf962c64ce2b2b8c8ae54c0c06d3ab": {
46+
"signature": "9d60fae9db4b8d511637e4a0f902820fbabf962c64ce2b2b8c8ae54c0c06d3ab",
47+
"alternativeSignatures": [
48+
"d06382c4909cfa81370526b06d4c47ebdf4425fc0b36053d3f457d5cdf5df8a8"
49+
],
50+
"memberOf": [
51+
"default"
52+
],
53+
"createdDate": "2025-08-06 13:58:56Z"
54+
},
55+
"7f0626fd14d60d2810a8ddfc1e9fdf1563b991dc8e1ac5880eca42449f752e90": {
56+
"signature": "7f0626fd14d60d2810a8ddfc1e9fdf1563b991dc8e1ac5880eca42449f752e90",
57+
"alternativeSignatures": [
58+
"6d3dc1d67e5413347520202ce038daf52825c58099670688103db2661facf187"
59+
],
60+
"memberOf": [
61+
"default"
62+
],
63+
"createdDate": "2025-08-06 13:58:56Z"
64+
},
65+
"40121a40ac42fef69ebcb2b8c2ec7ee659c8d10bc7ab4e95d2a290a48b3d281f": {
66+
"signature": "40121a40ac42fef69ebcb2b8c2ec7ee659c8d10bc7ab4e95d2a290a48b3d281f",
67+
"alternativeSignatures": [
68+
"3f4bc3f870aa2c71232dd65907522d59a1964c148e373105dec71e0d3da9427f"
69+
],
70+
"memberOf": [
71+
"default"
72+
],
73+
"createdDate": "2025-08-06 13:58:56Z"
4474
}
4575
}
4676
}

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/typescript-node:20-bookworm
1+
FROM mcr.microsoft.com/devcontainers/typescript-node:22-bookworm
22

33
ADD install-vscode.sh /root/
44
RUN /root/install-vscode.sh

.eslint-plugin-local/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5+
// @ts-check
56
const glob = require('glob');
67
const path = require('path');
78

89
require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
910

1011
// Re-export all .ts files as rules
12+
/** @type {Record<string, import('@typescript-eslint/utils/dist/ts-eslint').LooseRuleDefinition>} */
1113
const rules = {};
1214
glob.sync(`${__dirname}/*.ts`).forEach((file) => {
1315
rules[path.basename(file, '.ts')] = require(file);

.eslint-plugin-local/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"compilerOptions": {
3-
"target": "es2020",
3+
"target": "es2024",
44
"lib": [
5-
"ES2020"
5+
"ES2024"
66
],
77
"module": "commonjs",
88
"esModuleInterop": true,

.github/CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
# Ensure that Lad and Joao review changes to the Code OSS actions
1+
# GitHub actions required reviewers
2+
.github/workflows/monaco-editor.yml @hediet @alexdima @lszomoru @joaomoreno
3+
.github/workflows/no-package-lock-changes.yml @lszomoru @joaomoreno
4+
.github/workflows/no-yarn-lock-changes.yml @lszomoru @joaomoreno
25
.github/workflows/pr-darwin-test.yml @lszomoru @joaomoreno
36
.github/workflows/pr-linux-cli-test.yml @lszomoru @joaomoreno
47
.github/workflows/pr-linux-test.yml @lszomoru @joaomoreno
58
.github/workflows/pr-node-modules.yml @lszomoru @joaomoreno
69
.github/workflows/pr-win32-test.yml @lszomoru @joaomoreno
710
.github/workflows/pr.yml @lszomoru @joaomoreno
11+
.github/workflows/telemetry.yml @lramos15 @lszomoru @joaomoreno
812

913
# ensure the API police is aware of changes to the vscode-dts file
1014
# this is only about the final API, not about proposed API changes

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
48
---
9+
510
<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
611
<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
712
<!-- 🕮 Read our guide about submitting issues: https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions -->
@@ -19,4 +24,4 @@ Does this issue occur when all extensions are disabled?: Yes/No
1924
Steps to Reproduce:
2025

2126
1.
22-
2.
27+
2.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Copilot Bug report
3+
about: Create a report to help us improve Copilot's chat interface in VS Code
4+
title: ''
5+
labels: chat-ext-issue
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Please search existing issues to avoid creating duplicates -->
11+
<!-- Please attach logs to help us diagnose your issue -->
12+
13+
- Copilot Chat Extension Version:
14+
- VS Code Version:
15+
- OS Version:
16+
- Feature (e.g. agent/edit/ask mode):
17+
- Selected model (e.g. GPT 4.1, Claude 3.7 Sonnet):
18+
- Logs:
19+
20+
Steps to Reproduce:
21+
22+
1.
23+
2.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
47

58
---
69

.github/chatmodes/learn.chatmode.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)