From 7b5f579c3d5e8664be77dbe231771610e5803799 Mon Sep 17 00:00:00 2001 From: Kevin Pilch Date: Fri, 16 Jul 2021 16:21:05 -0700 Subject: [PATCH] Update license to MIT Configure StyleCop to run for all projects, and update config to use new license header. --- All.sln.DotSettings | 4 +- Directory.Build.props | 10 +- LICENSE.txt | 214 ++---------------- README.md | 2 +- benchmark/Directory.Build.props | 4 + .../Support/Program.cs | 5 +- .../Support/Program.cs | 5 +- rulesets/EFCore.noxmldocs.ruleset | 6 + rulesets/StyleCop.noxmldocs.ruleset | 158 +++++++++++++ src/Directory.Build.props | 2 +- .../EFCore.Abstractions.csproj | 8 - src/EFCore.Analyzers/EFCore.Analyzers.csproj | 1 + src/EFCore.Cosmos/EFCore.Cosmos.csproj | 5 - src/EFCore.Design/EFCore.Design.csproj | 10 - src/EFCore.InMemory/EFCore.InMemory.csproj | 8 - src/EFCore.Proxies/EFCore.Proxies.csproj | 5 - .../EFCore.Relational.csproj | 5 - .../EFCore.SqlServer.NTS.csproj | 5 - src/EFCore.SqlServer/EFCore.SqlServer.csproj | 5 - .../SqlServerValueGenerationStrategy.cs | 4 +- .../EFCore.Sqlite.Core.csproj | 5 - .../EFCore.Sqlite.NTS.csproj | 5 - src/EFCore/EFCore.csproj | 5 - .../Extensions/SqliteConnectionExtensions.cs | 4 +- .../Microsoft.Data.Sqlite.Core.csproj | 5 - src/dotnet-ef/dotnet-ef.csproj | 4 +- src/ef/ef.csproj | 1 + src/stylecop.json => stylecop.json | 2 +- test/Directory.Build.props | 1 + .../IdentifierShadowValuePresenceTest.cs | 5 +- .../NullabilityCheckInMemoryTest.cs | 5 +- .../.editorconfig | 2 + .../TPTFiltersInheritanceQueryTestBase.cs | 4 +- .../Query/TPTInheritanceQueryTestBase.cs | 4 +- .../Query/TPTRelationshipsQueryTestBase.cs | 4 +- test/EFCore.Specification.Tests/.editorconfig | 2 + .../TestUtilities/SqliteTestFramework.cs | 5 +- 37 files changed, 237 insertions(+), 292 deletions(-) create mode 100644 rulesets/EFCore.noxmldocs.ruleset create mode 100644 rulesets/StyleCop.noxmldocs.ruleset rename src/stylecop.json => stylecop.json (65%) create mode 100644 test/EFCore.Relational.Specification.Tests/.editorconfig create mode 100644 test/EFCore.Specification.Tests/.editorconfig diff --git a/All.sln.DotSettings b/All.sln.DotSettings index 057325cb8fc..ce72e4db697 100644 --- a/All.sln.DotSettings +++ b/All.sln.DotSettings @@ -113,8 +113,8 @@ True - Copyright (c) .NET Foundation. All rights reserved. -Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + Licensed to the .NET Foundation under one or more agreements. +The .NET Foundation licenses this file to you under the MIT license. True True diff --git a/Directory.Build.props b/Directory.Build.props index af76358b8be..bcfd949ae40 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,7 +13,7 @@ $(CopyrightMicrosoft) - Apache-2.0 + MIT @@ -34,4 +34,12 @@ $(NoWarn.Replace(';1591', '')) + + + + + + + + diff --git a/LICENSE.txt b/LICENSE.txt index 261eeb9e9f8..a616ed188df 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,201 +1,23 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +The MIT License (MIT) - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Copyright (c) .NET Foundation and Contributors - 1. Definitions. +All rights reserved. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND 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. \ No newline at end of file diff --git a/README.md b/README.md index 2394463d8d4..5794f877955 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![build status](https://img.shields.io/azure-devops/build/dnceng/public/51/main)](https://dev.azure.com/dnceng/public/_build?definitionId=51) [![test results](https://img.shields.io/azure-devops/tests/dnceng/public/51/main)](https://dev.azure.com/dnceng/public/_build?definitionId=51) -This repository is home to the following [.NET Foundation](https://dotnetfoundation.org/) projects. These projects are maintained by [Microsoft](https://github.com/microsoft) and licensed under the [Apache License, Version 2.0](LICENSE.txt). +This repository is home to the following [.NET Foundation](https://dotnetfoundation.org/) projects. These projects are maintained by [Microsoft](https://github.com/microsoft) and licensed under the [MIT License](LICENSE.txt). * [Entity Framework Core](#entity-framework-core) * [Microsoft.Data.Sqlite](#microsoftdatasqlite) diff --git a/benchmark/Directory.Build.props b/benchmark/Directory.Build.props index bbd28202961..a8a3e97a50b 100644 --- a/benchmark/Directory.Build.props +++ b/benchmark/Directory.Build.props @@ -1,6 +1,10 @@ + + $(MSBuildThisFileDirectory)..\rulesets\EFCore.noxmldocs.ruleset + + diff --git a/benchmark/EFCore.SqlServer.Benchmarks/Support/Program.cs b/benchmark/EFCore.SqlServer.Benchmarks/Support/Program.cs index e57a97c3a64..2d3d16e906f 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/Support/Program.cs +++ b/benchmark/EFCore.SqlServer.Benchmarks/Support/Program.cs @@ -1,7 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable once CheckNamespace + namespace Microsoft.EntityFrameworkCore.Benchmarks { public class Program diff --git a/benchmark/EFCore.Sqlite.Benchmarks/Support/Program.cs b/benchmark/EFCore.Sqlite.Benchmarks/Support/Program.cs index e57a97c3a64..2d3d16e906f 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/Support/Program.cs +++ b/benchmark/EFCore.Sqlite.Benchmarks/Support/Program.cs @@ -1,7 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable once CheckNamespace + namespace Microsoft.EntityFrameworkCore.Benchmarks { public class Program diff --git a/rulesets/EFCore.noxmldocs.ruleset b/rulesets/EFCore.noxmldocs.ruleset new file mode 100644 index 00000000000..54e16eeaa07 --- /dev/null +++ b/rulesets/EFCore.noxmldocs.ruleset @@ -0,0 +1,6 @@ + + + + + + diff --git a/rulesets/StyleCop.noxmldocs.ruleset b/rulesets/StyleCop.noxmldocs.ruleset new file mode 100644 index 00000000000..9d4a96b9e80 --- /dev/null +++ b/rulesets/StyleCop.noxmldocs.ruleset @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 454351144fa..aeabbdb4b39 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -5,9 +5,9 @@ latest True True - $(MSBuildThisFileDirectory)..\rulesets\EFCore.ruleset enable nullablePublicOnly + $(MSBuildThisFileDirectory)..\rulesets\EFCore.ruleset diff --git a/src/EFCore.Abstractions/EFCore.Abstractions.csproj b/src/EFCore.Abstractions/EFCore.Abstractions.csproj index 168947c9dc6..69e62285e63 100644 --- a/src/EFCore.Abstractions/EFCore.Abstractions.csproj +++ b/src/EFCore.Abstractions/EFCore.Abstractions.csproj @@ -14,14 +14,6 @@ - - - - - - - - TextTemplatingFileGenerator diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj index 86c654c8300..ef78e6250d6 100644 --- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj +++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj @@ -7,6 +7,7 @@ Microsoft.EntityFrameworkCore false $(MSBuildProjectName).nuspec + $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj index db462d4eac9..3ce935402d2 100644 --- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj +++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj @@ -20,14 +20,9 @@ - - - - - CosmosStrings.Designer.tt diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj index 22ac5930039..73fe4768fa6 100644 --- a/src/EFCore.Design/EFCore.Design.csproj +++ b/src/EFCore.Design/EFCore.Design.csproj @@ -9,11 +9,6 @@ True - - - $(NoWarn);SA1636 - - @@ -37,11 +32,6 @@ - - - - - diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj index ea230f38e9b..c2486dacb66 100644 --- a/src/EFCore.InMemory/EFCore.InMemory.csproj +++ b/src/EFCore.InMemory/EFCore.InMemory.csproj @@ -44,12 +44,4 @@ - - - - - - - - diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj index dc5963792b0..66464791283 100644 --- a/src/EFCore.Proxies/EFCore.Proxies.csproj +++ b/src/EFCore.Proxies/EFCore.Proxies.csproj @@ -16,7 +16,6 @@ - @@ -49,8 +48,4 @@ - - - - diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj index d98b86413f2..994d31cfeb4 100644 --- a/src/EFCore.Relational/EFCore.Relational.csproj +++ b/src/EFCore.Relational/EFCore.Relational.csproj @@ -20,11 +20,6 @@ - - - - - diff --git a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj index ec326482a96..386ce29a444 100644 --- a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj +++ b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj @@ -29,11 +29,6 @@ - - - - - diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 984ab22640d..cf9d805d55d 100644 --- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -20,14 +20,9 @@ - - - - - TextTemplatingFileGenerator diff --git a/src/EFCore.SqlServer/Metadata/SqlServerValueGenerationStrategy.cs b/src/EFCore.SqlServer/Metadata/SqlServerValueGenerationStrategy.cs index 610e8fac7b9..5654c0c9ee6 100644 --- a/src/EFCore.SqlServer/Metadata/SqlServerValueGenerationStrategy.cs +++ b/src/EFCore.SqlServer/Metadata/SqlServerValueGenerationStrategy.cs @@ -1,5 +1,5 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable once CheckNamespace diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj index ae5e74d1a9a..935a62e0701 100644 --- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj +++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj @@ -23,11 +23,6 @@ - - - - - diff --git a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj index 9ab39304e10..b0e767bd006 100644 --- a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj +++ b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj @@ -31,11 +31,6 @@ - - - - - diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj index 4deb1cc2bd7..038f1d38f95 100644 --- a/src/EFCore/EFCore.csproj +++ b/src/EFCore/EFCore.csproj @@ -24,11 +24,6 @@ Microsoft.EntityFrameworkCore.DbSet - - - - - diff --git a/src/Microsoft.Data.Sqlite.Core/Extensions/SqliteConnectionExtensions.cs b/src/Microsoft.Data.Sqlite.Core/Extensions/SqliteConnectionExtensions.cs index d2c33dd8d2b..962fd020807 100644 --- a/src/Microsoft.Data.Sqlite.Core/Extensions/SqliteConnectionExtensions.cs +++ b/src/Microsoft.Data.Sqlite.Core/Extensions/SqliteConnectionExtensions.cs @@ -1,5 +1,5 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable once CheckNamespace diff --git a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj index 73da8103b78..95ffd298805 100644 --- a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj +++ b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj @@ -40,11 +40,6 @@ Microsoft.Data.Sqlite.SqliteTransaction - - - - - diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 2bf865be2b9..ac87e418969 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -22,6 +22,7 @@ dotnet ef database update false $(MSBuildProjectName).nuspec Major + $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset @@ -71,8 +72,7 @@ dotnet ef database update - + true diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj index 6670c4c4b37..77a7d8d87fe 100644 --- a/src/ef/ef.csproj +++ b/src/ef/ef.csproj @@ -7,6 +7,7 @@ false Microsoft.EntityFrameworkCore.Tools False + $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset diff --git a/src/stylecop.json b/stylecop.json similarity index 65% rename from src/stylecop.json rename to stylecop.json index 6b58ed858ca..00aa858d4d9 100644 --- a/src/stylecop.json +++ b/stylecop.json @@ -3,7 +3,7 @@ "settings": { "documentationRules": { "companyName": ".NET Foundation", - "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the Apache License, Version 2.0. See License.txt in the project root for license information.", + "copyrightText": "Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.", "xmlHeader": false, "documentInterfaces": false, "documentInternalElements": false diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 86571cd8ba2..18af88fd9b9 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -3,6 +3,7 @@ $(NoWarn);CA1707;1591;xUnit1000;xUnit1003;xUnit1004;xUnit1010;xUnit1013;xUnit1026 + $(MSBuildThisFileDirectory)..\rulesets\EFCore.noxmldocs.ruleset diff --git a/test/EFCore.Cosmos.FunctionalTests/Internal/IdentifierShadowValuePresenceTest.cs b/test/EFCore.Cosmos.FunctionalTests/Internal/IdentifierShadowValuePresenceTest.cs index 11791bb9376..7bf3f2dddeb 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Internal/IdentifierShadowValuePresenceTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Internal/IdentifierShadowValuePresenceTest.cs @@ -1,4 +1,7 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; diff --git a/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs index 60011da2718..4c2c4560253 100644 --- a/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs @@ -1,4 +1,7 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.EntityFrameworkCore.InMemory.Internal; diff --git a/test/EFCore.Relational.Specification.Tests/.editorconfig b/test/EFCore.Relational.Specification.Tests/.editorconfig new file mode 100644 index 00000000000..63c7186f1bc --- /dev/null +++ b/test/EFCore.Relational.Specification.Tests/.editorconfig @@ -0,0 +1,2 @@ +[{*.cs}] +dotnet_diagnostic.SA1602.severity = suggestion diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTFiltersInheritanceQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTFiltersInheritanceQueryTestBase.cs index 6a6f113b75b..935a5bb6a01 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/TPTFiltersInheritanceQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/TPTFiltersInheritanceQueryTestBase.cs @@ -1,5 +1,5 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable InconsistentNaming diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTInheritanceQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTInheritanceQueryTestBase.cs index 566447d77f3..3a30543d613 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/TPTInheritanceQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/TPTInheritanceQueryTestBase.cs @@ -1,5 +1,5 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable InconsistentNaming diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryTestBase.cs index 7201871df30..2f08bc56da1 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryTestBase.cs @@ -1,5 +1,5 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. // ReSharper disable InconsistentNaming diff --git a/test/EFCore.Specification.Tests/.editorconfig b/test/EFCore.Specification.Tests/.editorconfig new file mode 100644 index 00000000000..63c7186f1bc --- /dev/null +++ b/test/EFCore.Specification.Tests/.editorconfig @@ -0,0 +1,2 @@ +[{*.cs}] +dotnet_diagnostic.SA1602.severity = suggestion diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs index b4c9319c5b5..7d3e91db935 100644 --- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs +++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs @@ -1,4 +1,7 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; using System.Collections.Generic; using System.Reflection; using System.Threading;