Skip to content

Commit fdd5e7a

Browse files
tzengshinfutzengshinfu
committed
Merge remote-tracking branch 'upstream/main' into add-options-for-handling-errors-encountered
1 parent fa45d29 commit fdd5e7a

File tree

69 files changed

+10269
-1692
lines changed

Some content is hidden

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

69 files changed

+10269
-1692
lines changed

‎.github/workflows/pr-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
permissions: {}
77

88
env:
9-
NODE_VERSION: 18.17.1
9+
NODE_VERSION: 22.17.0
1010
TEST_RESULTS_DIRECTORY: .
1111
# Force a path with spaces and unicode chars to test extension works in these scenarios
12-
special-working-directory: './🐍 🐛'
13-
special-working-directory-relative: '🐍 🐛'
12+
special-working-directory: './testDir'
13+
special-working-directory-relative: 'testDir'
1414

1515
jobs:
1616
build-vsix:

‎.github/workflows/push-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ on:
1111
permissions: {}
1212

1313
env:
14-
NODE_VERSION: 18.17.1
14+
NODE_VERSION: 22.17.0
1515
TEST_RESULTS_DIRECTORY: .
1616
# Force a path with spaces and unicode chars to test extension works in these scenarios
17-
special-working-directory: './🐍 🐛'
18-
special-working-directory-relative: '🐍 🐛'
17+
special-working-directory: './testDir'
18+
special-working-directory-relative: 'testDir'
1919

2020
jobs:
2121
build-vsix:

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ node_modules
88
bundled/libs/
99
**/__pycache__
1010
**/.pytest_cache
11-
**/.vs
11+
**/.vs
12+
13+
# Generated files (sources live in pre-built/)
14+
l10n/bundle.l10n.*.json
15+
package.nls.*.json
16+
telemetry.json

‎.npmrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Force public npm registry to avoid CI auth (E401) when no token is provided
2+
registry=https://registry.npmjs.org/
3+
# Do not require auth for public installs
4+
always-auth=false

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"request": "launch",
2525
"runtimeExecutable": "${execPath}",
2626
"args": [
27-
"./out/test/**/*.unit.test.js",
2827
"--extensionDevelopmentPath=${workspaceFolder}",
29-
"--extensionTestsPath=${workspaceFolder}/out/test/unittest/index",
30-
//"--grep", "<suite name>",
31-
"--timeout=300000"
28+
"--extensionTestsPath=${workspaceFolder}/out/test/unittest/index"
3229
],
30+
// "env": {
31+
// "TEST_GREP": "Python API Tests"
32+
// },
3333
"outFiles": ["${workspaceFolder}/out/**/*.js"],
3434
"preLaunchTask": "tasks: watch-tests"
3535
}

‎.vscodeignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ build/**
44
out/**
55
node_modules/**
66
src/**
7+
pre-built/**
78
.gitignore
89
.yarnrc
910
webpack.config.js

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ You can reference the table below to find the most recent Python Debugger extens
5353
5454

5555
## Data and telemetry
56-
The Debugpy Extension for Visual Studio Code collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](https://privacy.microsoft.com/privacystatement) to learn more. This extension respects the `telemetry.enableTelemetry` setting which you can learn more about at https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting.
56+
The Debugpy Extension for Visual Studio Code collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](https://privacy.microsoft.com/privacystatement) to learn more. This extension respects the `telemetry.telemetryLevel` setting which you can learn more about at https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting.

‎build/NuGet.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<config>
4+
<add key="repositoryPath" value="NuGetPackages" />
5+
</config>
6+
<packageSources>
7+
<!-- Limit to one feed per 1ES guidance -->
8+
<clear />
9+
<add key="VS-CoreXtFeeds" value="https://pkgs.dev.azure.com/devdiv/_packaging/VS-CoreXtFeeds/nuget/v3/index.json" protocolVersion="3" />
10+
</packageSources>
11+
</configuration>

‎build/azure-devdiv-pipeline.pre-release.yml‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
# Run on a schedule
2+
trigger: none
3+
pr: none
4+
5+
schedules:
6+
- cron: '0 10 * * 1-5' # 10AM UTC (2AM PDT) MON-FRI (VS Code Pre-release builds at 9PM PDT)
7+
displayName: Nightly Pre-Release Schedule
8+
always: false # only run if there are source code changes
9+
branches:
10+
include:
11+
- main
12+
13+
resources:
14+
repositories:
15+
- repository: MicroBuildTemplate
16+
type: git
17+
name: 1ESPipelineTemplates/MicroBuildTemplate
18+
ref: refs/tags/release
19+
variables:
20+
- name: TeamName
21+
value: VSCode-python-debugger
22+
- name: VsixName
23+
value: python-debugger.vsix
24+
- name: AZURE_ARTIFACTS_FEED
25+
value: 'https://devdiv.pkgs.visualstudio.com/DevDiv/_packaging/Pylance_PublicPackages/npm/registry/'
26+
parameters:
27+
- name: publishExtension
28+
displayName: 🚀 Publish Extension
29+
type: boolean
30+
default: false
31+
32+
- name: buildPlatforms
33+
type: object
34+
default:
35+
- name: Linux
36+
vsceTarget: ''
37+
- name: Linux
38+
packageArch: arm64
39+
vsceTarget: linux-arm64
40+
- name: Linux
41+
packageArch: arm
42+
vsceTarget: linux-armhf
43+
- name: Linux
44+
packageArch: x64
45+
vsceTarget: linux-x64
46+
- name: MacOS
47+
packageArch: arm64
48+
vsceTarget: darwin-arm64
49+
- name: MacOS
50+
packageArch: x64
51+
vsceTarget: darwin-x64
52+
- name: Windows
53+
packageArch: arm
54+
vsceTarget: win32-arm64
55+
- name: Windows
56+
packageArch: x64
57+
vsceTarget: win32-x64
58+
59+
- name: buildSteps
60+
type: stepList
61+
default:
62+
- script: npm ci
63+
displayName: Install NPM dependencies
64+
65+
- script: python -m pip install -U pip
66+
displayName: Upgrade pip
67+
68+
- script: python -m pip install wheel
69+
displayName: Install wheel
70+
71+
- script: python -m pip install nox
72+
displayName: Install nox
73+
74+
- script: python -m nox --session install_bundled_libs
75+
displayName: Install Python dependencies
76+
77+
- script: python ./build/update_ext_version.py --for-publishing
78+
displayName: Update build number
79+
80+
- pwsh: Copy-Item -Path "pre-built/*" -Destination "." -Recurse -Force
81+
displayName: Copy pre-built files
82+
83+
- script: npm run package
84+
displayName: Build extension
85+
86+
extends:
87+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
88+
parameters:
89+
sdl:
90+
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
91+
codeSignValidation:
92+
enabled: true
93+
sbom:
94+
enabled: false # Disable global SBOM generation; we'll enable selectively per artifact output
95+
pool:
96+
name: AzurePipelines-EO
97+
os: windows
98+
99+
customBuildTags:
100+
- ES365AIMigrationTooling
101+
stages:
102+
- stage: Build
103+
displayName: Build & Package Extension
104+
jobs:
105+
- template: build/templates/package.yml@self
106+
parameters:
107+
buildPlatforms: ${{ parameters.buildPlatforms }}
108+
buildSteps: ${{ parameters.buildSteps }}
109+
isPreRelease: true
110+
standardizedVersioning: true
111+
112+
- stage: Publish
113+
displayName: Publish Extension
114+
dependsOn: Build
115+
jobs:
116+
- template: build/templates/publish-extension.yml@self
117+
parameters:
118+
buildPlatforms: ${{ parameters.buildPlatforms }}
119+
publishExtension: ${{ parameters.publishExtension }}
120+
preRelease: true
121+
teamName: $(TeamName)
122+
ghCreateTag: true
123+
ghCreateRelease: true
124+
ghReleaseAddChangeLog: true

‎build/azure-devdiv-pipeline.stable.yml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
name: Publish Release
2+
trigger: none
3+
# branches:
4+
# include:
5+
# - release*
6+
# tags:
7+
# include: ['*']
8+
pr: none
9+
10+
resources:
11+
repositories:
12+
- repository: MicroBuildTemplate
13+
type: git
14+
name: 1ESPipelineTemplates/MicroBuildTemplate
15+
ref: refs/tags/release
16+
variables:
17+
- name: TeamName
18+
value: VSCode-python-debugger
19+
- name: VsixName
20+
value: python-debugger.vsix
21+
- name: AZURE_ARTIFACTS_FEED
22+
value: 'https://devdiv.pkgs.visualstudio.com/DevDiv/_packaging/Pylance_PublicPackages/npm/registry/'
23+
24+
parameters:
25+
- name: publishExtension
26+
displayName: 🚀 Publish Extension
27+
type: boolean
28+
default: false
29+
30+
- name: buildPlatforms
31+
type: object
32+
default:
33+
- name: Linux
34+
vsceTarget: ''
35+
- name: Linux
36+
packageArch: arm64
37+
vsceTarget: linux-arm64
38+
- name: Linux
39+
packageArch: arm
40+
vsceTarget: linux-armhf
41+
- name: Linux
42+
packageArch: x64
43+
vsceTarget: linux-x64
44+
- name: MacOS
45+
packageArch: arm64
46+
vsceTarget: darwin-arm64
47+
- name: MacOS
48+
packageArch: x64
49+
vsceTarget: darwin-x64
50+
- name: Windows
51+
packageArch: arm
52+
vsceTarget: win32-arm64
53+
- name: Windows
54+
packageArch: x64
55+
vsceTarget: win32-x64
56+
57+
- name: buildSteps
58+
type: stepList
59+
default:
60+
- script: npm ci
61+
displayName: Install NPM dependencies
62+
63+
- script: python -m pip install -U pip
64+
displayName: Upgrade pip
65+
66+
- script: python -m pip install wheel
67+
displayName: Install wheel
68+
69+
- script: python -m pip install nox
70+
displayName: Install nox
71+
72+
- script: python -m nox --session install_bundled_libs
73+
displayName: Install Python dependencies
74+
75+
- script: python ./build/update_ext_version.py --release --for-publishing
76+
displayName: Update build number
77+
78+
- pwsh: Copy-Item -Path "pre-built/*" -Destination "." -Recurse -Force
79+
displayName: Copy pre-built files
80+
81+
- script: npm run package
82+
displayName: Build extension
83+
84+
extends:
85+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
86+
parameters:
87+
sdl:
88+
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
89+
codeSignValidation:
90+
enabled: true
91+
sbom:
92+
enabled: false # Disable global SBOM generation; we'll enable selectively per artifact output
93+
pool:
94+
name: AzurePipelines-EO
95+
os: windows
96+
97+
customBuildTags:
98+
- ES365AIMigrationTooling
99+
stages:
100+
- stage: Build
101+
displayName: Build & Package Extension
102+
jobs:
103+
- template: build/templates/package.yml@self
104+
parameters:
105+
buildPlatforms: ${{ parameters.buildPlatforms }}
106+
buildSteps: ${{ parameters.buildSteps }}
107+
isPreRelease: false
108+
109+
- stage: Publish
110+
displayName: Publish Extension
111+
dependsOn: Build
112+
jobs:
113+
- template: build/templates/publish-extension.yml@self
114+
parameters:
115+
buildPlatforms: ${{ parameters.buildPlatforms }}
116+
publishExtension: ${{ parameters.publishExtension }}
117+
preRelease: false
118+
teamName: $(TeamName)

0 commit comments

Comments
 (0)