Skip to content

Commit

Permalink
Update copyrights on non-source files (#2548)
Browse files Browse the repository at this point in the history
* Update copyrights on non source files
* Add changes from review
  • Loading branch information
marabooy authored Aug 18, 2021
1 parent 46d7ecb commit 0338075
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Pull request of features and bug fixes are both welcomed. Before you send a pull
### Complete a Contribution License Agreement (CLA)
You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.

Please submit a Contributor License Agreement (CLA) before submitting a pull request. Please fill and submit the [Contribution License Agreement Form | Microsoft](https://cla.microsoft.com/). Be sure to include your GitHub user name along with the agreement. Only after we have received the signed CLA, we'll review the pull request that you send. You only need to do this once for contributing to any Microsoft open source projects.
Please submit a Contributor License Agreement (CLA) before submitting a pull request. Please fill and submit the [Contributor License Agreement](https://cla.dotnetfoundation.org/). Be sure to include your GitHub user name along with the agreement. Only after we have received the signed CLA, we'll review the pull request that you send. This needs to only be done once for any .NET Foundation OSS project.

### Create a new issue on the issue tracker and link the pull request to it
You should have an issue created on the [issue tracker](https://github.com/OData/WebApi/issues) before you work on the pull request. After the OData Web API team has reviewed this issue and change its label to "accepting pull request", you can issue a pull request to us in which the link to the related issue is included.
Expand Down
3 changes: 1 addition & 2 deletions License.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OData-WebAPI

Copyright (c) Microsoft. All rights reserved.
Copyright (c) .NET Foundation and Contributors

Material in this repository is made available under the following terms:
1. Code is licensed under the MIT license, reproduced below.
Expand All @@ -23,4 +23,3 @@ NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPO
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

Build | Status
--------|---------
Odata.WebApi Rolling Dotnet pipeline | <img src="https://dev.azure.com/dotnet/OData/_apis/build/status/OData.WebApi-Rolling?branchName=master"/>
WebApi Rolling | <img src="https://identitydivision.visualstudio.com/OData/_apis/build/status/WebApi/WebApi-master-pipeline-Rolling"/>
WebApi Nightly | <img src="https://identitydivision.visualstudio.com/OData/_apis/build/status/WebApi/WebApi-master-pipeline-Nightly"/>
WebApi Nightly | <img src="https://dev.azure.com/dotnet/OData/_apis/build/status/OData.WebApi%20Nightly?branchName=master"/>

### Introduction

Expand Down Expand Up @@ -118,4 +119,10 @@ Please refer to the [How to debug](https://docs.microsoft.com/en-us/odata/webapi

### Code of Conduct

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
This project has adopted the [.NET Foundation Contributor Covenant Code of Conduct](https://dotnetfoundation.org/about/code-of-conduct). For more information see the [Code of Conduct FAQ](https://dotnetfoundation.org/about/faq).

### .NET Foundation

This project is supported by the [.NET Foundation](https://dotnetfoundation.org).

WebApi is a Copyright of &copy; .NET Foundation and other contributors. It is licensed under [MIT License](https://github.com/OData/WebApi/blob/master/License.txt)
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<id>Microsoft.AspNet.OData</id>
<title>Microsoft ASP.NET Web API 2.2 for OData v4.0</title>
<version>$VersionNuGetSemantic$-Nightly$NightlyBuildVersion$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<authors>OData (.NET Foundation)</authors>
<copyright>&#169; .NET Foundation and Contributors. All rights reserved.</copyright>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Web API and to support OData query syntax for your web APIs.</description>
<summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Web API.</summary>
<language>en-US</language>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<id>Microsoft.AspNet.OData</id>
<title>Microsoft ASP.NET Web API 2.2 for OData v4.0</title>
<version>$VersionNuGetSemantic$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<authors>OData (.NET Foundation)</authors>
<copyright>&#169; .NET Foundation and Contributors. All rights reserved.</copyright>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Web API and to support OData query syntax for your web APIs.</description>
<summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Web API.</summary>
<releaseNotes>https://docs.microsoft.com/en-us/odata/changelog/webapi-7x</releaseNotes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<id>Microsoft.AspNetCore.OData</id>
<title>Microsoft ASP.NET Core 2.0 and 3.x for OData v4.0</title>
<version>$VersionNuGetSemantic$-Nightly$NightlyBuildVersion$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<authors>OData (.NET Foundation)</authors>
<copyright>&#169; .NET Foundation and Contributors. All rights reserved.</copyright>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC and to support OData query syntax for your web APIs.</description>
<summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC.</summary>
<language>en-US</language>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<id>Microsoft.AspNetCore.OData</id>
<title>Microsoft ASP.NET Core 2.0 and 3.x for OData v4.0</title>
<version>$VersionNuGetSemantic$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<authors>OData (.NET Foundation)</authors>
<copyright>&#169; .NET Foundation and Contributors. All rights reserved.</copyright>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC and to support OData query syntax for your web APIs.</description>
<summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC.</summary>
<releaseNotes>https://docs.microsoft.com/en-us/odata/changelog/webapi-7x</releaseNotes>
Expand Down

0 comments on commit 0338075

Please sign in to comment.