Skip to content

Commit 5e890a7

Browse files
authored
Merge branch 'master' into suppress-codelense-getenumerator
2 parents c12ecc4 + ed4c3ad commit 5e890a7

File tree

6 files changed

+61
-74
lines changed

6 files changed

+61
-74
lines changed

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
"updatePackageDependencies"
140140
],
141141
"env": {
142-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/4d682ee649bcf084eee3d6b675157541/omnisharp-linux-x64-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/d86b6a136dd8b420d101bcc5bfed442d/omnisharp-linux-x86-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/0b3f4fd3384777867ebe50923b6dee90/omnisharp-osx-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/fd2b97e2a06208d965a3abeb19d87e47/omnisharp-win-x64-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/a1bbd300586e592052207344cc47073d/omnisharp-win-x86-1.37.3.zip",
143-
"NEW_DEPS_VERSION": "1.37.3"
142+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/95ce2318d1703985df1eec5439c9e81b/omnisharp-linux-x64-1.37.4.zip,https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/019094bcfb599dfbe9bb156101117f18/omnisharp-linux-x86-1.37.4.zip,https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/f6ec19880608eee1b5222252b14f2b44/omnisharp-osx-1.37.4.zip,https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/ce4f2f50516f23d1dfb6249fd7c2370d/omnisharp-win-x64-1.37.4.zip,https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/197b600dfb02c586b5d8a1a90ce503b0/omnisharp-win-x86-1.37.4.zip",
143+
"NEW_DEPS_VERSION": "1.37.4"
144144
},
145145
"cwd": "${workspaceFolder}"
146146
}

CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Known Issues in 1.23.5
1+
## Known Issues in 1.23.6
22

33
* For Mono-based development (e.g. Unity) that requires full .NET framework, you need to set `"omnisharp.useGlobalMono": "always"`. The current value of "auto" will remain "never" until Mono [upgrades their bundled MSBuild version](https://github.com/mono/mono/issues/20250).
44
* Known limitations with the preview Razor (cshtml) language service to be addressed in a future release:
@@ -10,7 +10,19 @@
1010
* Renaming symbol fails within a file that had recently been renamed without saving changes.
1111
* As a workaround, make an edit within the file before using Rename Symbol.
1212

13-
## 1.23.6 (Not yet released)
13+
## 1.23.7 (Not yet released)
14+
* Update OmniSharp version to 1.37.4 (PR: [#4224](https://github.com/OmniSharp/omnisharp-vscode/pull/4224))
15+
* Fixed global Mono MSBuild version reporting (PR: [omnisharp-roslyn#1988](https://github.com/OmniSharp/omnisharp-roslyn/pull/1988))
16+
* Fixed incremental changes and completion in Cake (PR: [omnisharp-roslyn#1997](https://github.com/OmniSharp/omnisharp-roslyn/pull/1997))
17+
* Omnisharp now uses libPaths and sourcePaths defined in custom .rsp file for scripting (PR: [omnisharp-roslyn#2000](https://github.com/OmniSharp/omnisharp-roslyn/pull/2000))
18+
* C# scripting should use language version "latest" by default (PR: [omnisharp-roslyn#2001](https://github.com/OmniSharp/omnisharp-roslyn/pull/2001))
19+
* Improve handling with Cake Script Service (PR: [omnisharp-vscode#2013](https://github.com/OmniSharp/omnisharp-roslyn/pull/2013))
20+
* Updated to latest Dotnet.Script scripting packages for .NET 5.0 ([omnisharp-vscode#2020](https://github.com/OmniSharp/omnisharp-roslyn/issues/2020), PR: [omnisharp-vscode#2012](https://github.com/OmniSharp/omnisharp-roslyn/pull/2012))
21+
* Updated Roslyn to `3.8.0`, MSBuild to `16.8.0`, DotNetHostResolver to `5.0.0`, Nuget packages to `5.8.0-rc.6930` and MSBuildSDKResolver to `5.0.101-servicing.20564.2` to match .NET 5.0.100 SDK (PR: [omnisharp-vscode#2015](https://github.com/OmniSharp/omnisharp-roslyn/pull/2015), [omnisharp-vscode#2016](https://github.com/OmniSharpomnisharp-roslyn/pull/2016))
22+
* Workspace create file workaround for VS Code (to avoid race condtion on newly created files) ([omnisharp-vscode#4181](https://github.com/OmniSharp/omnisharp-vscode/issues/4181), PR: [omnisharp-vscode#2019](https://github.com/OmniSharp/omnisharp-roslyn/pull/2019))
23+
* Response file can now used enviroment variables in the path + more error handling (PR: [omnisharp-vscode#2008](https://github.com/OmniSharp/omnisharp-roslyn/pull/2008))
24+
25+
## 1.23.6 (November 13, 2020)
1426
* Do not call updateBuffer if there are no changes. (PR: [#4170](https://github.com/OmniSharp/omnisharp-vscode/pull/4170))
1527
* Only skip file changed events when document is open. (PR: [#4178](https://github.com/OmniSharp/omnisharp-vscode/pull/4178))
1628

README.md

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ The .NET 5 SDK requires version 16.8 of MSBuild.
3333
For Windows users who have Visual Studio installed, this means you will need to be on the latest Visual Studio 16.8 Preview.
3434
For MacOS and Linux users who have Mono installed, this means you will need to set `omnisharp.useGlobalMono` to `never` until a version of Mono ships with MSBuild 16.8.
3535

36+
## What's new in 1.23.6
37+
- Do not call updateBuffer if there are no changes. (PR: [#4170](https://github.com/OmniSharp/omnisharp-vscode/pull/4170))
38+
- Only skip file changed events when document is open. (PR: [#4178](https://github.com/OmniSharp/omnisharp-vscode/pull/4178))
39+
3640
## What's new in 1.23.5
3741
- Set meaning of UseGlobalMono "auto" to "never" since Mono 6.12.0 still ships with MSBuild 16.7 (PR: [#4130](https://github.com/OmniSharp/omnisharp-vscode/pull/4130))
3842
- Ensure that the rename identifier and run code action providers do not apply changes twice (PR: [#4133](https://github.com/OmniSharp/omnisharp-vscode/pull/4133))
@@ -41,7 +45,6 @@ For MacOS and Linux users who have Mono installed, this means you will need to s
4145
- Improvements to HTML colorization for non-C# portions of the document.
4246
- Bug fix - the `razor.format.enable` option is honored again
4347

44-
4548
## What's new in 1.23.4
4649
- Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088))
4750
- Set meaning of UseGlobalMono "auto" to "always" now that Mono 6.12.0 ships with MSBuild 16.8 (PR: [#4115](https://github.com/OmniSharp/omnisharp-vscode/pull/4115))
@@ -88,41 +91,6 @@ For MacOS and Linux users who have Mono installed, this means you will need to s
8891
- OmniSharp.Path can only be set in user settings (PR: [omnisharp-roslyn/#1946](https://github.com/OmniSharp/omnisharp-roslyn/pull/1946))
8992
- Add support for code actions besides ApplyChangesOperation's (PR: [omnisharp-roslyn/#1724](https://github.com/OmniSharp/omnisharp-roslyn/pull/1724))
9093

91-
## What's new in 1.23.2
92-
- Ensure that all quickinfo sections have linebreaks between them, and don't add unecessary duplicate linebreaks (PR: [omnisharp-roslyn#1900](https://github.com/OmniSharp/omnisharp-roslyn/pull/1900))
93-
- Support completion of unimported types (PR: [omnisharp-roslyn#1896](https://github.com/OmniSharp/omnisharp-roslyn/pull/1896))
94-
- Exclude Misc project from InternalsVisibleTo completion (PR: [omnisharp-roslyn#1902](https://github.com/OmniSharp/omnisharp-roslyn/pull/1902))
95-
- Ensure unimported things are sorted after imported things (PR: [omnisharp-roslyn#1903](https://github.com/OmniSharp/omnisharp-roslyn/pull/1903))
96-
- Correctly handle multiple reference aliases (PR: [omnisharp-roslyn#1905](https://github.com/OmniSharp/omnisharp-roslyn/pull/1905))
97-
- Better handle completion when the display text is not in the final result (PR: [omnisharp-roslyn#1908](https://github.com/OmniSharp/omnisharp-roslyn/pull/1908))
98-
- Correctly mark hover markup content as markdown ([omnisharp-roslyn#1906](https://github.com/OmniSharp/omnisharp-roslyn/issues/1906), PR: [omnisharp-roslyn#1909](https://github.com/OmniSharp/omnisharp-roslyn/pull/1909))
99-
- Upgrade lsp ([omnisharp-roslyn#1898](https://github.com/OmniSharp/omnisharp-roslyn/issues/1898), PR: [omnisharp-roslyn#1911](https://github.com/OmniSharp/omnisharp-roslyn/pull/1911))
100-
- Updated to ILSpy 6.1.0.5902 (PR: [omnisharp-roslyn#1913](https://github.com/OmniSharp/omnisharp-roslyn/pull/1913))
101-
- Updated to NET 5.0 preview8 (PR: [omnisharp-roslyn#1916](https://github.com/OmniSharp/omnisharp-roslyn/pull/1916))
102-
- Add HTTP Driver back to build.json (PR: [omnisharp-roslyn#1918](https://github.com/OmniSharp/omnisharp-roslyn/pull/1918))
103-
- Updated the docs to mention .NET 4.7.2 targeting pack (PR: [omnisharp-roslyn#1922](https://github.com/OmniSharp/omnisharp-roslyn/pull/1922))
104-
- Support for configurations remapping in solution files ([omnisharp-roslyn#1828](https://github.com/OmniSharp/omnisharp-roslyn/issues/1828), PR: [omnisharp-roslyn#1835](https://github.com/OmniSharp/omnisharp-roslyn/pull/1835))
105-
- Only run dotnet --info once for the working directory (PR: [omnisharp-roslyn#1925](https://github.com/OmniSharp/omnisharp-roslyn/pull/1925))
106-
- Update build tool versions for NET 5 RC1 (PR: [omnisharp-roslyn#1926](https://github.com/OmniSharp/omnisharp-roslyn/pull/1926))
107-
- Update Roslyn to 3.8.0-3.20451.2 (PR: [omnisharp-roslyn#1927](https://github.com/OmniSharp/omnisharp-roslyn/pull/1927))
108-
- Clean up Blazor WebAssembly notifications (PR: [#4018](https://github.com/OmniSharp/omnisharp-vscode/pull/4018))
109-
- Remove proposed api attribute (PR: [#4029](https://github.com/OmniSharp/omnisharp-vscode/pull/4029))
110-
- New completion service including override and unimported type completion (`omnisharp.enableImportCompletion`) (PR: [#3986](https://github.com/OmniSharp/omnisharp-vscode/pull/3986))
111-
112-
## What's new in 1.23.1
113-
- Register FixAll commands for disposal ([#3984](https://github.com/OmniSharp/omnisharp-vscode/issues/3984), PR: [#3985](https://github.com/OmniSharp/omnisharp-vscode/pull/3985))
114-
- Register FixAll commands for disposal ([#3984](https://github.com/OmniSharp/omnisharp-vscode/issues/3984), PR: [#3985](https://github.com/OmniSharp/omnisharp-vscode/pull/3985))
115-
- Include version matched target files with minimal MSBuild (PR: [omnisharp-roslyn#1895](https://github.com/OmniSharp/omnisharp-roslyn/pull/1895))
116-
- Fix lack of trailing italics in quickinfo (PR: [omnisharp-roslyn#1894](https://github.com/OmniSharp/omnisharp-roslyn/pull/1894))
117-
- Set meaning of UseGlobalMono "auto" to "never" until Mono updates their MSBuild (PR: [#3998](https://github.com/OmniSharp/omnisharp-vscode/pull/3998))
118-
- Updated Razor support
119-
- Fully qualify component light bulb ([dotnet/aspnetcore-tooling#22309](https://github.com/dotnet/aspnetcore/issues/22309))
120-
- Add using for component light bulb ([dotnet/aspnetcore-tooling#22308](https://github.com/dotnet/aspnetcore/issues/22308))
121-
- Create component from tag light bulb ([dotnet/aspnetcore-tooling#22307](https://github.com/dotnet/aspnetcore/issues/22307))
122-
- Go to definition on Blazor components ([dotnet/aspnetcore-tooling#17044](https://github.com/dotnet/aspnetcore/issues/17044))
123-
- Rename Blazor components ([dotnet/aspnetcore-tooling#22312](https://github.com/dotnet/aspnetcore/issues/22312))
124-
- Prepare Blazor debugging to have better support for "Start without debugging" scenarios ([dotnet/aspnetcore-tooling#24623](https://github.com/dotnet/aspnetcore/issues/24623))
125-
12694
### Emmet support in Razor files
12795

12896
To enable emmet support, add the following to your settings.json:

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-dotnettools",
4-
"version": "1.23.6",
4+
"version": "1.23.7",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -29,7 +29,7 @@
2929
"dotnet"
3030
],
3131
"defaults": {
32-
"omniSharp": "1.37.3",
32+
"omniSharp": "1.37.4",
3333
"razor": "6.0.0-alpha.1.20529.17"
3434
},
3535
"main": "./dist/extension",
@@ -161,58 +161,58 @@
161161
{
162162
"id": "OmniSharp",
163163
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
164-
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/a1bbd300586e592052207344cc47073d/omnisharp-win-x86-1.37.3.zip",
165-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-win-x86-1.37.3.zip",
166-
"installPath": ".omnisharp/1.37.3",
164+
"url": "https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/197b600dfb02c586b5d8a1a90ce503b0/omnisharp-win-x86-1.37.4.zip",
165+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.4/omnisharp-win-x86-1.37.4.zip",
166+
"installPath": ".omnisharp/1.37.4",
167167
"platforms": [
168168
"win32"
169169
],
170170
"architectures": [
171171
"x86"
172172
],
173-
"installTestPath": "./.omnisharp/1.37.3/OmniSharp.exe",
173+
"installTestPath": "./.omnisharp/1.37.4/OmniSharp.exe",
174174
"platformId": "win-x86",
175-
"integrity": "AA2544E73A17760BF6699A7C0580610FC610D63A434CEB3CCF307A772AA365C6"
175+
"integrity": "41642B4ADDE9FD19FA8E44E6554F174AA071884656C55C16C2E45AECB1E3A353"
176176
},
177177
{
178178
"id": "OmniSharp",
179179
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
180-
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/fd2b97e2a06208d965a3abeb19d87e47/omnisharp-win-x64-1.37.3.zip",
181-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-win-x64-1.37.3.zip",
182-
"installPath": ".omnisharp/1.37.3",
180+
"url": "https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/ce4f2f50516f23d1dfb6249fd7c2370d/omnisharp-win-x64-1.37.4.zip",
181+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.4/omnisharp-win-x64-1.37.4.zip",
182+
"installPath": ".omnisharp/1.37.4",
183183
"platforms": [
184184
"win32"
185185
],
186186
"architectures": [
187187
"x86_64"
188188
],
189-
"installTestPath": "./.omnisharp/1.37.3/OmniSharp.exe",
189+
"installTestPath": "./.omnisharp/1.37.4/OmniSharp.exe",
190190
"platformId": "win-x64",
191-
"integrity": "542841E6ECCAA3FF545BFA8778CB0CC4F4BEB5A6D2E55D5A9972E02DAB5ED993"
191+
"integrity": "79C15179A7351F2443A68D8C906BBC7E8E0C2C0C0C49F0EA0C69B04908CE0AC1"
192192
},
193193
{
194194
"id": "OmniSharp",
195195
"description": "OmniSharp for OSX",
196-
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/0b3f4fd3384777867ebe50923b6dee90/omnisharp-osx-1.37.3.zip",
197-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-osx-1.37.3.zip",
198-
"installPath": ".omnisharp/1.37.3",
196+
"url": "https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/f6ec19880608eee1b5222252b14f2b44/omnisharp-osx-1.37.4.zip",
197+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.4/omnisharp-osx-1.37.4.zip",
198+
"installPath": ".omnisharp/1.37.4",
199199
"platforms": [
200200
"darwin"
201201
],
202202
"binaries": [
203203
"./mono.osx",
204204
"./run"
205205
],
206-
"installTestPath": "./.omnisharp/1.37.3/run",
206+
"installTestPath": "./.omnisharp/1.37.4/run",
207207
"platformId": "osx",
208-
"integrity": "A146279775CCFE4CFF45964DB83CF293BD9F0C0E9FD11A517E912A5EC1B20BC9"
208+
"integrity": "2F400533273E0A0059997CCAC02DCA665B93E25259D71C683EAFB36B3E79E90C"
209209
},
210210
{
211211
"id": "OmniSharp",
212212
"description": "OmniSharp for Linux (x86)",
213-
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/d86b6a136dd8b420d101bcc5bfed442d/omnisharp-linux-x86-1.37.3.zip",
214-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-linux-x86-1.37.3.zip",
215-
"installPath": ".omnisharp/1.37.3",
213+
"url": "https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/019094bcfb599dfbe9bb156101117f18/omnisharp-linux-x86-1.37.4.zip",
214+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.4/omnisharp-linux-x86-1.37.4.zip",
215+
"installPath": ".omnisharp/1.37.4",
216216
"platforms": [
217217
"linux"
218218
],
@@ -224,16 +224,16 @@
224224
"./mono.linux-x86",
225225
"./run"
226226
],
227-
"installTestPath": "./.omnisharp/1.37.3/run",
227+
"installTestPath": "./.omnisharp/1.37.4/run",
228228
"platformId": "linux-x86",
229-
"integrity": "BBA9D8B8D894D50E3B191D7980680A93D1A493EDD77BB09A82093742AC56BFD4"
229+
"integrity": "50382836C21A5D28565DEB333489F6C0252EBACDADD068E38227B13DFC748ED4"
230230
},
231231
{
232232
"id": "OmniSharp",
233233
"description": "OmniSharp for Linux (x64)",
234-
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/4d682ee649bcf084eee3d6b675157541/omnisharp-linux-x64-1.37.3.zip",
235-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-linux-x64-1.37.3.zip",
236-
"installPath": ".omnisharp/1.37.3",
234+
"url": "https://download.visualstudio.microsoft.com/download/pr/8745aba0-7dcb-4c56-90a9-45a77304e92d/95ce2318d1703985df1eec5439c9e81b/omnisharp-linux-x64-1.37.4.zip",
235+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.4/omnisharp-linux-x64-1.37.4.zip",
236+
"installPath": ".omnisharp/1.37.4",
237237
"platforms": [
238238
"linux"
239239
],
@@ -244,9 +244,9 @@
244244
"./mono.linux-x86_64",
245245
"./run"
246246
],
247-
"installTestPath": "./.omnisharp/1.37.3/run",
247+
"installTestPath": "./.omnisharp/1.37.4/run",
248248
"platformId": "linux-x64",
249-
"integrity": "DAB96800C45650A7BBEE1E6EDC1A96CD71B4D2C9BACED4E126A45101D30CA8E8"
249+
"integrity": "80AF3773D77ADB9D596F3F94AE7E8F2C2408EF1FB8D8CCD3588D32FE804ECE4D"
250250
},
251251
{
252252
"id": "Debugger",
@@ -720,7 +720,7 @@
720720
"never"
721721
],
722722
"enumDescriptions": [
723-
"Automatically launch OmniSharp with \"mono\" if version 6.4.0 or greater is available on the PATH.",
723+
"Automatically launch OmniSharp with internal \"mono\", since \"mono\" 6.12.0 does not support .NET Core 3.1.40x or .NET 5 SDKs.",
724724
"Always launch OmniSharp with \"mono\". If version 6.4.0 or greater is not available on the PATH, an error will be printed.",
725725
"Never launch OmniSharp on a globally-installed Mono."
726726
],
@@ -805,7 +805,7 @@
805805
},
806806
"omnisharp.enableEditorConfigSupport": {
807807
"type": "boolean",
808-
"default": false,
808+
"default": true,
809809
"description": "Enables support for reading code style, naming convention and analyzer settings from .editorconfig."
810810
},
811811
"omnisharp.enableDecompilationSupport": {

0 commit comments

Comments
 (0)