Skip to content

Commit d44aee0

Browse files
committed
Merge branch 'main' of https://github.com/dotnet/vscode-csharp into publishpipeline
2 parents 05f54b4 + af2bcf6 commit d44aee0

File tree

17 files changed

+848
-593
lines changed

17 files changed

+848
-593
lines changed

.vscode/launch.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@
219219
"args": ["updatePackageDependencies"],
220220
"env": {
221221
"NEW_DEPS_ID": "OmniSharp",
222-
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x86-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-net6.0-1.39.12.zip",
223-
"OLD_DEPS_VERSION": "1.39.11",
224-
"NEW_DEPS_VERSION": "1.39.12"
222+
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x86.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64-net6.0.zip",
223+
"OLD_DEPS_VERSION": "1.39.12",
224+
"NEW_DEPS_VERSION": "1.39.14"
225225
},
226226
"cwd": "${workspaceFolder}"
227227
},

.vscode/tasks.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"group": {
1616
"kind": "build",
1717
"isDefault": true
18-
}
18+
},
19+
"problemMatcher": "$tsc",
1920
},
2021
{
2122
"label": "buildDev",
@@ -25,7 +26,8 @@
2526
"group": {
2627
"kind": "build",
2728
"isDefault": true
28-
}
29+
},
30+
"problemMatcher": "$tsc",
2931
},
3032
{
3133
"label": "package",
@@ -35,7 +37,8 @@
3537
"group": {
3638
"kind": "build",
3739
"isDefault": true
38-
}
40+
},
41+
"problemMatcher": "$tsc",
3942
},
4043
{
4144
"label": "packageDev",
@@ -45,7 +48,8 @@
4548
"group": {
4649
"kind": "build",
4750
"isDefault": true
48-
}
51+
},
52+
"problemMatcher": "$tsc",
4953
},
5054
{
5155
"label": "test",

CHANGELOG.md

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,49 @@
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.89.x
7+
68
# 2.88.x
7-
* Bump Razor to 10.0.0-preview.25377.4 (PR: [#8459](https://github.com/dotnet/vscode-csharp/pull/8459))
9+
* Enable Razor Cohosting "on" by default (PR: [#8469](https://github.com/dotnet/vscode-csharp/pull/8469))
10+
* Bump Roslyn to 5.0.0-2.25405.5 (PR: [#8493](https://github.com/dotnet/vscode-csharp/pull/8493))
11+
* Fix file-based programs getting stuck in the host workspace(PR: [#79730](https://github.com/dotnet/roslyn/pull/79730))
12+
* Fixed irregular spacing between list items(PR: [#79388](https://github.com/dotnet/roslyn/pull/79388))
13+
* Introduce helper to ensure span mapping is consistent everywhere(PR: [#79729](https://github.com/dotnet/roslyn/pull/79729))
14+
* Fix formatting in use-auto-prop when attributes are present(PR: [#79735](https://github.com/dotnet/roslyn/pull/79735))
15+
* Razor span mapping in LSP for cohosting(PR: [#79677](https://github.com/dotnet/roslyn/pull/79677))
16+
* Handle concurrent requests to update workspace contents and workspace SG info.(PR: [#79628](https://github.com/dotnet/roslyn/pull/79628))
17+
* Update debugger.contracts to 18.0.0-beta.25379.1(PR: [#79661](https://github.com/dotnet/roslyn/pull/79661))
18+
* Fix logging when item counts change in LoadedProject(PR: [#79640](https://github.com/dotnet/roslyn/pull/79640))
19+
* File-based program directive diagnostics in editor(PR: [#79421](https://github.com/dotnet/roslyn/pull/79421))
20+
* Fixup quick info for suppressed nullable operations.(PR: [#79636](https://github.com/dotnet/roslyn/pull/79636))
21+
* Rename Razor source generated documents in all scenarios, and map edits(PR: [#79604](https://github.com/dotnet/roslyn/pull/79604))
22+
* Fix formatting of CDATA sections in quick info(PR: [#79627](https://github.com/dotnet/roslyn/pull/79627))
23+
* Add diagnostic provider for clients without dynamic registration(PR: [#77984](https://github.com/dotnet/roslyn/pull/77984))
24+
* Fix eol handling on the last token in a file when formatting code actions(PR: [#79602](https://github.com/dotnet/roslyn/pull/79602))
25+
* Reduce allocations during CommonCompletionItem.Create(PR: [#79591](https://github.com/dotnet/roslyn/pull/79591))
26+
* Add metadata documents to the MAS workspace upfront(PR: [#78886](https://github.com/dotnet/roslyn/pull/78886))
27+
* Update debugger contracts to 18.0.0-beta.25353.1(PR: [#79277](https://github.com/dotnet/roslyn/pull/79277))
28+
* Include comments written above local variables when getting quick info for them.(PR: [#79580](https://github.com/dotnet/roslyn/pull/79580))
29+
* Modify LSP folding ranges to account for AutoCollapse(PR: [#79551](https://github.com/dotnet/roslyn/pull/79551))
30+
* Have 'use explicit type' add usings as necessary to minimally qualify the type(PR: [#79574](https://github.com/dotnet/roslyn/pull/79574))
31+
* Fix issue where we weren't properly adding elastic trivia to newly generated members(PR: [#79571](https://github.com/dotnet/roslyn/pull/79571))
32+
* Properly handle optional arguments when converting a local function to a method.(PR: [#79531](https://github.com/dotnet/roslyn/pull/79531))
33+
* Fix issue with 'use explicit type' and nullable tuples(PR: [#79544](https://github.com/dotnet/roslyn/pull/79544))
34+
* Fix name qualification when moving a using alias outside of a file scoped namespace(PR: [#79540](https://github.com/dotnet/roslyn/pull/79540))
35+
* Allow add using to work on Razor generated documents(PR: [#79530](https://github.com/dotnet/roslyn/pull/79530))
36+
* Fix 'this' keyword not being recomended where allowed(PR: [#79514](https://github.com/dotnet/roslyn/pull/79514))
37+
* Fix 'switch' keyword recomendations after an expression(PR: [#79515](https://github.com/dotnet/roslyn/pull/79515))
38+
* Suggest proper 'Async'-suffixed name for Task-returning symbols(PR: [#79518](https://github.com/dotnet/roslyn/pull/79518))
39+
* Locate usable MSBuild when launching .NET Core BuildHost (PR: [#79494](https://github.com/dotnet/roslyn/pull/79494)
40+
* Bump Razor to 10.0.0-preview.25403.1 (PR: [#8485](https://github.com/dotnet/vscode-csharp/pull/8485))
841
* Cache MEF composition in OOP and VS Code (PR: [#12041](https://github.com/dotnet/razor/pull/12041))
42+
* Make cohost formatting honour C# formatting options (PR: [#12042](https://github.com/dotnet/razor/pull/12042))
43+
* Correctly set the Html document uri for diagnostics requests (PR: [#12061](https://github.com/dotnet/razor/pull/12061))
44+
* Fix issue acquiring components when using proxies (PR: [#8457](https://github.com/dotnet/vscode-csharp/pull/8457))
45+
* Support activating the extension with limited support in untrusted workspaces (PR: [#8435](https://github.com/dotnet/vscode-csharp/pull/8435))
46+
* Report specific c# settings in issue template (PR: [#8433](https://github.com/dotnet/vscode-csharp/pull/8433))
47+
* Update OmniSharp to 1.39.14 (PR: [#8492](https://github.com/dotnet/vscode-csharp/pull/8492))
48+
* Update Roslyn to 4.14.0-3.25168.13 (PR: [omnisharp-roslyn/#2664](https://github.com/OmniSharp/omnisharp-roslyn/pull/2664))
949

1050
# 2.87.x
1151
* Bump Roslyn to 5.0.0-2.25371.17 (PR: [#8436](https://github.com/dotnet/vscode-csharp/pull/8436))

CODE-OF-CONDUCT.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ Copyright © .NET Foundation, and contributors.
4141
The Microsoft C# extension is subject to [these license terms](https://github.com/dotnet/vscode-csharp/blob/main/RuntimeLicenses/license.txt).
4242
The source code to this extension is available on [https://github.com/dotnet/vscode-csharp](https://github.com/dotnet/vscode-csharp) and licensed under the [MIT license](LICENSE.txt).
4343

44-
### Code of Conduct
45-
46-
This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/)
47-
to clarify expected behavior in our community.
48-
For more information see the [.NET Foundation Code of Conduct](https://www.dotnetfoundation.org/code-of-conduct).
49-
5044
### Contribution License Agreement
5145

5246
By signing the [CLA](https://cla.dotnetfoundation.org/), the community is free to use your contribution to [.NET Foundation](http://www.dotnetfoundation.org) projects.

0 commit comments

Comments
 (0)