Skip to content

Commit

Permalink
Merge pull request #3178 from icsharpcode/feature/splitbaml
Browse files Browse the repository at this point in the history
Split Baml Addin into library & addin projects
  • Loading branch information
christophwille committed Mar 18, 2024
2 parents d3c69fb + 0887d3e commit 9c82234
Show file tree
Hide file tree
Showing 74 changed files with 186 additions and 137 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ THE SOFTWARE.

using Metadata = ICSharpCode.Decompiler.Metadata;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal class BamlContext
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ THE SOFTWARE.

using System.Collections.Generic;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal class BamlDocument : List<BamlRecord>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ THE SOFTWARE.
using System.Diagnostics;
using System.Threading;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal abstract class BamlNode
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ THE SOFTWARE.
using System.Text;
using System.Threading;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal class BamlBinaryReader : BinaryReader
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ THE SOFTWARE.
using System.Diagnostics;
using System.IO;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal enum BamlRecordType : byte
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ THE SOFTWARE.
using System.IO;
using System.Text;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal class BamlBinaryWriter : BinaryWriter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
// Auto generated. Do not modify.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ THE SOFTWARE.
using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal partial class KnownThings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ THE SOFTWARE.

using System;

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
internal partial class KnownThings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

namespace ILSpy.BamlDecompiler.Baml
namespace ICSharpCode.BamlDecompiler.Baml
{
// Auto generated. Do not modify.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ THE SOFTWARE.

using ICSharpCode.Decompiler.TypeSystem;

namespace ILSpy.BamlDecompiler
namespace ICSharpCode.BamlDecompiler
{
/// <summary>
/// Represents a field assignment of a XAML code-behind class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

using ICSharpCode.Decompiler.TypeSystem;

namespace ILSpy.BamlDecompiler
namespace ICSharpCode.BamlDecompiler
{
public class BamlDecompilationResult
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;

namespace ILSpy.BamlDecompiler
namespace ICSharpCode.BamlDecompiler
{
public class BamlDecompilerSettings : INotifyPropertyChanged
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
using ICSharpCode.Decompiler.TypeSystem.Implementation;
using ICSharpCode.Decompiler.Util;

namespace ILSpy.BamlDecompiler
namespace ICSharpCode.BamlDecompiler
{
class BamlDecompilerTypeSystem : SimpleCompilation, IDecompilerTypeSystem
public class BamlDecompilerTypeSystem : SimpleCompilation, IDecompilerTypeSystem
{
string[] defaultBamlReferences = new[] {
"mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ THE SOFTWARE.
using System.Collections.Generic;
using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler
namespace ICSharpCode.BamlDecompiler
{
internal readonly struct XamlNode
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class ConstructorParametersStartHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class DocumentHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ILSpy.BamlDecompiler.Xaml;
using ICSharpCode.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Xaml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class ElementHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ILSpy.BamlDecompiler.Xaml;
using ICSharpCode.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Xaml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class KeyElementStartHandler : ElementHandler, IHandler, IDeferHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class PropertyArrayHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class PropertyComplexHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class PropertyDictionaryHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class PropertyListHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class AssemblyInfoHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class AttributeInfoHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class ConnectionIdHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ILSpy.BamlDecompiler.Xaml;
using ICSharpCode.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Xaml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class ConstructorParameterTypeHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class ContentPropertyHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class DefAttributeHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ILSpy.BamlDecompiler.Xaml;
using ICSharpCode.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Xaml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class DefAttributeStringHandler : IHandler, IDeferHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ILSpy.BamlDecompiler.Xaml;
using ICSharpCode.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Xaml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class DefAttributeTypeHandler : IHandler, IDeferHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Diagnostics;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class DeferableContentStartHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class LineNumberAndPositionHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class LinePositionHandler : IHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.

using System.Xml.Linq;

using ILSpy.BamlDecompiler.Baml;
using ICSharpCode.BamlDecompiler.Baml;

namespace ILSpy.BamlDecompiler.Handlers
namespace ICSharpCode.BamlDecompiler.Handlers
{
internal class LiteralContentHandler : IHandler
{
Expand Down
Loading

0 comments on commit 9c82234

Please sign in to comment.