Skip to content

Commit 11040f7

Browse files
dibarbetdibarbet
committed
Merge remote-tracking branch 'upstream/prerelease' into merge_prerelease
2 parents 1643b73 + d62d27e commit 11040f7

File tree

13 files changed

+1550
-5893
lines changed

13 files changed

+1550
-5893
lines changed

‎.vscode/launch.json

Lines changed: 33 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
"type": "extensionHost",
77
"request": "launch",
88
"runtimeExecutable": "${execPath}",
9-
"args": [
10-
"--extensionDevelopmentPath=${workspaceRoot}"
11-
],
9+
"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
1210
"sourceMaps": true,
13-
"outFiles": [
14-
"${workspaceRoot}/dist/*.js"
15-
],
11+
"outFiles": ["${workspaceRoot}/dist/*.js"],
1612
"preLaunchTask": "buildDev"
1713
},
1814
{
@@ -26,21 +22,15 @@
2622
"--profile-temp",
2723
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
2824
"--extensionDevelopmentPath=${workspaceRoot}",
29-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests",
25+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
3026
],
3127
"env": {
3228
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
3329
"TEST_FILE_FILTER": "${file}"
3430
},
3531
"sourceMaps": true,
36-
"outFiles": [
37-
"${workspaceRoot}/dist/*.js",
38-
"${workspaceRoot}/out/test/**/*.js"
39-
],
40-
"resolveSourceMapLocations": [
41-
"${workspaceFolder}/**",
42-
"!**/node_modules/**"
43-
],
32+
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
33+
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
4434
"preLaunchTask": "buildDev",
4535
"internalConsoleOptions": "openOnSessionStart"
4636
},
@@ -55,21 +45,15 @@
5545
"--profile-temp",
5646
"${workspaceRoot}/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
5747
"--extensionDevelopmentPath=${workspaceRoot}",
58-
"--extensionTestsPath=${workspaceRoot}/out/test/razorIntegrationTests",
48+
"--extensionTestsPath=${workspaceRoot}/out/test/razorIntegrationTests"
5949
],
6050
"env": {
6151
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
6252
"TEST_FILE_FILTER": "${file}"
6353
},
6454
"sourceMaps": true,
65-
"outFiles": [
66-
"${workspaceRoot}/dist/*.js",
67-
"${workspaceRoot}/out/test/**/*.js"
68-
],
69-
"resolveSourceMapLocations": [
70-
"${workspaceFolder}/**",
71-
"!**/node_modules/**"
72-
],
55+
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
56+
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
7357
"preLaunchTask": "buildDev",
7458
"internalConsoleOptions": "openOnSessionStart"
7559
},
@@ -84,22 +68,16 @@
8468
"--profile-temp",
8569
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/${input:omnisharpAssetName}/.vscode/omnisharp_${input:omnisharpAssetName}.code-workspace",
8670
"--extensionDevelopmentPath=${workspaceRoot}",
87-
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests",
71+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
8872
],
8973
"env": {
9074
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
9175
"OSVC_SUITE": "${input:omnisharpAssetName}",
9276
"TEST_FILE_FILTER": "${file}"
9377
},
9478
"sourceMaps": true,
95-
"outFiles": [
96-
"${workspaceRoot}/dist/*.js",
97-
"${workspaceRoot}/out/test/**/*.js"
98-
],
99-
"resolveSourceMapLocations": [
100-
"${workspaceFolder}/**",
101-
"!**/node_modules/**"
102-
],
79+
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
80+
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
10381
"preLaunchTask": "buildDev"
10482
},
10583
{
@@ -118,17 +96,11 @@
11896
"env": {
11997
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
12098
"OSVC_SUITE": "${input:omnisharpAssetName}",
121-
"TEST_FILE_FILTER": "${file}",
99+
"TEST_FILE_FILTER": "${file}"
122100
},
123101
"sourceMaps": true,
124-
"outFiles": [
125-
"${workspaceRoot}/dist/*.js",
126-
"${workspaceRoot}/out/test/**/*.js"
127-
],
128-
"resolveSourceMapLocations": [
129-
"${workspaceFolder}/**",
130-
"!**/node_modules/**"
131-
],
102+
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
103+
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
132104
"preLaunchTask": "buildDev"
133105
},
134106
{
@@ -137,9 +109,7 @@
137109
"name": "Debug gulp task",
138110
"preLaunchTask": "build",
139111
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
140-
"args": [
141-
"${input:gulpTaskName}"
142-
],
112+
"args": ["${input:gulpTaskName}"],
143113
"cwd": "${workspaceFolder}"
144114
},
145115
{
@@ -148,58 +118,36 @@
148118
"name": "Update OmniSharp package dependencies",
149119
"preLaunchTask": "build",
150120
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
151-
"args": [
152-
"updatePackageDependencies"
153-
],
121+
"args": ["updatePackageDependencies"],
154122
"env": {
155123
"NEW_DEPS_ID": "OmniSharp",
156124
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip",
157125
"OLD_DEPS_VERSION": "1.39.10",
158-
"NEW_DEPS_VERSION": "1.39.11",
126+
"NEW_DEPS_VERSION": "1.39.11"
159127
},
160128
"cwd": "${workspaceFolder}"
161129
},
162130
{
163-
"type": "node",
164-
"request": "launch",
165-
"name": "Update razor package dependencies",
166-
"preLaunchTask": "build",
167-
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
168-
"args": [
169-
"updatePackageDependencies"
170-
],
171-
"env": {
172-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/b23fa3ac36f10300deb05a6f6d705117/razorlanguageserver-linux-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/ef50cb22ece80d50723b2e88dd6cc38c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/0558e8219fe7cad00352ef194c9721dc/razorlanguageserver-linux-musl-x64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/041a5e759efa80ba48dac5e2e686d2b1/razorlanguageserver-linux-x64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/71361816a0db3363b7afcc9f667e034b/razorlanguageserver-osx-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/002f2c48425cfc3f4ab2dcdd95c856e6/razorlanguageserver-osx-x64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/2e78857667b37f4c1dc570b45de5c967/razorlanguageserver-platformagnostic-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/08ae2e66be350ce2c2017fd7eb03978f/razorlanguageserver-win-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/970b8dd2e4a3b9f3487ef4239de68bcf/razorlanguageserver-win-x64-7.0.0-preview.24266.1.zip",
173-
"NEW_DEPS_VERSION": "7.0.0-preview.24266.1",
174-
"NEW_DEPS_ID": "Razor"
175-
},
176-
"cwd": "${workspaceFolder}"
177-
},
178-
{
179-
"type": "node",
180-
"request": "launch",
181-
"name": "Update razor telemetry package dependencies",
182-
"preLaunchTask": "build",
183-
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
184-
"args": [
185-
"updatePackageDependencies"
186-
],
187-
"env": {
188-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/704e369c5905f9ece819ebce77fb78d8/devkittelemetry-linux-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/4049a66147717a53860bbc969bf32faa/devkittelemetry-linux-musl-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/c75e84ff813be5c9833d96dc2066a364/devkittelemetry-linux-musl-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/f58cf629939f0df77d142be881f9e233/devkittelemetry-linux-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/1c912419ea45c8d95cfa28a8a04640dc/devkittelemetry-osx-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/36545ba0998f1fc380e877e38b2f35f1/devkittelemetry-osx-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/0a32698e8ba1ab93489d79f34f8ae8d0/devkittelemetry-platformagnostic-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/4f16ff826fedd33ad80d265c5409588b/devkittelemetry-win-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/5a98d8f4e481dbb7ae3cdb3695b75c46/devkittelemetry-win-x64-7.0.0-preview.24178.4.zip",
189-
"NEW_DEPS_VERSION": "7.0.0-preview.24178.4",
190-
"NEW_DEPS_ID": "RazorTelemetry"
191-
},
192-
"cwd": "${workspaceFolder}"
131+
"type": "node",
132+
"request": "launch",
133+
"name": "Update razor telemetry package dependencies",
134+
"preLaunchTask": "build",
135+
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
136+
"args": ["updatePackageDependencies"],
137+
"env": {
138+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/704e369c5905f9ece819ebce77fb78d8/devkittelemetry-linux-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/4049a66147717a53860bbc969bf32faa/devkittelemetry-linux-musl-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/c75e84ff813be5c9833d96dc2066a364/devkittelemetry-linux-musl-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/f58cf629939f0df77d142be881f9e233/devkittelemetry-linux-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/1c912419ea45c8d95cfa28a8a04640dc/devkittelemetry-osx-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/36545ba0998f1fc380e877e38b2f35f1/devkittelemetry-osx-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/0a32698e8ba1ab93489d79f34f8ae8d0/devkittelemetry-platformagnostic-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/4f16ff826fedd33ad80d265c5409588b/devkittelemetry-win-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/5a98d8f4e481dbb7ae3cdb3695b75c46/devkittelemetry-win-x64-7.0.0-preview.24178.4.zip",
139+
"NEW_DEPS_VERSION": "7.0.0-preview.24178.4",
140+
"NEW_DEPS_ID": "RazorTelemetry"
141+
},
142+
"cwd": "${workspaceFolder}"
193143
},
194144
{
195145
"type": "node",
196146
"request": "launch",
197147
"name": "Generate debugger options schema",
198148
"preLaunchTask": "build",
199149
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
200-
"args": [
201-
"generateOptionsSchema"
202-
],
150+
"args": ["generateOptionsSchema"],
203151
"cwd": "${workspaceFolder}"
204152
},
205153
{
@@ -208,9 +156,7 @@
208156
"name": "Razor integration tests",
209157
"preLaunchTask": "build",
210158
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
211-
"args": [
212-
"test:razorintegration"
213-
],
159+
"args": ["test:razorintegration"],
214160
"cwd": "${workspaceFolder}"
215161
}
216162
],
@@ -219,18 +165,12 @@
219165
"id": "omnisharpAssetName",
220166
"description": "The name of the asset folder to use for the OmniSharp integration test.",
221167
"type": "pickString",
222-
"options": [
223-
"singleCsproj",
224-
"BasicRazorApp2_1",
225-
"slnWithCsproj",
226-
"slnFilterWithCsproj",
227-
"slnWithGenerator"
228-
]
168+
"options": ["singleCsproj", "BasicRazorApp2_1", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
229169
},
230170
{
231171
"id": "gulpTaskName",
232172
"description": "The name of the gulp task to debug",
233-
"type": "promptString",
173+
"type": "promptString"
234174
}
235175
]
236176
}

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# Latest
7+
* Improve reliability of documentation comment auto insertion (PR: [#7230](https://github.com/dotnet/vscode-csharp/pull/7230))
8+
* Update Roslyn to 4.11.0-3.24313.9 (PR: [#7234](https://github.com/dotnet/vscode-csharp/pull/7234))
9+
* Fix issue serializing exceptions (PR: [#73851](https://github.com/dotnet/roslyn/pull/73851))
10+
* Cache the last string's hash to improve cpu cost in solution load (PR: [#73937](https://github.com/dotnet/roslyn/pull/73937))
11+
* Improve EnC log messages (PR: [#73919](https://github.com/dotnet/roslyn/pull/73919))
12+
* Reduce allocations in PENamespaceSymbol.GetMembers() (PR: [#73794](https://github.com/dotnet/roslyn/pull/73794))
13+
* Change global option change notification to batch all option changes (PR: [#73882](https://github.com/dotnet/roslyn/pull/73882))
14+
* Update msbuild version to 17.3.4 (PR: [#73283](https://github.com/dotnet/roslyn/pull/73283))
15+
* Update XAML tools to 17.11.35013.26 (PR: [#7233](https://github.com/dotnet/vscode-csharp/pull/7233))
16+
* Fixes AutoInsert in MAUI
17+
* Support GUID properties when parsing XAML
18+
* Improve support for x:DataType in MAUI
19+
* Update Razor to 9.0.0-preview.24311.4 (PR: [#7225](https://github.com/dotnet/vscode-csharp/pull/7225))
20+
* Fix Parsing regression from 8.0.205, commas after @ character
21+
* Improve diagnostic reliability for js/ts
22+
* Fix tooling for projects that don't use the razor sdk
23+
* Update debugger packages to v2.34.1. (PR: [#7224](https://github.com/dotnet/vscode-csharp/pull/7224))
24+
25+
# 2.34.10
726
* Update Roslyn to 4.11.0-3.24307.2 (PR: [#7211](https://github.com/dotnet/vscode-csharp/pull/7211))
827
* Avoid writing analyzer shadow copies to /tmp/ on Unix (PR: [#73809](https://github.com/dotnet/roslyn/pull/73809))
928
* Fix exponential blowup parsing pathological files (PR: [#73788](https://github.com/dotnet/roslyn/pull/73788))

0 commit comments

Comments
 (0)