From 8644581526603a9e945fc70d875d2e027c226a38 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 29 Jun 2014 10:41:04 +0200 Subject: [PATCH] List the MS-PL in the README. --- ILSpy/AboutPage.cs | 1 + ILSpy/ILSpy.csproj | 3 +++ README.txt | 1 + doc/copyright.txt | 2 +- doc/license.txt | 4 +++- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ILSpy/AboutPage.cs b/ILSpy/AboutPage.cs index 850836068..edf4d8a1d 100644 --- a/ILSpy/AboutPage.cs +++ b/ILSpy/AboutPage.cs @@ -95,6 +95,7 @@ namespace ICSharpCode.ILSpy 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")); textView.ShowText(output); } diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index e46579fda..8b3aa84e1 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -230,6 +230,9 @@ license.txt + + MS-PL.txt + diff --git a/README.txt b/README.txt index b8013ea80..56ef9c3bb 100644 --- a/README.txt +++ b/README.txt @@ -9,6 +9,7 @@ Included open-source libraries: AvalonEdit: LGPL SharpTreeView: LGPL ICSharpCode.Decompiler: MIT License (developed as part of ILSpy) + Ricciolo.StylesExplorer: MS-PL (part of ILSpy.BamlDecompiler.Plugin) ILSpy Contributors: Daniel Grunwald diff --git a/doc/copyright.txt b/doc/copyright.txt index bcc2d6898..57fe86257 100644 --- a/doc/copyright.txt +++ b/doc/copyright.txt @@ -1,4 +1,4 @@ -Copyright 2011-2012 for the SharpDevelop team +Copyright 2011-2014 for the SharpDevelop team by AlphaSierraPapa, Christoph Wille diff --git a/doc/license.txt b/doc/license.txt index 3aa66eba5..1780d919a 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -1,10 +1,12 @@ The following MIT license applies to ILSpy, NRefactory and ICSharpCode.Decompiler. Mono.Cecil also uses the MIT license (Copyright JB Evain). 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: -Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop team +Copyright (c) 2011-2014 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