From 02da8a3cf1c2d6803e62d10e3c3d18042a5cc734 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Sat, 18 Apr 2020 15:49:02 +0200 Subject: [PATCH] Remove MS-PL from docs (was no longer applicable to any portions of ILSpy) --- ILSpy/AboutPage.cs | 1 - doc/MS-PL.txt | 31 ------------------------------- doc/README.md | 1 - 3 files changed, 33 deletions(-) delete mode 100644 doc/MS-PL.txt diff --git a/ILSpy/AboutPage.cs b/ILSpy/AboutPage.cs index d4288f8b5..e904de4a8 100644 --- a/ILSpy/AboutPage.cs +++ b/ILSpy/AboutPage.cs @@ -97,7 +97,6 @@ namespace ICSharpCode.ILSpy } } output.AddVisualLineElementGenerator(new MyLinkElementGenerator("MIT License", "resource:license.txt")); - output.AddVisualLineElementGenerator(new MyLinkElementGenerator("MS-PL", "resource:MS-PL.txt")); output.AddVisualLineElementGenerator(new MyLinkElementGenerator("third-party notices", "resource:third-party-notices.txt")); textView.ShowText(output); } diff --git a/doc/MS-PL.txt b/doc/MS-PL.txt deleted file mode 100644 index 622a544b7..000000000 --- a/doc/MS-PL.txt +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Public License (Ms-PL) - -This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. - -1. Definitions - -The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. - -A "contribution" is the original software, or any additions or changes to the software. - -A "contributor" is any person that distributes its contribution under this license. - -"Licensed patents" are a contributor's patent claims that read directly on its contribution. - -2. Grant of Rights - -(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. - -(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. - -3. Conditions and Limitations - -(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. - -(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. - -(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. - -(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. - -(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. \ No newline at end of file diff --git a/doc/README.md b/doc/README.md index 33cba725b..b6b859b7b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -8,7 +8,6 @@ |third-party-notices.txt|Binary inclusion in ILSpy for third party libraries and code used in ILSpy and its components| |copyright.txt|Copyright notice for ILSpy| |license.txt|MIT license for ILSpy| -|MS-PL.txt|MS-PL license| ## Other