Skip to content

Commit 0f9ee9d

Browse files
JoeRobichJoeRobich
authored
Merge branch 'master' into dev/waan/checkPlatformAndArch
2 parents 24e438f + 695d071 commit 0f9ee9d

File tree

19 files changed

+11009
-10871
lines changed

19 files changed

+11009
-10871
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
"updatePackageDependencies"
139139
],
140140
"env": {
141-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/10b0d22c-b2be-401e-bfee-bd3272f69cbd/cf8b4f8fb15c5ee83df1661b57c27cf5/omnisharp-linux-x64-1.34.14.zip,https://download.visualstudio.microsoft.com/download/pr/10b0d22c-b2be-401e-bfee-bd3272f69cbd/c817f764b125ba8707bb432190076369/omnisharp-linux-x86-1.34.14.zip,https://download.visualstudio.microsoft.com/download/pr/10b0d22c-b2be-401e-bfee-bd3272f69cbd/df88496e278305a692e136ba611953df/omnisharp-osx-1.34.14.zip,https://download.visualstudio.microsoft.com/download/pr/10b0d22c-b2be-401e-bfee-bd3272f69cbd/7eb8824895cbdb38af0355380389bcbf/omnisharp-win-x64-1.34.14.zip,https://download.visualstudio.microsoft.com/download/pr/10b0d22c-b2be-401e-bfee-bd3272f69cbd/d3b776c130c38812c0fd383720a5e318/omnisharp-win-x86-1.34.14.zip",
142-
"NEW_DEPS_VERSION": "1.34.14"
141+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/076ec7ac-bf89-4cfa-9c8d-c440bd14b966/54cf61c59ef7e3376d6460d1af05f7a7/omnisharp-linux-x64-1.34.15.zip,https://download.visualstudio.microsoft.com/download/pr/076ec7ac-bf89-4cfa-9c8d-c440bd14b966/172abd4e9fe368b3d9a7dc61be8c7541/omnisharp-linux-x86-1.34.15.zip,https://download.visualstudio.microsoft.com/download/pr/076ec7ac-bf89-4cfa-9c8d-c440bd14b966/cd8ab832a87dbd4a27bba98577b36c55/omnisharp-osx-1.34.15.zip,https://download.visualstudio.microsoft.com/download/pr/076ec7ac-bf89-4cfa-9c8d-c440bd14b966/a8f0af91dfcd7ea593dc781bc0f4f7ee/omnisharp-win-x64-1.34.15.zip,https://download.visualstudio.microsoft.com/download/pr/076ec7ac-bf89-4cfa-9c8d-c440bd14b966/bf0476eb0cc096cfd49b059987431d97/omnisharp-win-x86-1.34.15.zip",
142+
"NEW_DEPS_VERSION": "1.34.15"
143143
},
144144
"cwd": "${workspaceFolder}"
145145
}

‎CHANGELOG.md‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
1-
## Known Issues in 1.21.14
1+
## Known Issues in 1.21.16
22

33
* Known limitations with the preview Razor (cshtml) language service to be addressed in a future release:
44
* Only ASP.NET Core projects are supported (no support for ASP.NET projects)
5-
* Limited support for colorization and formatting
6-
* Loss of HTML completions following C# less than (`<`) operator
5+
* Limited support for formatting
76
* Error squiggles misaligned for expressions near the start of a new line
87
* Emmet based abbreviation expansion is not yet supported
98
* There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
109
* As an alternative, consider installing the [MSBuild Project Tools](https://marketplace.visualstudio.com/items?itemName=tintoy.msbuild-project-tools) extension by @tintoy.
1110

12-
## 1.21.14 (Not Yet Released)
11+
## 1.21.17 (Not yet released)
12+
* Updated Razor support (PR:[#3696](https://github.com/OmniSharp/omnisharp-vscode/pull/3696))
13+
* Razor support for `<text>` tag completions.
14+
* Ability to restart the Razor Language Server to activate changes to the `razor.trace` level.
15+
* Bug fixes and performance improvements.
16+
17+
## 1.21.16 (March 30, 2020)
18+
* Support for .NET Core 3.1 in csx files (PR: [#1731](https://github.com/OmniSharp/omnisharp-roslyn/pull/1731))
19+
* Update the minimal MSBuild to better support .NET 5 Previews ([omnisharp-vscode#3653](https://github.com/OmniSharp/omnisharp-vscode/issues/3653), PR: [#1746](https://github.com/OmniSharp/omnisharp-roslyn/pull/1746))
20+
21+
## 1.21.15 (March 19, 2020)
22+
* Fixed freezing and unresponsiveness when opening folder with many nested sub-folders (PR: [#3681](https://github.com/OmniSharp/omnisharp-vscode/pull/3681))
23+
* Fixed handling of dismiss response to assets prompt (PR: [3678](https://github.com/OmniSharp/omnisharp-vscode/pull/3678))
24+
25+
## 1.21.14 (March 11, 2020)
1326
* Fixed an issue where Razor formatting fails in the presence of @using directives
1427
* Added support for `annotations` value of `Nullable` csproj property ([omnisharp-roslyn/#1721](https://github.com/OmniSharp/omnisharp-roslyn/issues/1721), PR: [omnisharp-roslyn/#1722](https://github.com/OmniSharp/omnisharp-roslyn/pull/1722))
1528
* Added ability to specify custom RunSettings for tests (PR: [#3573](https://github.com/OmniSharp/omnisharp-vscode/pull/3573), PR: [omnisharp-roslyn/#1710](https://github.com/OmniSharp/omnisharp-roslyn/pull/1710))
1629

1730
## 1.21.13 (March 5, 2020)
18-
* Change Marketplace publisher for the C# extension from ms-vscode to ms-dotnettools
31+
* Change Marketplace publisher for the C# extension from ms-vscode to ms-dotnettools
1932
* Ignore diagnostics from virtual files ([aspnetcore/#18927](https://github.com/dotnet/aspnetcore/issues/18927), PR: [#3592](https://github.com/OmniSharp/omnisharp-vscode/pull/3592))
2033
* Detect and create Blazor WASM launch and debug settings ([aspnetcore/#17549](https://github.com/dotnet/aspnetcore/issues/17549), PR: [#3593](https://github.com/OmniSharp/omnisharp-vscode/pull/3593))
2134
* Updated Razor support (PR:[3594](https://github.com/OmniSharp/omnisharp-vscode/pull/3594))

‎LICENSE.txt‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
Copyright (c) Microsoft Corporation
2-
3-
All rights reserved.
4-
51
MIT License
62

7-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
8-
files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
9-
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
10-
is furnished to do so, subject to the following conditions:
3+
Copyright (c) .NET Foundation and Contributors
4+
All Rights Reserved
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
1112

12-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
1315

14-
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
15-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
16-
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
17-
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

‎README.md‎

Lines changed: 63 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
## C# for Visual Studio Code (powered by OmniSharp)
22

3-
|Master|Release|
4-
|:--:|:--:|
5-
|[![Master Build Status](https://travis-ci.org/OmniSharp/omnisharp-vscode.svg?branch=master)](https://travis-ci.org/OmniSharp/omnisharp-vscode)|[![Release Build Status](https://travis-ci.org/OmniSharp/omnisharp-vscode.svg?branch=release)](https://travis-ci.org/OmniSharp/omnisharp-vscode)|
3+
| Master | Release |
4+
| :--------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------: |
5+
| [![Master Build Status](https://travis-ci.org/OmniSharp/omnisharp-vscode.svg?branch=master)](https://travis-ci.org/OmniSharp/omnisharp-vscode) | [![Release Build Status](https://travis-ci.org/OmniSharp/omnisharp-vscode.svg?branch=release)](https://travis-ci.org/OmniSharp/omnisharp-vscode) |
66

77
[![Wallaby.js](https://img.shields.io/badge/wallaby.js-configured-green.svg)](https://wallabyjs.com)
88

99
Welcome to the C# extension for Visual Studio Code! This extension provides the following features inside VS Code:
1010

11-
* Lightweight development tools for [.NET Core](https://dotnet.github.io).
12-
* Great C# editing support, including Syntax Highlighting, IntelliSense, Go to Definition, Find All References, etc.
13-
* Debugging support for .NET Core (CoreCLR). NOTE: Mono debugging is not supported. Desktop CLR debugging has [limited support](https://github.com/OmniSharp/omnisharp-vscode/wiki/Desktop-.NET-Framework).
14-
* Support for project.json and csproj projects on Windows, macOS and Linux.
11+
- Lightweight development tools for [.NET Core](https://dotnet.github.io).
12+
- Great C# editing support, including Syntax Highlighting, IntelliSense, Go to Definition, Find All References, etc.
13+
- Debugging support for .NET Core (CoreCLR). NOTE: Mono debugging is not supported. Desktop CLR debugging has [limited support](https://github.com/OmniSharp/omnisharp-vscode/wiki/Desktop-.NET-Framework).
14+
- Support for project.json and csproj projects on Windows, macOS and Linux.
1515

1616
The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnisharp-roslyn).
1717

1818
### Get Started Writing C# in VS Code
1919

20-
* [Documentation](https://code.visualstudio.com/docs/languages/csharp)
21-
* [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-VSCode-Csharp-NET-Core-Windows)
20+
- [Documentation](https://code.visualstudio.com/docs/languages/csharp)
21+
- [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-VSCode-Csharp-NET-Core-Windows)
22+
23+
## What's new in 1.21.16
24+
25+
- Support for .NET Core 3.1 in csx files (PR: [#1731](https://github.com/OmniSharp/omnisharp-roslyn/pull/1731))
26+
- Update the minimal MSBuild to better support .NET 5 Previews ([omnisharp-vscode#3653](https://github.com/OmniSharp/omnisharp-vscode/issues/3653), PR: [#1746](https://github.com/OmniSharp/omnisharp-roslyn/pull/1746))
27+
28+
## What's new in 1.21.15
29+
30+
- Fixed freezing and unresponsiveness when opening folder with many nested sub-folders (PR: [#3681](https://github.com/OmniSharp/omnisharp-vscode/pull/3681))
31+
- Fixed handling of dismiss response to assets prompt (PR: [3678](https://github.com/OmniSharp/omnisharp-vscode/pull/3678))
2232

2333
## What's new in 1.21.14
24-
* Fixed an issue where Razor formatting fails in the presence of @using directives
25-
* Added support for `annotations` value of `Nullable` csproj property ([omnisharp-roslyn/#1721](https://github.com/OmniSharp/omnisharp-roslyn/issues/1721), PR: [omnisharp-roslyn/#1722](https://github.com/OmniSharp/omnisharp-roslyn/pull/1722))
26-
* Added ability to specify custom RunSettings for tests (PR: [#3573](https://github.com/OmniSharp/omnisharp-vscode/pull/3573), PR: [omnisharp-roslyn/#1710](https://github.com/OmniSharp/omnisharp-roslyn/pull/1710))
34+
35+
- Fixed an issue where Razor formatting fails in the presence of @using directives
36+
- Added support for `annotations` value of `Nullable` csproj property ([omnisharp-roslyn/#1721](https://github.com/OmniSharp/omnisharp-roslyn/issues/1721), PR: [omnisharp-roslyn/#1722](https://github.com/OmniSharp/omnisharp-roslyn/pull/1722))
37+
- Added ability to specify custom RunSettings for tests (PR: [#3573](https://github.com/OmniSharp/omnisharp-vscode/pull/3573), PR: [omnisharp-roslyn/#1710](https://github.com/OmniSharp/omnisharp-roslyn/pull/1710))
2738

2839
## What's new in 1.21.13
29-
* Change Marketplace publisher for the C# extension from ms-vscode to ms-dotnettools
30-
* Ignore diagnostics from virtual files ([aspnetcore/#18927](https://github.com/dotnet/aspnetcore/issues/18927), PR: [#3592](https://github.com/OmniSharp/omnisharp-vscode/pull/3592))
31-
* Detect and create Blazor WASM launch and debug settings ([aspnetcore/#17549](https://github.com/dotnet/aspnetcore/issues/17549), PR: [#3593](https://github.com/OmniSharp/omnisharp-vscode/pull/3593))
32-
* Updated Razor support (PR:[3594](https://github.com/OmniSharp/omnisharp-vscode/pull/3594))
33-
* Support for @code/@functions block formatting
34-
* Updated Razor's TextMate grammar to include full syntactic colorization
35-
* Several bug fixes
36-
37-
## What's new in 1.21.12
38-
* Fixed out of bounds exception in line mapping ([#3485](https://github.com/OmniSharp/omnisharp-vscode/issues/3485), PR: [omnisharp-roslyn/#1707](https://github.com/OmniSharp/omnisharp-roslyn/pull/1707))
39-
* Added support for aliases in project references ([omnisharp-roslyn/#1685](https://github.com/OmniSharp/omnisharp-roslyn/issues/1685), PR: [omnisharp-roslyn/#1701](https://github.com/OmniSharp/omnisharp-roslyn/pull/1701))
40-
* Raised the lowest discovered VS2019 version to 16.3 ([omnisharp-roslyn/#1700](https://github.com/OmniSharp/omnisharp-roslyn/issues/1700), PR: (#1713)(https://github.com/OmniSharp/omnisharp-roslyn/pull/1713))
41-
* Fixed a bug where organizing usings clashed with other formatting settings (PR: [omnisharp-roslyn/#1715](https://github.com/OmniSharp/omnisharp-roslyn/pull/1713))
42-
43-
## What's new in 1.21.11
44-
* Updated the bundled to Mono 6.8.0 and MSBuild to be copied from Mono 6.8.0 ([omnisharp-roslyn/#1693](https://github.com/OmniSharp/omnisharp-roslyn/issues/1693), PR: [omnisharp-roslyn/#1697](https://github.com/OmniSharp/omnisharp-roslyn/pull/1697))
45-
* Included NugetSDKResolver in the minimal MSBuild, which introduces support for Nuget based project SDKs like Arcade ([omnisharp-roslyn/#1678](https://github.com/OmniSharp/omnisharp-roslyn/issues/1678), PR: [omnisharp-roslyn/#1696](https://github.com/OmniSharp/omnisharp-roslyn/pull/1696))
46-
* Added option (`csharp.supressBuildAssetsNotification`) to surpress missing build asset notifications (PR:[#3538](https://github.com/OmniSharp/omnisharp-vscode/pull/3538))
47-
* The minimum Mono version required to run OmniSharp on has been increased to 6.4.0
40+
41+
- Change Marketplace publisher for the C# extension from ms-vscode to ms-dotnettools
42+
- Ignore diagnostics from virtual files ([aspnetcore/#18927](https://github.com/dotnet/aspnetcore/issues/18927), PR: [#3592](https://github.com/OmniSharp/omnisharp-vscode/pull/3592))
43+
- Detect and create Blazor WASM launch and debug settings ([aspnetcore/#17549](https://github.com/dotnet/aspnetcore/issues/17549), PR: [#3593](https://github.com/OmniSharp/omnisharp-vscode/pull/3593))
44+
- Updated Razor support (PR:[3594](https://github.com/OmniSharp/omnisharp-vscode/pull/3594))
45+
- Support for @code/@functions block formatting
46+
- Updated Razor's TextMate grammar to include full syntactic colorization
47+
- Several bug fixes
4848

4949
### Supported Operating Systems for Debugging
5050

51-
* Currently, the C# debugger officially supports the following operating systems:
51+
- Currently, the C# debugger officially supports the following operating systems:
5252

53-
* X64 operating systems:
54-
* Windows 7 SP1 and newer
55-
* macOS 10.12 (Sierra) and newer
56-
* Linux: see [.NET Core documentation](https://github.com/dotnet/core/blob/master/release-notes/2.2/2.2-supported-os.md#linux) for the list of supported distributions. Note that other Linux distributions will likely work as well as long as they include glibc and OpenSSL.
57-
* ARM operating systems:
58-
* Linux is supported as a remote debugging target
53+
- X64 operating systems:
54+
- Windows 7 SP1 and newer
55+
- macOS 10.12 (Sierra) and newer
56+
- Linux: see [.NET Core documentation](https://github.com/dotnet/core/blob/master/release-notes/2.2/2.2-supported-os.md#linux) for the list of supported distributions. Note that other Linux distributions will likely work as well as long as they include glibc and OpenSSL.
57+
- ARM operating systems:
58+
- Linux is supported as a remote debugging target
5959

6060
### Found a Bug?
6161

@@ -67,19 +67,37 @@ Alternatively you could visit https://github.com/OmniSharp/omnisharp-vscode/issu
6767
### Development
6868

6969
First install:
70-
* Node.js (8.11.1 or later)
71-
* Npm (5.6.0 or later)
70+
71+
- Node.js (8.11.1 or later)
72+
- Npm (5.6.0 or later)
7273

7374
To **run and develop** do the following:
7475

75-
* Run `npm i`
76-
* Run `npm run compile`
77-
* Open in Visual Studio Code (`code .`)
78-
* *Optional:* run `npm run watch`, make code changes
79-
* Press <kbd>F5</kbd> to debug
76+
- Run `npm i`
77+
- Run `npm run compile`
78+
- Open in Visual Studio Code (`code .`)
79+
- _Optional:_ run `npm run watch`, make code changes
80+
- Press <kbd>F5</kbd> to debug
8081

8182
To **test** do the following: `npm run test` or <kbd>F5</kbd> in VS Code with the "Launch Tests" debug configuration.
8283

8384
### License
85+
86+
Copyright © .NET Foundation, and contributors.
87+
8488
The Microsoft C# extension is subject to [these license terms](RuntimeLicenses/license.txt).
8589
The source code to this extension is available on [https://github.com/OmniSharp/omnisharp-vscode](https://github.com/OmniSharp/omnisharp-vscode) and licensed under the [MIT license](LICENSE.txt).
90+
91+
## Code of Conduct
92+
93+
This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/)
94+
to clarify expected behavior in our community.
95+
For more information see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).
96+
97+
## Contribution License Agreement
98+
99+
By signing the [CLA](https://cla.dotnetfoundation.org/OmniSharp/omnisharp-roslyn), the community is free to use your contribution to .NET Foundation projects.
100+
101+
## .NET Foundation
102+
103+
This project is supported by the [.NET Foundation](http://www.dotnetfoundation.org).

0 commit comments

Comments
 (0)