Skip to content

Commit 78595d7

Browse files
authored
Merge pull request #7760 from dotnet/merge/prerelease-to-release
[automated] Merge branch 'prerelease' => 'release'
2 parents a60f790 + a733d12 commit 78595d7

File tree

78 files changed

+984
-374
lines changed

Some content is hidden

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

78 files changed

+984
-374
lines changed

.github/workflows/branch-snap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: Install dependencies
2626
run: npm ci
2727
- name: Update version.json
28-
run: npx gulp incrementVersionJson
29-
- name: Create version.json update PR
28+
run: npx gulp incrementVersion
29+
- name: Create version update PR
3030
uses: peter-evans/create-pull-request@v4
3131
with:
3232
token: ${{ secrets.GITHUB_TOKEN }}

.vscode/launch.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
"csharp-test-profile",
2525
"${workspaceRoot}/test/lsptoolshost/integrationTests/testAssets/slnWithCsproj/.vscode/slnWithCsproj.code-workspace",
2626
"--extensionDevelopmentPath=${workspaceRoot}",
27-
"--extensionTestsPath=${workspaceRoot}/out/test/lsptoolshost/integrationTests"
27+
"--extensionTestsPath=${workspaceRoot}/out/test/lsptoolshost/integrationTests",
28+
"--log",
29+
"ms-dotnettools.csharp:trace"
2830
],
2931
"env": {
3032
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -49,7 +51,9 @@
4951
"csharp-test-profile",
5052
"${workspaceRoot}/test/lsptoolshost/integrationTests/testAssets/slnWithCsproj/.vscode/devkit_slnWithCsproj.code-workspace",
5153
"--extensionDevelopmentPath=${workspaceRoot}",
52-
"--extensionTestsPath=${workspaceRoot}/out/test/lsptoolshost/integrationTests"
54+
"--extensionTestsPath=${workspaceRoot}/out/test/lsptoolshost/integrationTests",
55+
"--log",
56+
"ms-dotnettools.csharp:trace"
5357
],
5458
"env": {
5559
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -74,7 +78,9 @@
7478
"csharp-test-profile",
7579
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
7680
"--extensionDevelopmentPath=${workspaceRoot}",
77-
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests"
81+
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
82+
"--log",
83+
"ms-dotnettools.csharp:trace"
7884
],
7985
"env": {
8086
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",

CHANGELOG.md

Lines changed: 113 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,124 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

6-
# 2.50.x
6+
# 2.55.x
7+
* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))
8+
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
9+
* Update Roslyn to 4.13.0-2.24557.6 (PR: [#7751](https://github.com/dotnet/vscode-csharp/pull/7751))
10+
* Fix issue telemetry reporting incorrect property value (PR: [#75817](https://github.com/dotnet/roslyn/pull/75817))
11+
* Update Roslyn to 4.13.0-2.24531.3 (PR: [#7722](https://github.com/dotnet/vscode-csharp/pull/7722))
12+
* Proffer project system query service (PR: [#75682](https://github.com/dotnet/roslyn/pull/75682))
13+
* Ensure discards are initially soft selected in VSCode (PR: [#75655](https://github.com/dotnet/roslyn/pull/75655))
14+
* Reduce allocations in VirtualCharService.CreateVirtualCharSequence (PR: [#75654](https://github.com/dotnet/roslyn/pull/75654))
15+
* Reduce allocations in TextDocumentStates.AddRange (PR: [#75640](https://github.com/dotnet/roslyn/pull/75640))
16+
* Update Razor to 9.0.0-preview.24531.4 (PR: [#7723](https://github.com/dotnet/vscode-csharp/pull/7723))
17+
* Fix aggregate telemetry reliability (PR: [#11134](https://github.com/dotnet/razor/pull/11134))
18+
* [FUSE] Fix OnAutoInsert and override completion and possible others (PR: [#11122](https://github.com/dotnet/razor/pull/11122))
19+
* Update Roslyn to 4.13.0-2.24529.3 (PR: [#7705](https://github.com/dotnet/vscode-csharp/pull/7705))
20+
* Update Razor to 9.0.0-preview.24528.3 (PR: [#7705](https://github.com/dotnet/vscode-csharp/pull/7705))
21+
* Update project configuration from Roslyn info (#11092) (PR: [#11092](https://github.com/dotnet/razor/pull/11092))
22+
* Reduce the amount of telemetry emitted (#11094) (PR: [#11094](https://github.com/dotnet/razor/pull/11094))
23+
* Remove tooling MvcShims (#11088) (PR: [#11088](https://github.com/dotnet/razor/pull/11088))
24+
* Switch to new log output window API and remove `dotnet.server.trace` (PR: [#7688](https://github.com/dotnet/vscode-csharp/pull/7688))
25+
* Update Roslyn to 4.13.0-1.24528.3 (PR: [#7688](https://github.com/dotnet/vscode-csharp/pull/7688))
26+
* Fix crash when 'add await' analyzers binding expressions (PR: [#75644](https://github.com/dotnet/roslyn/pull/75644))
27+
* Shorten names shown in 'pull member up' (PR: [#75643](https://github.com/dotnet/roslyn/pull/75643))
28+
* Fix inaccessible constructors shown in sighelp (PR: [#75642](https://github.com/dotnet/roslyn/pull/75642))
29+
* Allow the client to update the server logging level dynamically (PR: [#75615](https://github.com/dotnet/roslyn/pull/75615))
30+
* Bumped xamlTools to 17.13.35431.11 (PR: [#7719](https://github.com/dotnet/vscode-csharp/pull/7719))
31+
* XAML validation improvements
32+
* Validating properties of Setters, Triggers, Conditions.
33+
* Validating text values like `<Color> Red </Color>`
34+
* Warnings for obsolete values like LayoutOptions.CenterAndExpand
35+
* XAML IntelliseSense completions for ResourceDictionary.Source
36+
* XAML IntelliseSense completions for name properties like Setter.TargetName
37+
38+
# 2.54.x
39+
* Update debugger packages to v2.54.0 (PR: [#7691](https://github.com/dotnet/vscode-csharp/pull/7691))
40+
* Only show misc files warning toast after delay. (PR: [#7689](https://github.com/dotnet/vscode-csharp/pull/7689))
41+
* Update Roslyn to 4.13.0-1.24525.2 (PR: [#7694](https://github.com/dotnet/vscode-csharp/pull/7694))
42+
* Fix error message spelling (PR: [#75601](https://github.com/dotnet/roslyn/pull/75601))
43+
* Improve diagnostic performance by re-using results if diagnostic data is the same (PR: [#75587](https://github.com/dotnet/roslyn/pull/75587))
44+
* Improve performance in checksum computation (PR: [#75479](https://github.com/dotnet/roslyn/pull/75479))
45+
* Bumped xamlTools to 17.13.35422.31 (PR: [#7685](https://github.com/dotnet/vscode-csharp/pull/7685))
46+
* Update Razor to 9.0.0-preview.24524.4 (PR: [#7692](https://github.com/dotnet/vscode-csharp/pull/7692))
47+
* Roslyn Tokenizer (#11086) (PR: [#11086](https://github.com/dotnet/razor/pull/11086))
48+
* **Experimental feature**
49+
* Add flush method and make it implementation detail on how that happens (#11087) (PR: [#11087](https://github.com/dotnet/razor/pull/11087))
50+
* Do not extract component into code block (#11069) (PR: [#11069](https://github.com/dotnet/razor/pull/11069))
51+
* **New code action to handle extracting razor code into a new razor component**
52+
* Handle EditorRequired *Changed/*Expression parameters (#11043) (PR: [#11043](https://github.com/dotnet/razor/pull/11043))
53+
* Avoid ambiguous `object` reference in generic component recovery (#11053) (PR: [#11053](https://github.com/dotnet/razor/pull/11053))
54+
* Move culture info check (#11057) (PR: [#11057](https://github.com/dotnet/razor/pull/11057))
55+
* Report a better error for void components (#11041) (PR: [#11041](https://github.com/dotnet/razor/pull/11041))
56+
* Ensure model directives are mapped at runtime (#11007) (PR: [#11007](https://github.com/dotnet/razor/pull/11007))
57+
* Including @using for Out-of-Scope Razor Component References (#10651) (PR: [#10651](https://github.com/dotnet/razor/pull/10651))
58+
* Make checkDevCert a modal dialogue (PR: [#7704](https://github.com/dotnet/vscode-csharp/pull/7704))
59+
60+
# 2.53.x
61+
* Update Roslyn to 4.13.0-1.24518.1 (PR: [#7670](https://github.com/dotnet/vscode-csharp/pull/7670))
62+
* Fix issue where server sometimes crashed when saving new C# file for the first time (PR: [#75509](https://github.com/dotnet/roslyn/pull/75509))
63+
* Report LSP loading telemetry (PR: [#75402](https://github.com/dotnet/roslyn/pull/75402))
64+
* Bumped xamlTools to 17.13.35414.86 (PR: [#7664](https://github.com/dotnet/vscode-csharp/pull/7664))
65+
* Escape code block in changelog (PR: [#7665](https://github.com/dotnet/vscode-csharp/pull/7665))
66+
* Lookup Razor file context using its document uri. (PR: [#7663](https://github.com/dotnet/vscode-csharp/pull/7663))
67+
* Update razor to 9.0.0-preview.24516.1 (PR: [#7667](https://github.com/dotnet/vscode-csharp/pull/7667))
68+
* Add CLaSP Request Tracking (PR: [#11015](https://github.com/dotnet/razor/pull/11015))
69+
* Fix potentially ambiguous System.Object in _Imports.razor (PR: [#10999](https://github.com/dotnet/razor/pull/10999))
70+
* Fix nullability to match specification (PR: [#11003](https://github.com/dotnet/razor/pull/11003))
71+
* Recognize `_Imports.razor` in the source generator (PR: [#10992](https://github.com/dotnet/razor/pull/10992))
72+
* Fix @inherits mapping for fuse (PR: [#10985](https://github.com/dotnet/razor/pull/10985))
73+
* Fix project publish (or: Various project system fixes) (PR: [#10983](https://github.com/dotnet/razor/pull/10983))
74+
* Emit and map empty csharp tokens (PR: [#10969](https://github.com/dotnet/razor/pull/10969))
75+
* Fix Generate Event Handler code action (PR: [#10967](https://github.com/dotnet/razor/pull/10967))
76+
* Add IProjectSnapshot.ContainsDocument to test document paths cheaply (PR: [#10975](https://github.com/dotnet/razor/pull/10975))
77+
* Refresh diagnostics on project changes (PR: [#10964](https://github.com/dotnet/razor/pull/10964))
78+
* Don't throw if we get an old/bad Inlay Hint request (PR: [#10968](https://github.com/dotnet/razor/pull/10968))
79+
* Fix on type formatting (PR: [#10949](https://github.com/dotnet/razor/pull/10949))
80+
81+
# 2.52.x
82+
* Add miscellaneous file open notifications (PR: [#7652](https://github.com/dotnet/vscode-csharp/pull/7652))
83+
* Require at least version 8.0.10 of the .net runtime (PR: [#7651](https://github.com/dotnet/vscode-csharp/pull/7651))
84+
* Warn when the active file is not part of the open workspace (PR: [#7628](https://github.com/dotnet/vscode-csharp/pull/7628))
85+
* Update debugger to 2.52.0 (PR: [#7648](https://github.com/dotnet/vscode-csharp/pull/7648))
86+
* Ensure Razor is initialized when project loaded outside of the workspace (PR: [#7645](https://github.com/dotnet/vscode-csharp/pull/7645))
87+
* Update Roslyn to 4.13.0-1.24511.1 (PR: [#7628](https://github.com/dotnet/vscode-csharp/pull/7628))
88+
* Add a WorkspaceKind property to ProjectContext. (PR: [#75384](https://github.com/dotnet/roslyn/pull/75384))
89+
* Convert more lambda rude edits to runtime rude edits (PR: [#75285](https://github.com/dotnet/roslyn/pull/75285))
90+
* Bumped xamlTools to 17.12.35403.211 (PR: [#7629](https://github.com/dotnet/vscode-csharp/pull/7629))
91+
92+
# 2.51.17
93+
* Update Roslyn to 4.13.0-1.24503.11 (PR: [#7618](https://github.com/dotnet/vscode-csharp/pull/7618))
94+
* LSP hover responses escape backticks within inline code (PR: [#75364](https://github.com/dotnet/roslyn/pull/75364))
95+
* Localize build host message output (PR: [#74910](https://github.com/dotnet/roslyn/pull/74910))
96+
* Log and report NFW when we fail to apply project system update (PR: [#75362](https://github.com/dotnet/roslyn/pull/75362))
97+
* Reduce allocations and UI thread CPU costs in WithDoNotCreateCreationPolicy (PR: [#75358](https://github.com/dotnet/roslyn/pull/75358))
98+
* Enable support for an LSP client to open source generated files (PR: [#75180](https://github.com/dotnet/roslyn/pull/75180))
99+
* Improve error reporting when reading bad metadata during EnC (PR: [#75304](https://github.com/dotnet/roslyn/pull/75304))
100+
* Suppress recoverable errors from razor LSP (PR: [#7624](https://github.com/dotnet/vscode-csharp/pull/7624))
101+
* NOTE: this can be re-enabled by setting `razor.languageServer.suppressLspErrorToasts = false`
102+
* Update Roslyn to 4.13.0-1.24501.3 (PR: [#7618](https://github.com/dotnet/vscode-csharp/pull/7618))
103+
* Fix issue loading analyzers when using EnforceCodeStyleInBuild (PR: [#75250](https://github.com/dotnet/roslyn/pull/75250))
104+
* Update Razor to 9.0.0-preview.24480.1 (PR: [#7618](https://github.com/dotnet/vscode-csharp/pull/7618))
105+
* Fuse fix usings (PR: [#10925](https://github.com/dotnet/razor/pull/10925))
106+
* Fuse incorrect page directives (PR: [#10907](https://github.com/dotnet/razor/pull/10907))
107+
* Calculate SuppressAddComponentParameter in tooling (PR: [#10763](https://github.com/dotnet/razor/pull/10763))
108+
* Fix some `AssumeNotNull` assumptions (PR: [#10901](https://github.com/dotnet/razor/pull/10901))
109+
* Fixing HTML attribute commit (PR: [#10897](https://github.com/dotnet/razor/pull/10897))
110+
* Fix `FormattingContext` disposal (PR: [#10887](https://github.com/dotnet/razor/pull/10887))
111+
* Fix #10891 - Formatting does not respect indentation within Razor comment blocks (PR: [#10893](https://github.com/dotnet/razor/pull/10893))
112+
113+
# 2.50.25
7114
* Update Roslyn to 4.13.0-1.24477.2 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>))
8115
* Use MSBuild globs to determine which file changes are relevant (PR: [#75139](https://github.com/dotnet/roslyn/pull/75139))
9-
* Allow <code> in DocComments to render as a block in Hover response (PR: [#75215](https://github.com/dotnet/roslyn/pull/75215))
116+
* Allow `<code>` in DocComments to render as a block in Hover response (PR: [#75215](https://github.com/dotnet/roslyn/pull/75215))
10117
* Ignore irrelevant exceptions when reporting LSP server NFW (PR: [#75150](https://github.com/dotnet/roslyn/pull/75150))
11118
* Bumped xamltools to 17.12.35326.17 (PR: [#7610](https://github.com/dotnet/vscode-csharp/pull/7610))
12119
* Do not remove documents if they are not files (PR: [#7607](https://github.com/dotnet/vscode-csharp/pull/7607))
13120
* Support copilot registerRelatedFilesProvider API (PR: [#7605](https://github.com/dotnet/vscode-csharp/pull/7605))
14121
* Update Debugger packages to v2.50.0 (PR: [#7597](https://github.com/dotnet/vscode-csharp/pull/7597))
15122

16-
# 2.49.x
123+
# 2.49.25
17124
* Update Razor to 9.0.0-preview.24467.1
18125
* Fix LF line-ending auto format bug (PR: [#10802](https://github.com/dotnet/razor/pull/10802))
19126
* Bumped xamltools to 17.12.35319.159 (PR: [#7583](https://github.com/dotnet/vscode-csharp/pull/7583))
@@ -24,7 +131,7 @@
24131
* Do not attempt to report EnC diagnostics for non-host workspaces (PR: [#75138](https://github.com/dotnet/roslyn/pull/75138))
25132
* Allow Razor to get diagnostics for cohosting (PR: [#75102](https://github.com/dotnet/roslyn/pull/75102))
26133
Í
27-
# 2.48.x
134+
# 2.48.31
28135
* Add signing support to VSIX (PR: [#7490](https://github.com/dotnet/vscode-csharp/pull/7490))
29136
* Update Debugger to v2.47.0 (PR: [#7547](https://github.com/dotnet/vscode-csharp/pull/7547))
30137
* Adds in support for .NET 9 Break for Async User-Unhandled
@@ -41,14 +148,14 @@
41148
* Bump xamltools to 17.12.35311.18 (PR: [#7549](https://github.com/dotnet/vscode-csharp/pull/7549))
42149
* XAML color swatches
43150

44-
# 2.47.x
151+
# 2.47.21
45152
* Update Roslyn to 4.12.0-3.24456.2 (PR: [#7525](https://github.com/dotnet/vscode-csharp/pull/7525))
46153
* Avoid BuildHost crash in Mono due to missing types (PR: [#74994](https://github.com/dotnet/roslyn/pull/74994))
47154
* Turn off word suggestions in XAML completions (PR: [#7516](https://github.com/dotnet/vscode-csharp/pull/7516))
48155
* Bump xamltools to 17.12.35305.252 (PR: [#7521](https://github.com/dotnet/vscode-csharp/pull/7521))
49156
* XAML editor enabled various lightbulbs related to x:DataType, BindingContext and Bindings.
50157

51-
# 2.46.x
158+
# 2.46.32
52159
* Update Roslyn to 4.12.0-3.24430.2 (PR: [#7496](https://github.com/dotnet/vscode-csharp/pull/7496))
53160
* Bump Razor to 9.0.0-preview.24427.2 (PR: [#7471](https://github.com/dotnet/vscode-csharp/pull/7471))
54161
* Suppress unique ids (#10791) (PR: [#10791](https://github.com/dotnet/razor/pull/10791))

SUPPORT.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,25 @@ We highly recommend using the C# extension's built-in command, `CSharp: Report a
1919

2020
The template has a section to include the `C#` output window logs. These logs are not automatically included as they may contain personal information (such as full file paths and project names), but they are key to resolving problems.
2121

22-
1. First, set `dotnet.server.trace` to `Trace` in VSCode settings
23-
![settings window showing trace option](./docs/trace_logs.png)
24-
2. Reload the window via the `Developer: Reload Window` (`workbench.action.reloadWindow`) command
22+
1. Find the `C#` output window (`View` -> `Output`) and set the log level to `Trace`
23+
![c# output window showing trace option](./docs/csharp_trace.png)
24+
2. Reproduce the issue
25+
3. In the `C#` output window, select all (e.g. `cntrl+a`) and copy paste into the issue template under the 'C# Log' section. If you need to redact file paths and other information, please do so at this time.
26+
4. Once the logs are collected, reset the window log level to `Info`
27+
28+
If the issue only reproduces on extension startup, you can set `Trace` as the default (see screenshot above), reload the window, and trace logs will be captured on startup.
29+
30+
##### C# LSP Trace Logs
31+
Sometimes we need to know exactly what requests were sent to the Roslyn language server. To capture these logs:
32+
33+
1. Set the log level to `Trace` for the `C#` output window as described above.
34+
2. Find the `C# LSP Trace Logs` output window
2535
3. Reproduce the issue
26-
4. Open the output window via `View` -> `Output` and change to the `C#` output window.
27-
5. Select all (e.g. cntrl+a) and copy paste into the issue template under the 'C# Log' section. If you need to redact file paths and other information, please do so at this time.
28-
6. Once the logs are collected, reset `dotnet.server.trace` back to `Information`
36+
4. Copy the contents of the `C# LSP Trace Logs` output window.
2937

30-
Oftentimes the C# logs are enough, but sometimes when dealing with LSP server issues, the LSP trace logs are required. These can be found by following the same steps as above, but using the `C# LSP Trace Logs` output window instead.
38+
##### Other ways to set the log level
39+
1. When launching VSCode from the CLI, pass the `--log ms-dotnettools.csharp:trace` parameter.
40+
2. Invoke the `Developer: Set Log Level` command from the VSCode command palette, find the `C#` entry and set the level.
3141

3242
#### Project loading problems
3343

azure-pipelines/prereqs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ steps:
1717
# So we avoid installing .NET in those cases.
1818
- ${{ if eq(parameters.installDotNet, true) }}:
1919
- task: UseDotNet@2
20-
displayName: 'Install .NET Core SDKs'
20+
displayName: 'Install .NET SDK'
2121
inputs:
22-
version: '8.x'
22+
version: '8.0.403'
2323

2424
- script: dotnet --info
2525
displayName: Display dotnet info

azure-pipelines/test-matrix.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
steps:
2525
- template: /azure-pipelines/test.yml@self
2626
parameters:
27-
# Prefer the dotnet from the container.
28-
installDotNet: false
27+
installDotNet: true
2928
installAdditionalLinuxDependencies: true
3029
npmCommand: $(npmCommand)

docs/csharp_trace.png

10.1 KB
Loading

docs/trace_logs.png

-12.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)