Skip to content

Commit 19a8af1

Browse files
authored
Merge pull request #3697 from OmniSharp/update/license
Updated license to include .net foundation
2 parents 91d97b2 + b25a97b commit 19a8af1

File tree

2 files changed

+77
-50
lines changed

2 files changed

+77
-50
lines changed

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: 59 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +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)
2222

2323
## What's new in 1.21.16
24-
* Support for .NET Core 3.1 in csx files (PR: [#1731](https://github.com/OmniSharp/omnisharp-roslyn/pull/1731))
25-
* 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))
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))
2627

2728
## What's new in 1.21.15
28-
* Fixed freezing and unresponsiveness when opening folder with many nested sub-folders (PR: [#3681](https://github.com/OmniSharp/omnisharp-vscode/pull/3681))
29-
* Fixed handling of dismiss response to assets prompt (PR: [3678](https://github.com/OmniSharp/omnisharp-vscode/pull/3678))
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))
3032

3133
## What's new in 1.21.14
32-
* Fixed an issue where Razor formatting fails in the presence of @using directives
33-
* 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))
34-
* 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))
3538

3639
## What's new in 1.21.13
37-
* Change Marketplace publisher for the C# extension from ms-vscode to ms-dotnettools
38-
* Ignore diagnostics from virtual files ([aspnetcore/#18927](https://github.com/dotnet/aspnetcore/issues/18927), PR: [#3592](https://github.com/OmniSharp/omnisharp-vscode/pull/3592))
39-
* 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))
40-
* Updated Razor support (PR:[3594](https://github.com/OmniSharp/omnisharp-vscode/pull/3594))
41-
* Support for @code/@functions block formatting
42-
* Updated Razor's TextMate grammar to include full syntactic colorization
43-
* Several bug fixes
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
4448

4549
### Supported Operating Systems for Debugging
4650

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

49-
* X64 operating systems:
50-
* Windows 7 SP1 and newer
51-
* macOS 10.12 (Sierra) and newer
52-
* 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.
53-
* ARM operating systems:
54-
* 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
5559

5660
### Found a Bug?
5761

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

6569
First install:
66-
* Node.js (8.11.1 or later)
67-
* Npm (5.6.0 or later)
70+
71+
- Node.js (8.11.1 or later)
72+
- Npm (5.6.0 or later)
6873

6974
To **run and develop** do the following:
7075

71-
* Run `npm i`
72-
* Run `npm run compile`
73-
* Open in Visual Studio Code (`code .`)
74-
* *Optional:* run `npm run watch`, make code changes
75-
* 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
7681

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

7984
### License
85+
86+
Copyright © .NET Foundation, and contributors.
87+
8088
The Microsoft C# extension is subject to [these license terms](RuntimeLicenses/license.txt).
8189
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)