Skip to content

Commit 82cf28d

Browse files
muhammadsammymuhammadsammy
committed
Bump version to 1.23.5
2 parents 362600b + 3e4dd35 commit 82cf28d

File tree

13 files changed

+233
-265
lines changed

13 files changed

+233
-265
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
1-
## Known Issues in 1.23.4
1+
## Known Issues in 1.23.5
22

3+
* 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).
34
* Known limitations with the preview Razor (cshtml) language service to be addressed in a future release:
45
* Only ASP.NET Core projects are supported (no support for ASP.NET projects)
5-
* Limited support for formatting
66
* Error squiggles misaligned for expressions near the start of a new line
77
* Emmet based abbreviation expansion is not yet supported (See note in readme for how to enable through your settings.json)
88
* There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
99
* As an alternative, consider installing the [MSBuild Project Tools](https://marketplace.visualstudio.com/items?itemName=tintoy.msbuild-project-tools) extension by @tintoy.
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.4 (Not yet released)
13+
## 1.23.5 (Not yet released)
14+
* 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))
15+
* 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))
16+
* Do not send file changed events for .cs files (PR: [#4141](https://github.com/OmniSharp/omnisharp-vscode/pull/4141), [#4143](https://github.com/OmniSharp/omnisharp-vscode/pull/4143))
17+
* Update Razor to 6.0.0-alpha.1.20529.17:
18+
* Improvements to HTML colorization for non-C# portions of the document.
19+
* Bug fix - the `razor.format.enable` option is honored again
20+
21+
## 1.23.4 (October, 19, 2020)
1422
* Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088))
1523
* 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))
1624
* Updated OmniSharp to 1.37.3
@@ -35,7 +43,7 @@
3543
* [Debugger licensing errors are not reported to the UI ([#3759](https://github.com/OmniSharp/omnisharp-vscode/issues/3759))
3644
* [Error processing 'variables' request. Unknown Error: 0x8000211d ([#3926](https://github.com/OmniSharp/omnisharp-vscode/issues/3926))
3745
* [Method with a function pointer local breaks variables view and debug console ([#4052](https://github.com/OmniSharp/omnisharp-vscode/issues/4052))
38-
* Update to OmniSharp 1.37.2 (PR: [#4107](https://github.com/OmniSharp/omnisharp-vscode/pull/4107))
46+
* Update OmniSharp to 1.37.2 (PR: [#4107](https://github.com/OmniSharp/omnisharp-vscode/pull/4107))
3947
* Updated MSBuild, MSBuild resolvers and Roslyn to match .NET Core 5.0 RC2 and VS 16.8 Preview 4. (PR: [omnisharp-roslyn/#1971](https://github.com/OmniSharp/omnisharp-roslyn/pull/1971), PR: [omnisharp-roslyn/#1974](https://github.com/OmniSharp/omnisharp-roslyn/pull/1974))
4048
* Decouple FixAll from the workspace ([omnisharp-roslyn/#1960](https://github.com/OmniSharp/omnisharp-roslyn/issues/1960), PR: [omnisharp-roslyn/#1962](https://github.com/OmniSharp/omnisharp-roslyn/pull/1962))
4149
* Added binding redirects for Microsoft.CodeAnalysis.Features and Microsoft.CodeAnalysis.CSharp.Features (PR: [omnisharp-roslyn/#1964](https://github.com/OmniSharp/omnisharp-roslyn/pull/1964))

‎README.md‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,26 @@ then run `Extensions: Install from VSIX` from the command pallete and select the
3131

3232
# From [OmniSharp/omnisharp-vscode](https://github.com/OmniSharp/omnisharp-vscode) README:
3333

34+
## Note about using .NET Core 3.1.40x SDKs
35+
36+
The .NET 3.1.40x SDKs require version 16.7 of MSBuild.
37+
38+
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.7.
39+
3440
## Note about using .NET 5 SDKs
3541
The .NET 5 SDK requires version 16.8 of MSBuild.
3642

3743
For Windows users who have Visual Studio installed, this means you will need to be on the latest Visual Studio 16.8 Preview.
38-
For MacOS and Linux users who have Mono installed, this means you will need to be on the latest stable Mono (6.12.0).
44+
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.
45+
46+
## What's new in 1.23.5
47+
- 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))
48+
- 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))
49+
- Do not send file changed events for .cs files (PR: [#4141](https://github.com/OmniSharp/omnisharp-vscode/pull/4141))
50+
- Update Razor to 6.0.0-alpha1.20521.3:
51+
- Improvements to HTML colorization for non-C# portions of the document.
52+
- Bug fix - the `razor.format.enable` option is honored again
53+
3954

4055
## What's new in 1.23.4
4156
- Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088))
@@ -62,7 +77,7 @@ For MacOS and Linux users who have Mono installed, this means you will need to b
6277
- [Debugger licensing errors are not reported to the UI ([#3759](https://github.com/OmniSharp/omnisharp-vscode/issues/3759))
6378
- [Error processing 'variables' request. Unknown Error: 0x8000211d ([#3926](https://github.com/OmniSharp/omnisharp-vscode/issues/3926))
6479
- [Method with a function pointer local breaks variables view and debug console ([#4052](https://github.com/OmniSharp/omnisharp-vscode/issues/4052))
65-
- Update to OmniSharp 1.37.2 (PR: [#4107](https://github.com/OmniSharp/omnisharp-vscode/pull/4107))
80+
- Update OmniSharp to 1.37.2 (PR: [#4107](https://github.com/OmniSharp/omnisharp-vscode/pull/4107))
6681
- Updated MSBuild, MSBuild resolvers and Roslyn to match .NET Core 5.0 RC2 and VS 16.8 Preview 4. (PR: [omnisharp-roslyn/#1971](https://github.com/OmniSharp/omnisharp-roslyn/pull/1971), PR: [omnisharp-roslyn/#1974](https://github.com/OmniSharp/omnisharp-roslyn/pull/1974))
6782
- Decouple FixAll from the workspace ([omnisharp-roslyn/#1960](https://github.com/OmniSharp/omnisharp-roslyn/issues/1960), PR: [omnisharp-roslyn/#1962](https://github.com/OmniSharp/omnisharp-roslyn/pull/1962))
6883
- Added binding redirects for Microsoft.CodeAnalysis.Features and Microsoft.CodeAnalysis.CSharp.Features (PR: [omnisharp-roslyn/#1964](https://github.com/OmniSharp/omnisharp-roslyn/pull/1964))

‎package-lock.json‎

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

‎package.json‎

Lines changed: 84 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "muhammad-sammy",
4-
"version": "1.23.4",
4+
"version": "1.23.5",
55
"description": "C# support for vscode-compatible editors (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -30,7 +30,7 @@
3030
],
3131
"defaults": {
3232
"omniSharp": "1.37.3",
33-
"razor": "6.0.0-alpha.1.20479.2"
33+
"razor": "6.0.0-alpha.1.20529.17"
3434
},
3535
"main": "./dist/extension",
3636
"scripts": {
@@ -79,7 +79,7 @@
7979
"http-proxy-agent": "2.1.0",
8080
"https-proxy-agent": "^3.0.1",
8181
"jsonc-parser": "2.0.3",
82-
"microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/40d55e9484f6be2a1800f489d750bd21/microsoft.aspnetcore.razor.vscode-6.0.0-alpha.1.20479.2.tgz",
82+
"microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/813d0878-1f3c-41ad-909f-3a79032f77bd/312cddba1ed0acdae0fd9ec3f44026b2/microsoft.aspnetcore.razor.vscode-6.0.0-alpha.1.20529.17.tgz",
8383
"mkdirp": "^1.0.3",
8484
"node-filter-async": "1.1.1",
8585
"node-machine-id": "1.1.12",
@@ -295,8 +295,8 @@
295295
{
296296
"id": "Razor",
297297
"description": "Razor Language Server (Windows / x64)",
298-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/087ef8770e05073204daecdf5701fcf9/razorlanguageserver-win-x64-6.0.0-alpha.1.20479.2.zip",
299-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x64-6.0.0-alpha.1.20479.2.zip",
298+
"url": "https://download.visualstudio.microsoft.com/download/pr/813d0878-1f3c-41ad-909f-3a79032f77bd/f625585b30d205e6cde18ee709b1b604/razorlanguageserver-win-x64-6.0.0-alpha.1.20529.17.zip",
299+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x64-6.0.0-alpha.1.20529.17.zip",
300300
"installPath": ".razor",
301301
"platforms": [
302302
"win32"
@@ -308,8 +308,8 @@
308308
{
309309
"id": "Razor",
310310
"description": "Razor Language Server (Windows / x86)",
311-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/1f4b86673ce34352bb86a59d601ad43a/razorlanguageserver-win-x86-6.0.0-alpha.1.20479.2.zip",
312-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x86-6.0.0-alpha.1.20479.2.zip",
311+
"url": "https://download.visualstudio.microsoft.com/download/pr/813d0878-1f3c-41ad-909f-3a79032f77bd/d57034073eed8eb2e42632aea36dc248/razorlanguageserver-win-x86-6.0.0-alpha.1.20529.17.zip",
312+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x86-6.0.0-alpha.1.20529.17.zip",
313313
"installPath": ".razor",
314314
"platforms": [
315315
"win32"
@@ -321,8 +321,8 @@
321321
{
322322
"id": "Razor",
323323
"description": "Razor Language Server (Linux / x64)",
324-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/112fe9289fb974e5ff14207a3633933d/razorlanguageserver-linux-x64-6.0.0-alpha.1.20479.2.zip",
325-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20479.2.zip",
324+
"url": "https://download.visualstudio.microsoft.com/download/pr/813d0878-1f3c-41ad-909f-3a79032f77bd/9ab0011c8228eb201b9968cbaf9c6a97/razorlanguageserver-linux-x64-6.0.0-alpha.1.20529.17.zip",
325+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20529.17.zip",
326326
"installPath": ".razor",
327327
"platforms": [
328328
"linux"
@@ -337,8 +337,8 @@
337337
{
338338
"id": "Razor",
339339
"description": "Razor Language Server (macOS / x64)",
340-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/4892ef64ea15017b17c4e6c23384aea8/razorlanguageserver-osx-x64-6.0.0-alpha.1.20479.2.zip",
341-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-osx-x64-6.0.0-alpha.1.20479.2.zip",
340+
"url": "https://download.visualstudio.microsoft.com/download/pr/813d0878-1f3c-41ad-909f-3a79032f77bd/b8b48fb221f4ec148ad3f698f96ca7aa/razorlanguageserver-osx-x64-6.0.0-alpha.1.20529.17.zip",
341+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-osx-x64-6.0.0-alpha.1.20529.17.zip",
342342
"installPath": ".razor",
343343
"platforms": [
344344
"darwin"
@@ -3266,6 +3266,42 @@
32663266
"id": "razorDirectiveColon",
32673267
"description": "A colon between directive attribute parameters"
32683268
},
3269+
{
3270+
"id": "razorDirective",
3271+
"description": "A Razor directive such as 'code' or 'function'"
3272+
},
3273+
{
3274+
"id": "razorComment",
3275+
"description": "A Razor comment"
3276+
},
3277+
{
3278+
"id": "markupCommentPunctuation",
3279+
"description": "The '@' or '*' of a Razor comment."
3280+
},
3281+
{
3282+
"id": "markupTagDelimiter",
3283+
"description": "Markup delimiters like '<', '>', and '/'."
3284+
},
3285+
{
3286+
"id": "markupOperator",
3287+
"description": "Delimiter for Markup Attribute Key-Value pairs."
3288+
},
3289+
{
3290+
"id": "markupElement",
3291+
"description": "The name of a Markup element."
3292+
},
3293+
{
3294+
"id": "markupAttribute",
3295+
"description": "The name of a Markup attribute."
3296+
},
3297+
{
3298+
"id": "markupComment",
3299+
"description": "The contents of a Markup comment."
3300+
},
3301+
{
3302+
"id": "markupCommentPunctuation",
3303+
"description": "The begining or ending punctuation of a Markup comment."
3304+
},
32693305
{
32703306
"id": "plainKeyword",
32713307
"description": "Represents a keyword"
@@ -3384,6 +3420,43 @@
33843420
"razorDirectiveColon": [
33853421
"keyword.control.razor.directive.colon",
33863422
"keyword.control.cshtml.directive.colon"
3423+
],
3424+
"razorDirective": [
3425+
"keyword.control.razor.directive",
3426+
"keyword.control.cshtml.directive"
3427+
],
3428+
"razorComment": [
3429+
"comment.block.razor"
3430+
],
3431+
"razorCommentTransition": [
3432+
"meta.comment.razor",
3433+
"keyword.control.cshtml.transition"
3434+
],
3435+
"razorCommentStar": [
3436+
"keyword.control.razor.comment.star",
3437+
"meta.comment.razor"
3438+
],
3439+
"angleBracket": [
3440+
"punctuation.definition.tag"
3441+
],
3442+
"forwardSlash": [
3443+
"punctuation.definition.tag"
3444+
],
3445+
"equals": [
3446+
"punctuation.separator.key-value.html"
3447+
],
3448+
"markupElement": [
3449+
"entity.name.tag.html"
3450+
],
3451+
"markupAttribute": [
3452+
"entity.other.attribute-name.html"
3453+
],
3454+
"markupComment": [
3455+
"comment.block.html"
3456+
],
3457+
"markupCommentPunctuation": [
3458+
"punctuation.definition.comment.html",
3459+
"comment.block.html"
33873460
]
33883461
}
33893462
},

‎src/features/changeForwarding.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,24 @@ function forwardFileChanges(server: OmniSharpServer): IDisposable {
4949
return;
5050
}
5151

52-
let req = { FileName: uri.fsPath, changeType };
52+
const docs = workspace.textDocuments.filter(doc => doc.uri.fsPath === uri.fsPath);
53+
if (Array.isArray(docs) && docs.some(doc => !doc.isClosed)) {
54+
// When a file changes on disk a FileSystemEvent is generated as well as a
55+
// DidChangeTextDocumentEvent.The ordering of these is:
56+
// 1. This method is called back. vscode's TextDocument has not yet been reloaded, so it has
57+
// the version from before the changes are applied.
58+
// 2. vscode reloads the file, and fires onDidChangeTextDocument. The document has been updated,
59+
// and the changes have the delta.
60+
// If we send this change to the server, then it will reload from the disk, which means it will
61+
// be synchronized to the version after the changes. Then, onDidChangeTextDocument will fire and
62+
// send the delta changes, which will cause the server to apply those exact changes. The results
63+
// being that the file is now in an inconsistent state.
64+
// If the document is closed, however, it will no longer be synchronized, so the text change will
65+
// not be triggered and we should tell the server to reread from the disk.
66+
return;
67+
}
68+
69+
const req = { FileName: uri.fsPath, changeType };
5370

5471
serverUtils.filesChanged(server, [req]).catch(err => {
5572
console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);
@@ -65,7 +82,7 @@ function forwardFileChanges(server: OmniSharpServer): IDisposable {
6582
}
6683

6784
if (changeType === FileChangeType.Delete) {
68-
let requests = [{ FileName: uri.fsPath, changeType: FileChangeType.DirectoryDelete }];
85+
const requests = [{ FileName: uri.fsPath, changeType: FileChangeType.DirectoryDelete }];
6986

7087
serverUtils.filesChanged(server, requests).catch(err => {
7188
console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);

0 commit comments

Comments
 (0)