Skip to content
Permalink
Browse files

Move notices to appropriate files, change hyperlinks in AboutPage

  • Loading branch information
christophwille committed Jan 1, 2020
1 parent 791540b commit a7b898d9630a2eba9a7a86076294d5270c81cc4a
Showing with 376 additions and 50 deletions.
  1. +2 −2 ILSpy/AboutPage.cs
  2. +2 −1 ILSpy/ILSpy.csproj
  3. +2 −12 README.md
  4. +13 −0 doc/ILSpyAboutPage.txt
  5. +2 −1 doc/README.md
  6. +0 −19 doc/README.txt
  7. +3 −11 doc/license.txt
  8. +352 −4 doc/third-party-notices.txt
@@ -89,18 +89,18 @@ public static void Display(DecompilerTextView textView)
foreach (var plugin in App.ExportProvider.GetExportedValues<IAboutPageAddition>())
plugin.Write(output);
output.WriteLine();
using (Stream s = typeof(AboutPage).Assembly.GetManifestResourceStream(typeof(AboutPage), "README.txt")) {
using (Stream s = typeof(AboutPage).Assembly.GetManifestResourceStream(typeof(AboutPage), "ILSpyAboutPage.txt")) {
using (StreamReader r = new StreamReader(s)) {
string line;
while ((line = r.ReadLine()) != null) {
output.WriteLine(line);
}
}
}
output.AddVisualLineElementGenerator(new MyLinkElementGenerator("SharpDevelop", "http://www.icsharpcode.net/opensource/sd/"));
output.AddVisualLineElementGenerator(new MyLinkElementGenerator("MIT License", "resource:license.txt"));
output.AddVisualLineElementGenerator(new MyLinkElementGenerator("LGPL", "resource:LGPL.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);
}

@@ -418,7 +418,8 @@
<Compile Include="Commands\SearchMsdnContextMenuEntry.cs" />
<Compile Include="Analyzers\Builtin\TypeExtensionMethodsAnalyzer.cs" />
<Compile Include="Docking\DockWorkspace.cs" />
<EmbeddedResource Include="..\doc\README.txt" />
<EmbeddedResource Include="..\doc\ILSpyAboutPage.txt" />
<EmbeddedResource Include="..\doc\third-party-notices.txt" />
<EmbeddedResource Include="..\doc\LGPL.txt">
<Link>LGPL.txt</Link>
</EmbeddedResource>
@@ -33,18 +33,8 @@ Features
License
-------

ILSpy is distributed under the MIT License.

Included open-source libraries:
* Mono.Cecil: MIT License (part of ILSpy)
* LightJson: MIT License (part of ICSharpCode.Decompiler)
* Humanizer: MIT License (part of ICSharpCode.Decompiler)
* AvalonEdit: MIT License
* SharpTreeView: LGPL
* ILSpy.BamlDecompiler: MIT license
* CommandLineUtils: Apache License 2.0 (part of ICSharpCode.Decompiler.Console)
* ILCompiler.Reflection.ReadyToRun: MIT License (part of ILSpy.ReadyToRun)
* Iced: MIT License (part of ILSpy.ReadyToRun)
ILSpy is distributed under the MIT License. Please see the [About](doc/ILSpyAboutPage.txt) doc for details,
as well as [third party notices](doc/third-party-notices.txt) for included open-source libraries.

How to build
------------
@@ -0,0 +1,13 @@
ILSpy is the open-source .NET assembly browser and decompiler.

Website: https://ilspy.net/
Found a bug? https://github.com/icsharpcode/ILSpy/issues/new

Copyright 2011-2020 AlphaSierraPapa for the ILSpy team
Current and past contributors: https://github.com/icsharpcode/ILSpy/graphs/contributors

ILSpy is distributed under the MIT License. There is only one first-party component that has a different license:
SharpTreeView: LGPL

ILSpy uses other open-source libraries to make its magic happen, and we want to thank the people working
on those components! For the respective licenses and copyright information please see third-party notices.
@@ -4,7 +4,8 @@

|File|Contents/Usage|
|---|---|
|readme.txt|Binary inclusion in ILSpy for About listing ILSpy components' licenses and third party notices link|
|ILSpyAboutPage.txt|Binary inclusion in ILSpy for About listing ILSpy components' licenses and third party notices link|
|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|
|lgpl.txt|LGPL license|

This file was deleted.

@@ -1,14 +1,6 @@
The following MIT license applies to ILSpy, NRefactory and ICSharpCode.Decompiler.
Mono.Cecil also uses the MIT license (Copyright JB Evain).
ILCompiler.Reflection.ReadyToRun also uses the MIT license (Copyright Microsoft).
Iced also uses the MIT license (Copyright 0xd4d).
AvalonEdit and SharpTreeView use LGPL, which can be found in the LGPL.txt file.
ILSpy.BamlDecompiler uses the MS-PL, which can be found in the MS-PL.txt file.
MIT license


MIT license:

Copyright (c) 2011-2014 AlphaSierraPapa for the SharpDevelop team
Copyright (c) 2011-2020 AlphaSierraPapa for the SharpDevelop team

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
@@ -24,4 +16,4 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PA
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.
DEALINGS IN THE SOFTWARE.

0 comments on commit a7b898d

Please sign in to comment.
You can’t perform that action at this time.