From 7c259a8895908cc518ecb8506c3d4c5bf7711952 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Mon, 18 Mar 2024 17:46:26 +0100 Subject: [PATCH 1/2] Split Baml Addin into library & addin projects --- .../Baml/BamlContext.cs | 2 +- .../Baml/BamlDocument.cs | 2 +- .../Baml/BamlNode.cs | 2 +- .../Baml/BamlReader.cs | 2 +- .../Baml/BamlRecords.cs | 2 +- .../Baml/BamlWriter.cs | 2 +- .../Baml/KnownMembers.cs | 2 +- .../Baml/KnownThings.cs | 2 +- .../Baml/KnownThings.g.cs | 2 +- .../Baml/KnownThings.gen.cs | 0 .../Baml/KnownTypes.cs | 2 +- .../BamlConnectionId.cs | 2 +- .../BamlDecompilationResult.cs | 2 +- .../BamlDecompilerSettings.cs | 2 +- .../BamlDecompilerTypeSystem.cs | 4 +- .../BamlElement.cs | 4 +- .../Blocks/ConstructorParametersHandler.cs | 4 +- .../Handlers/Blocks/DocumentHandler.cs | 4 +- .../Handlers/Blocks/ElementHandler.cs | 6 +-- .../Handlers/Blocks/KeyElementStartHandler.cs | 6 +-- .../Handlers/Blocks/PropertyArrayHandler.cs | 4 +- .../Handlers/Blocks/PropertyComplexHandler.cs | 4 +- .../Blocks/PropertyDictionaryHandler.cs | 4 +- .../Handlers/Blocks/PropertyListHandler.cs | 4 +- .../Handlers/Records/AssemblyInfoHandler.cs | 4 +- .../Handlers/Records/AttributeInfoHandler.cs | 4 +- .../Handlers/Records/ConnectionIdHandler.cs | 4 +- .../ConstructorParameterTypeHandler.cs | 6 +-- .../Records/ContentPropertyHandler.cs | 4 +- .../Handlers/Records/DefAttributeHandler.cs | 4 +- .../Records/DefAttributeKeyStringHandler.cs | 6 +-- .../Records/DefAttributeKeyTypeHandler.cs | 6 +-- .../Records/DeferableContentStartHandler.cs | 4 +- .../Records/LineNumberAndPositionHandler.cs | 4 +- .../Handlers/Records/LinePositionHandler.cs | 4 +- .../Handlers/Records/LiteralContentHandler.cs | 4 +- .../Records/OptimizedStaticResourceHandler.cs | 6 +-- .../Handlers/Records/PIMappingHandler.cs | 4 +- .../PresentationOptionsAttributeHandler.cs | 4 +- .../Handlers/Records/PropertyCustomHandler.cs | 6 +-- .../Handlers/Records/PropertyHandler.cs | 6 +-- .../Records/PropertyTypeReferenceHandler.cs | 6 +-- .../Records/PropertyWithConverterHandler.cs | 4 +- .../Records/PropertyWithExtensionHandler.cs | 6 +-- .../PropertyWithStaticResourceIdHandler.cs | 6 +-- .../Records/StaticResourceIdHandler.cs | 6 +-- .../Records/StaticResourceStartHandler.cs | 6 +-- .../Handlers/Records/TextHandler.cs | 4 +- .../Records/TextWithConverterHandler.cs | 4 +- .../Handlers/Records/TypeInfoHandler.cs | 4 +- .../Handlers/Records/XmlnsPropertyHandler.cs | 6 +-- .../ICSharpCode.BamlDecompiler.csproj | 42 +++++++++++++++++++ .../IHandlers.cs | 4 +- .../IRewritePass.cs | 2 +- .../Rewrite/AttributeRewritePass.cs | 4 +- .../Rewrite/ConnectionIdRewritePass.cs | 4 +- .../Rewrite/DocumentRewritePass.cs | 2 +- .../Rewrite/MarkupExtensionRewritePass.cs | 6 +-- .../Rewrite/XClassRewritePass.cs | 4 +- .../Xaml/NamespaceMap.cs | 2 +- .../Xaml/XamlExtension.cs | 2 +- .../Xaml/XamlPathDeserializer.cs | 2 +- .../Xaml/XamlProperty.cs | 2 +- .../Xaml/XamlResourceKey.cs | 4 +- .../Xaml/XamlType.cs | 2 +- .../Xaml/XamlUtils.cs | 2 +- .../XamlContext.cs | 6 +-- .../XamlDecompiler.cs | 8 ++-- .../XmlnsDictionary.cs | 4 +- ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs | 1 + ILSpy.BamlDecompiler/BamlResourceEntryNode.cs | 1 + .../BamlResourceNodeFactory.cs | 2 +- .../ILSpy.BamlDecompiler.csproj | 1 + ILSpy.sln | 6 +++ 74 files changed, 182 insertions(+), 133 deletions(-) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/BamlContext.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/BamlDocument.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/BamlNode.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/BamlReader.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/BamlRecords.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/BamlWriter.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/KnownMembers.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/KnownThings.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/KnownThings.g.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/KnownThings.gen.cs (100%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Baml/KnownTypes.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/BamlConnectionId.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/BamlDecompilationResult.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/BamlDecompilerSettings.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/BamlDecompilerTypeSystem.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/BamlElement.cs (96%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/ConstructorParametersHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/DocumentHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/ElementHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/KeyElementStartHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/PropertyArrayHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/PropertyComplexHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/PropertyDictionaryHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Blocks/PropertyListHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/AssemblyInfoHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/AttributeInfoHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/ConnectionIdHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/ConstructorParameterTypeHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/ContentPropertyHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/DefAttributeHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/DefAttributeKeyStringHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/DefAttributeKeyTypeHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/DeferableContentStartHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/LineNumberAndPositionHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/LinePositionHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/LiteralContentHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/OptimizedStaticResourceHandler.cs (96%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PIMappingHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PresentationOptionsAttributeHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PropertyCustomHandler.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PropertyHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PropertyTypeReferenceHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PropertyWithConverterHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PropertyWithExtensionHandler.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/PropertyWithStaticResourceIdHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/StaticResourceIdHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/StaticResourceStartHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/TextHandler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/TextWithConverterHandler.cs (93%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/TypeInfoHandler.cs (94%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Handlers/Records/XmlnsPropertyHandler.cs (95%) create mode 100644 ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/IHandlers.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/IRewritePass.cs (96%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Rewrite/AttributeRewritePass.cs (96%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Rewrite/ConnectionIdRewritePass.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Rewrite/DocumentRewritePass.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Rewrite/MarkupExtensionRewritePass.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Rewrite/XClassRewritePass.cs (96%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/NamespaceMap.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/XamlExtension.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/XamlPathDeserializer.cs (99%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/XamlProperty.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/XamlResourceKey.cs (97%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/XamlType.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/Xaml/XamlUtils.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/XamlContext.cs (98%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/XamlDecompiler.cs (95%) rename {ILSpy.BamlDecompiler => ICSharpCode.BamlDecompiler}/XmlnsDictionary.cs (97%) diff --git a/ILSpy.BamlDecompiler/Baml/BamlContext.cs b/ICSharpCode.BamlDecompiler/Baml/BamlContext.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/BamlContext.cs rename to ICSharpCode.BamlDecompiler/Baml/BamlContext.cs index 7f66138c67..21a2e733fc 100644 --- a/ILSpy.BamlDecompiler/Baml/BamlContext.cs +++ b/ICSharpCode.BamlDecompiler/Baml/BamlContext.cs @@ -30,7 +30,7 @@ THE SOFTWARE. using Metadata = ICSharpCode.Decompiler.Metadata; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal class BamlContext { diff --git a/ILSpy.BamlDecompiler/Baml/BamlDocument.cs b/ICSharpCode.BamlDecompiler/Baml/BamlDocument.cs similarity index 97% rename from ILSpy.BamlDecompiler/Baml/BamlDocument.cs rename to ICSharpCode.BamlDecompiler/Baml/BamlDocument.cs index 6126c003d7..6ed797e9d6 100644 --- a/ILSpy.BamlDecompiler/Baml/BamlDocument.cs +++ b/ICSharpCode.BamlDecompiler/Baml/BamlDocument.cs @@ -22,7 +22,7 @@ THE SOFTWARE. using System.Collections.Generic; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal class BamlDocument : List { diff --git a/ILSpy.BamlDecompiler/Baml/BamlNode.cs b/ICSharpCode.BamlDecompiler/Baml/BamlNode.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/BamlNode.cs rename to ICSharpCode.BamlDecompiler/Baml/BamlNode.cs index a09c55851b..c8049a668a 100644 --- a/ILSpy.BamlDecompiler/Baml/BamlNode.cs +++ b/ICSharpCode.BamlDecompiler/Baml/BamlNode.cs @@ -25,7 +25,7 @@ THE SOFTWARE. using System.Diagnostics; using System.Threading; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal abstract class BamlNode { diff --git a/ILSpy.BamlDecompiler/Baml/BamlReader.cs b/ICSharpCode.BamlDecompiler/Baml/BamlReader.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/BamlReader.cs rename to ICSharpCode.BamlDecompiler/Baml/BamlReader.cs index 8f1c6f861f..bed8f934a0 100644 --- a/ILSpy.BamlDecompiler/Baml/BamlReader.cs +++ b/ICSharpCode.BamlDecompiler/Baml/BamlReader.cs @@ -26,7 +26,7 @@ THE SOFTWARE. using System.Text; using System.Threading; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal class BamlBinaryReader : BinaryReader { diff --git a/ILSpy.BamlDecompiler/Baml/BamlRecords.cs b/ICSharpCode.BamlDecompiler/Baml/BamlRecords.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/BamlRecords.cs rename to ICSharpCode.BamlDecompiler/Baml/BamlRecords.cs index dc64128a2e..f5d514730d 100644 --- a/ILSpy.BamlDecompiler/Baml/BamlRecords.cs +++ b/ICSharpCode.BamlDecompiler/Baml/BamlRecords.cs @@ -24,7 +24,7 @@ THE SOFTWARE. using System.Diagnostics; using System.IO; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal enum BamlRecordType : byte { diff --git a/ILSpy.BamlDecompiler/Baml/BamlWriter.cs b/ICSharpCode.BamlDecompiler/Baml/BamlWriter.cs similarity index 98% rename from ILSpy.BamlDecompiler/Baml/BamlWriter.cs rename to ICSharpCode.BamlDecompiler/Baml/BamlWriter.cs index f350b8edf2..a95a65c2ae 100644 --- a/ILSpy.BamlDecompiler/Baml/BamlWriter.cs +++ b/ICSharpCode.BamlDecompiler/Baml/BamlWriter.cs @@ -24,7 +24,7 @@ THE SOFTWARE. using System.IO; using System.Text; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal class BamlBinaryWriter : BinaryWriter { diff --git a/ILSpy.BamlDecompiler/Baml/KnownMembers.cs b/ICSharpCode.BamlDecompiler/Baml/KnownMembers.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/KnownMembers.cs rename to ICSharpCode.BamlDecompiler/Baml/KnownMembers.cs index e6b7c4cb38..d70b088e06 100644 --- a/ILSpy.BamlDecompiler/Baml/KnownMembers.cs +++ b/ICSharpCode.BamlDecompiler/Baml/KnownMembers.cs @@ -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. diff --git a/ILSpy.BamlDecompiler/Baml/KnownThings.cs b/ICSharpCode.BamlDecompiler/Baml/KnownThings.cs similarity index 98% rename from ILSpy.BamlDecompiler/Baml/KnownThings.cs rename to ICSharpCode.BamlDecompiler/Baml/KnownThings.cs index 746d531950..7e8bdc9de5 100644 --- a/ILSpy.BamlDecompiler/Baml/KnownThings.cs +++ b/ICSharpCode.BamlDecompiler/Baml/KnownThings.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Baml/KnownThings.g.cs b/ICSharpCode.BamlDecompiler/Baml/KnownThings.g.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/KnownThings.g.cs rename to ICSharpCode.BamlDecompiler/Baml/KnownThings.g.cs index 7cefe0c136..0ff802a8d0 100644 --- a/ILSpy.BamlDecompiler/Baml/KnownThings.g.cs +++ b/ICSharpCode.BamlDecompiler/Baml/KnownThings.g.cs @@ -22,7 +22,7 @@ THE SOFTWARE. using System; -namespace ILSpy.BamlDecompiler.Baml +namespace ICSharpCode.BamlDecompiler.Baml { internal partial class KnownThings { diff --git a/ILSpy.BamlDecompiler/Baml/KnownThings.gen.cs b/ICSharpCode.BamlDecompiler/Baml/KnownThings.gen.cs similarity index 100% rename from ILSpy.BamlDecompiler/Baml/KnownThings.gen.cs rename to ICSharpCode.BamlDecompiler/Baml/KnownThings.gen.cs diff --git a/ILSpy.BamlDecompiler/Baml/KnownTypes.cs b/ICSharpCode.BamlDecompiler/Baml/KnownTypes.cs similarity index 99% rename from ILSpy.BamlDecompiler/Baml/KnownTypes.cs rename to ICSharpCode.BamlDecompiler/Baml/KnownTypes.cs index 892ef17c52..e0abc8f125 100644 --- a/ILSpy.BamlDecompiler/Baml/KnownTypes.cs +++ b/ICSharpCode.BamlDecompiler/Baml/KnownTypes.cs @@ -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. diff --git a/ILSpy.BamlDecompiler/BamlConnectionId.cs b/ICSharpCode.BamlDecompiler/BamlConnectionId.cs similarity index 97% rename from ILSpy.BamlDecompiler/BamlConnectionId.cs rename to ICSharpCode.BamlDecompiler/BamlConnectionId.cs index 30d11f0cfe..4c9ad1e53f 100644 --- a/ILSpy.BamlDecompiler/BamlConnectionId.cs +++ b/ICSharpCode.BamlDecompiler/BamlConnectionId.cs @@ -22,7 +22,7 @@ THE SOFTWARE. using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { /// /// Represents a field assignment of a XAML code-behind class. diff --git a/ILSpy.BamlDecompiler/BamlDecompilationResult.cs b/ICSharpCode.BamlDecompiler/BamlDecompilationResult.cs similarity index 98% rename from ILSpy.BamlDecompiler/BamlDecompilationResult.cs rename to ICSharpCode.BamlDecompiler/BamlDecompilationResult.cs index 83e8942ed4..e09a893cd2 100644 --- a/ILSpy.BamlDecompiler/BamlDecompilationResult.cs +++ b/ICSharpCode.BamlDecompiler/BamlDecompilationResult.cs @@ -23,7 +23,7 @@ using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { public class BamlDecompilationResult { diff --git a/ILSpy.BamlDecompiler/BamlDecompilerSettings.cs b/ICSharpCode.BamlDecompiler/BamlDecompilerSettings.cs similarity index 98% rename from ILSpy.BamlDecompiler/BamlDecompilerSettings.cs rename to ICSharpCode.BamlDecompiler/BamlDecompilerSettings.cs index 464298ad09..4f08915607 100644 --- a/ILSpy.BamlDecompiler/BamlDecompilerSettings.cs +++ b/ICSharpCode.BamlDecompiler/BamlDecompilerSettings.cs @@ -19,7 +19,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { public class BamlDecompilerSettings : INotifyPropertyChanged { diff --git a/ILSpy.BamlDecompiler/BamlDecompilerTypeSystem.cs b/ICSharpCode.BamlDecompiler/BamlDecompilerTypeSystem.cs similarity index 98% rename from ILSpy.BamlDecompiler/BamlDecompilerTypeSystem.cs rename to ICSharpCode.BamlDecompiler/BamlDecompilerTypeSystem.cs index f43a2d28c5..01b2875d80 100644 --- a/ILSpy.BamlDecompiler/BamlDecompilerTypeSystem.cs +++ b/ICSharpCode.BamlDecompiler/BamlDecompilerTypeSystem.cs @@ -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", diff --git a/ILSpy.BamlDecompiler/BamlElement.cs b/ICSharpCode.BamlDecompiler/BamlElement.cs similarity index 96% rename from ILSpy.BamlDecompiler/BamlElement.cs rename to ICSharpCode.BamlDecompiler/BamlElement.cs index 7728a99fbb..0e546a4748 100644 --- a/ILSpy.BamlDecompiler/BamlElement.cs +++ b/ICSharpCode.BamlDecompiler/BamlElement.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/ConstructorParametersHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/ConstructorParametersHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Blocks/ConstructorParametersHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/ConstructorParametersHandler.cs index d8351f2538..844c825286 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/ConstructorParametersHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/ConstructorParametersHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/DocumentHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/DocumentHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Blocks/DocumentHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/DocumentHandler.cs index 632769a1b3..8f543271fc 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/DocumentHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/DocumentHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/ElementHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/ElementHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Blocks/ElementHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/ElementHandler.cs index 418fc8ba87..351fbd3884 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/ElementHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/ElementHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/KeyElementStartHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/KeyElementStartHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Blocks/KeyElementStartHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/KeyElementStartHandler.cs index 68a543acb5..366b8d93a5 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/KeyElementStartHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/KeyElementStartHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyArrayHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyArrayHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Blocks/PropertyArrayHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyArrayHandler.cs index 49dfe1af64..c4b20965f5 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyArrayHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyArrayHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyComplexHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyComplexHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Blocks/PropertyComplexHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyComplexHandler.cs index ecfb461145..e20ae0155b 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyComplexHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyComplexHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyDictionaryHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyDictionaryHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Blocks/PropertyDictionaryHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyDictionaryHandler.cs index e6c26c0d03..15a2626803 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyDictionaryHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyDictionaryHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyListHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyListHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Blocks/PropertyListHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyListHandler.cs index bdc7a114b7..a7041d9cff 100644 --- a/ILSpy.BamlDecompiler/Handlers/Blocks/PropertyListHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Blocks/PropertyListHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/AssemblyInfoHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/AssemblyInfoHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/AssemblyInfoHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/AssemblyInfoHandler.cs index a0b92cb3bc..24c0dfe650 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/AssemblyInfoHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/AssemblyInfoHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/AttributeInfoHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/AttributeInfoHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/AttributeInfoHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/AttributeInfoHandler.cs index 5165648f88..bcada05719 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/AttributeInfoHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/AttributeInfoHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/ConnectionIdHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/ConnectionIdHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/ConnectionIdHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/ConnectionIdHandler.cs index adc3e23f48..a0b9f9bb1e 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/ConnectionIdHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/ConnectionIdHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/ConstructorParameterTypeHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/ConstructorParameterTypeHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/ConstructorParameterTypeHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/ConstructorParameterTypeHandler.cs index 7f3a603374..a6ba8047ee 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/ConstructorParameterTypeHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/ConstructorParameterTypeHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/ContentPropertyHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/ContentPropertyHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/ContentPropertyHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/ContentPropertyHandler.cs index 5d2cb13aa8..3f95e62dec 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/ContentPropertyHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/ContentPropertyHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/DefAttributeHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/DefAttributeHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeHandler.cs index fe54cd63b5..f8ac9786e9 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/DefAttributeHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/DefAttributeKeyStringHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeKeyStringHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/DefAttributeKeyStringHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeKeyStringHandler.cs index 8cae7decc7..c8df693492 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/DefAttributeKeyStringHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeKeyStringHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/DefAttributeKeyTypeHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeKeyTypeHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/DefAttributeKeyTypeHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeKeyTypeHandler.cs index 5bd50e9f6e..82a2d82a0a 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/DefAttributeKeyTypeHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/DefAttributeKeyTypeHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/DeferableContentStartHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/DeferableContentStartHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/DeferableContentStartHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/DeferableContentStartHandler.cs index 98a695e166..65385bf1c9 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/DeferableContentStartHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/DeferableContentStartHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/LineNumberAndPositionHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/LineNumberAndPositionHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/LineNumberAndPositionHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/LineNumberAndPositionHandler.cs index ea7d68e5f4..6398b2f3e4 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/LineNumberAndPositionHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/LineNumberAndPositionHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/LinePositionHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/LinePositionHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/LinePositionHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/LinePositionHandler.cs index 25655e218d..feb1c36aa0 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/LinePositionHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/LinePositionHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/LiteralContentHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/LiteralContentHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/LiteralContentHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/LiteralContentHandler.cs index 432aa68c40..f53b3fd5f4 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/LiteralContentHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/LiteralContentHandler.cs @@ -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 { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/OptimizedStaticResourceHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/OptimizedStaticResourceHandler.cs similarity index 96% rename from ILSpy.BamlDecompiler/Handlers/Records/OptimizedStaticResourceHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/OptimizedStaticResourceHandler.cs index 53b5a773e9..520392349f 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/OptimizedStaticResourceHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/OptimizedStaticResourceHandler.cs @@ -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 OptimizedStaticResourceHandler : IHandler, IDeferHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PIMappingHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PIMappingHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/PIMappingHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PIMappingHandler.cs index 86e12f5761..e32ba8a4ed 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PIMappingHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PIMappingHandler.cs @@ -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 PIMappingHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PresentationOptionsAttributeHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PresentationOptionsAttributeHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Records/PresentationOptionsAttributeHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PresentationOptionsAttributeHandler.cs index 849f0a91b3..f4d13ebdb5 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PresentationOptionsAttributeHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PresentationOptionsAttributeHandler.cs @@ -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 PresentationOptionsAttributeHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyCustomHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyCustomHandler.cs similarity index 97% rename from ILSpy.BamlDecompiler/Handlers/Records/PropertyCustomHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PropertyCustomHandler.cs index aca9bfd8ea..c62f2fa4aa 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyCustomHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyCustomHandler.cs @@ -27,10 +27,10 @@ THE SOFTWARE. using System.Text; 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 PropertyCustomHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/PropertyHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PropertyHandler.cs index 913712c4f0..e50002cebb 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyHandler.cs @@ -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 PropertyHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyTypeReferenceHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyTypeReferenceHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Records/PropertyTypeReferenceHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PropertyTypeReferenceHandler.cs index 51d5b8ae4d..9405d210d3 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyTypeReferenceHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyTypeReferenceHandler.cs @@ -24,10 +24,10 @@ THE SOFTWARE. using ICSharpCode.Decompiler.TypeSystem; -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 PropertyTypeReferenceHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithConverterHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithConverterHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/PropertyWithConverterHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithConverterHandler.cs index ca171f4032..8de1f61bc3 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithConverterHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithConverterHandler.cs @@ -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 PropertyWithConverterHandler : PropertyHandler, IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs similarity index 97% rename from ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs index 66da034523..034b6aac6b 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs @@ -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 PropertyWithExtensionHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithStaticResourceIdHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithStaticResourceIdHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Records/PropertyWithStaticResourceIdHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithStaticResourceIdHandler.cs index 627ec1c8f9..a701316e97 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithStaticResourceIdHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/PropertyWithStaticResourceIdHandler.cs @@ -23,10 +23,10 @@ THE SOFTWARE. using System; 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 PropertyWithStaticResourceIdHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/StaticResourceIdHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/StaticResourceIdHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/StaticResourceIdHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/StaticResourceIdHandler.cs index 94e4fc6149..b0f62432c8 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/StaticResourceIdHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/StaticResourceIdHandler.cs @@ -18,10 +18,10 @@ using System; -using ILSpy.BamlDecompiler.Baml; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Baml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler.Handlers +namespace ICSharpCode.BamlDecompiler.Handlers { class StaticResourceIdHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/StaticResourceStartHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/StaticResourceStartHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/StaticResourceStartHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/StaticResourceStartHandler.cs index 302839a9bd..37857e14e5 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/StaticResourceStartHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/StaticResourceStartHandler.cs @@ -20,10 +20,10 @@ using System.Linq; 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 { class StaticResourceStartHandler : IHandler, IDeferHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/TextHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/TextHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Records/TextHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/TextHandler.cs index 72843f0241..fc41caf5e1 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/TextHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/TextHandler.cs @@ -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 TextHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/TextWithConverterHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/TextWithConverterHandler.cs similarity index 93% rename from ILSpy.BamlDecompiler/Handlers/Records/TextWithConverterHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/TextWithConverterHandler.cs index 41c34850fb..7b8ad9c18e 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/TextWithConverterHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/TextWithConverterHandler.cs @@ -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 TextWithConverterHandler : TextHandler, IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/TypeInfoHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/TypeInfoHandler.cs similarity index 94% rename from ILSpy.BamlDecompiler/Handlers/Records/TypeInfoHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/TypeInfoHandler.cs index 90bbb776fd..583c680d53 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/TypeInfoHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/TypeInfoHandler.cs @@ -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 TypeInfoHandler : IHandler { diff --git a/ILSpy.BamlDecompiler/Handlers/Records/XmlnsPropertyHandler.cs b/ICSharpCode.BamlDecompiler/Handlers/Records/XmlnsPropertyHandler.cs similarity index 95% rename from ILSpy.BamlDecompiler/Handlers/Records/XmlnsPropertyHandler.cs rename to ICSharpCode.BamlDecompiler/Handlers/Records/XmlnsPropertyHandler.cs index 777327fcf5..399dd7d4d2 100644 --- a/ILSpy.BamlDecompiler/Handlers/Records/XmlnsPropertyHandler.cs +++ b/ICSharpCode.BamlDecompiler/Handlers/Records/XmlnsPropertyHandler.cs @@ -28,10 +28,10 @@ THE SOFTWARE. using ICSharpCode.Decompiler.TypeSystem; -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 XmlnsPropertyHandler : IHandler { diff --git a/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj b/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj new file mode 100644 index 0000000000..7f9f8b9915 --- /dev/null +++ b/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj @@ -0,0 +1,42 @@ + + + + net8.0 + + True + ..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk + + en-US + False + False + False + + + + + + + + true + + + + + + ILSpyUpdateAssemblyInfo; + $(GetPackageVersionDependsOn) + + + + + + + + + + + + + + diff --git a/ILSpy.BamlDecompiler/IHandlers.cs b/ICSharpCode.BamlDecompiler/IHandlers.cs similarity index 97% rename from ILSpy.BamlDecompiler/IHandlers.cs rename to ICSharpCode.BamlDecompiler/IHandlers.cs index 27db2853ea..c373f0bf26 100644 --- a/ILSpy.BamlDecompiler/IHandlers.cs +++ b/ICSharpCode.BamlDecompiler/IHandlers.cs @@ -24,9 +24,9 @@ THE SOFTWARE. using System.Collections.Generic; using System.Diagnostics; -using ILSpy.BamlDecompiler.Baml; +using ICSharpCode.BamlDecompiler.Baml; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { internal interface IHandler { diff --git a/ILSpy.BamlDecompiler/IRewritePass.cs b/ICSharpCode.BamlDecompiler/IRewritePass.cs similarity index 96% rename from ILSpy.BamlDecompiler/IRewritePass.cs rename to ICSharpCode.BamlDecompiler/IRewritePass.cs index a139dd4b25..cf0535465d 100644 --- a/ILSpy.BamlDecompiler/IRewritePass.cs +++ b/ICSharpCode.BamlDecompiler/IRewritePass.cs @@ -22,7 +22,7 @@ THE SOFTWARE. using System.Xml.Linq; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { internal interface IRewritePass { diff --git a/ILSpy.BamlDecompiler/Rewrite/AttributeRewritePass.cs b/ICSharpCode.BamlDecompiler/Rewrite/AttributeRewritePass.cs similarity index 96% rename from ILSpy.BamlDecompiler/Rewrite/AttributeRewritePass.cs rename to ICSharpCode.BamlDecompiler/Rewrite/AttributeRewritePass.cs index 06139367ed..da4704ef15 100644 --- a/ILSpy.BamlDecompiler/Rewrite/AttributeRewritePass.cs +++ b/ICSharpCode.BamlDecompiler/Rewrite/AttributeRewritePass.cs @@ -23,9 +23,9 @@ THE SOFTWARE. using System.Collections.Generic; using System.Xml.Linq; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler.Rewrite +namespace ICSharpCode.BamlDecompiler.Rewrite { internal class AttributeRewritePass : IRewritePass { diff --git a/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs b/ICSharpCode.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs similarity index 99% rename from ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs rename to ICSharpCode.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs index ba05f6df75..5e886536c3 100644 --- a/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs +++ b/ICSharpCode.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs @@ -27,9 +27,9 @@ using ICSharpCode.Decompiler.IL.Transforms; using ICSharpCode.Decompiler.Util; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler.Rewrite +namespace ICSharpCode.BamlDecompiler.Rewrite { using ICSharpCode.Decompiler.TypeSystem; diff --git a/ILSpy.BamlDecompiler/Rewrite/DocumentRewritePass.cs b/ICSharpCode.BamlDecompiler/Rewrite/DocumentRewritePass.cs similarity index 97% rename from ILSpy.BamlDecompiler/Rewrite/DocumentRewritePass.cs rename to ICSharpCode.BamlDecompiler/Rewrite/DocumentRewritePass.cs index 80849609bd..4e84ac207f 100644 --- a/ILSpy.BamlDecompiler/Rewrite/DocumentRewritePass.cs +++ b/ICSharpCode.BamlDecompiler/Rewrite/DocumentRewritePass.cs @@ -24,7 +24,7 @@ THE SOFTWARE. using System.Linq; using System.Xml.Linq; -namespace ILSpy.BamlDecompiler.Rewrite +namespace ICSharpCode.BamlDecompiler.Rewrite { internal class DocumentRewritePass : IRewritePass { diff --git a/ILSpy.BamlDecompiler/Rewrite/MarkupExtensionRewritePass.cs b/ICSharpCode.BamlDecompiler/Rewrite/MarkupExtensionRewritePass.cs similarity index 97% rename from ILSpy.BamlDecompiler/Rewrite/MarkupExtensionRewritePass.cs rename to ICSharpCode.BamlDecompiler/Rewrite/MarkupExtensionRewritePass.cs index 46af966472..3df7687530 100644 --- a/ILSpy.BamlDecompiler/Rewrite/MarkupExtensionRewritePass.cs +++ b/ICSharpCode.BamlDecompiler/Rewrite/MarkupExtensionRewritePass.cs @@ -21,16 +21,14 @@ THE SOFTWARE. */ using System.Collections.Generic; -using System.DirectoryServices.ActiveDirectory; using System.Linq; -using System.Windows.Forms; using System.Xml.Linq; using ICSharpCode.Decompiler.TypeSystem; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler.Rewrite +namespace ICSharpCode.BamlDecompiler.Rewrite { internal class MarkupExtensionRewritePass : IRewritePass { diff --git a/ILSpy.BamlDecompiler/Rewrite/XClassRewritePass.cs b/ICSharpCode.BamlDecompiler/Rewrite/XClassRewritePass.cs similarity index 96% rename from ILSpy.BamlDecompiler/Rewrite/XClassRewritePass.cs rename to ICSharpCode.BamlDecompiler/Rewrite/XClassRewritePass.cs index 7c4d956c1b..f184995465 100644 --- a/ILSpy.BamlDecompiler/Rewrite/XClassRewritePass.cs +++ b/ICSharpCode.BamlDecompiler/Rewrite/XClassRewritePass.cs @@ -23,9 +23,9 @@ THE SOFTWARE. using System.Linq; using System.Xml.Linq; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler.Rewrite +namespace ICSharpCode.BamlDecompiler.Rewrite { internal class XClassRewritePass : IRewritePass { diff --git a/ILSpy.BamlDecompiler/Xaml/NamespaceMap.cs b/ICSharpCode.BamlDecompiler/Xaml/NamespaceMap.cs similarity index 97% rename from ILSpy.BamlDecompiler/Xaml/NamespaceMap.cs rename to ICSharpCode.BamlDecompiler/Xaml/NamespaceMap.cs index 290fe8e41e..6523c2be70 100644 --- a/ILSpy.BamlDecompiler/Xaml/NamespaceMap.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/NamespaceMap.cs @@ -25,7 +25,7 @@ THE SOFTWARE. using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { internal class NamespaceMap { diff --git a/ILSpy.BamlDecompiler/Xaml/XamlExtension.cs b/ICSharpCode.BamlDecompiler/Xaml/XamlExtension.cs similarity index 98% rename from ILSpy.BamlDecompiler/Xaml/XamlExtension.cs rename to ICSharpCode.BamlDecompiler/Xaml/XamlExtension.cs index 78d8f51765..a39be99d72 100644 --- a/ILSpy.BamlDecompiler/Xaml/XamlExtension.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/XamlExtension.cs @@ -24,7 +24,7 @@ THE SOFTWARE. using System.Text; using System.Xml.Linq; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { internal class XamlExtension { diff --git a/ILSpy.BamlDecompiler/Xaml/XamlPathDeserializer.cs b/ICSharpCode.BamlDecompiler/Xaml/XamlPathDeserializer.cs similarity index 99% rename from ILSpy.BamlDecompiler/Xaml/XamlPathDeserializer.cs rename to ICSharpCode.BamlDecompiler/Xaml/XamlPathDeserializer.cs index c23a4e77f3..0ac2c4d413 100644 --- a/ILSpy.BamlDecompiler/Xaml/XamlPathDeserializer.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/XamlPathDeserializer.cs @@ -25,7 +25,7 @@ THE SOFTWARE. using System.IO; using System.Text; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { class XamlPathDeserializer { diff --git a/ILSpy.BamlDecompiler/Xaml/XamlProperty.cs b/ICSharpCode.BamlDecompiler/Xaml/XamlProperty.cs similarity index 98% rename from ILSpy.BamlDecompiler/Xaml/XamlProperty.cs rename to ICSharpCode.BamlDecompiler/Xaml/XamlProperty.cs index a6f3575faf..6372f2a0cf 100644 --- a/ILSpy.BamlDecompiler/Xaml/XamlProperty.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/XamlProperty.cs @@ -26,7 +26,7 @@ THE SOFTWARE. using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { internal class XamlProperty { diff --git a/ILSpy.BamlDecompiler/Xaml/XamlResourceKey.cs b/ICSharpCode.BamlDecompiler/Xaml/XamlResourceKey.cs similarity index 97% rename from ILSpy.BamlDecompiler/Xaml/XamlResourceKey.cs rename to ICSharpCode.BamlDecompiler/Xaml/XamlResourceKey.cs index 5f4288b076..7e642fd05b 100644 --- a/ILSpy.BamlDecompiler/Xaml/XamlResourceKey.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/XamlResourceKey.cs @@ -23,9 +23,9 @@ THE SOFTWARE. using System.Collections.Generic; using System.Diagnostics; -using ILSpy.BamlDecompiler.Baml; +using ICSharpCode.BamlDecompiler.Baml; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { internal class XamlResourceKey { diff --git a/ILSpy.BamlDecompiler/Xaml/XamlType.cs b/ICSharpCode.BamlDecompiler/Xaml/XamlType.cs similarity index 98% rename from ILSpy.BamlDecompiler/Xaml/XamlType.cs rename to ICSharpCode.BamlDecompiler/Xaml/XamlType.cs index b3b7a18d73..f2f9075729 100644 --- a/ILSpy.BamlDecompiler/Xaml/XamlType.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/XamlType.cs @@ -25,7 +25,7 @@ THE SOFTWARE. using ICSharpCode.Decompiler.TypeSystem; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { internal class XamlType { diff --git a/ILSpy.BamlDecompiler/Xaml/XamlUtils.cs b/ICSharpCode.BamlDecompiler/Xaml/XamlUtils.cs similarity index 98% rename from ILSpy.BamlDecompiler/Xaml/XamlUtils.cs rename to ICSharpCode.BamlDecompiler/Xaml/XamlUtils.cs index 878d8214e8..33ae2494a4 100644 --- a/ILSpy.BamlDecompiler/Xaml/XamlUtils.cs +++ b/ICSharpCode.BamlDecompiler/Xaml/XamlUtils.cs @@ -24,7 +24,7 @@ THE SOFTWARE. using System.Text; using System.Xml.Linq; -namespace ILSpy.BamlDecompiler.Xaml +namespace ICSharpCode.BamlDecompiler.Xaml { internal static class XamlUtils { diff --git a/ILSpy.BamlDecompiler/XamlContext.cs b/ICSharpCode.BamlDecompiler/XamlContext.cs similarity index 98% rename from ILSpy.BamlDecompiler/XamlContext.cs rename to ICSharpCode.BamlDecompiler/XamlContext.cs index d9be0620ca..bd24cbeaf5 100644 --- a/ILSpy.BamlDecompiler/XamlContext.cs +++ b/ICSharpCode.BamlDecompiler/XamlContext.cs @@ -29,10 +29,10 @@ THE SOFTWARE. using ICSharpCode.Decompiler.TypeSystem; -using ILSpy.BamlDecompiler.Baml; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Baml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { internal class XamlContext { diff --git a/ILSpy.BamlDecompiler/XamlDecompiler.cs b/ICSharpCode.BamlDecompiler/XamlDecompiler.cs similarity index 95% rename from ILSpy.BamlDecompiler/XamlDecompiler.cs rename to ICSharpCode.BamlDecompiler/XamlDecompiler.cs index 0d5c5205c7..2467210aac 100644 --- a/ILSpy.BamlDecompiler/XamlDecompiler.cs +++ b/ICSharpCode.BamlDecompiler/XamlDecompiler.cs @@ -31,10 +31,10 @@ THE SOFTWARE. using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.TypeSystem; -using ILSpy.BamlDecompiler.Baml; -using ILSpy.BamlDecompiler.Rewrite; +using ICSharpCode.BamlDecompiler.Baml; +using ICSharpCode.BamlDecompiler.Rewrite; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { public class XamlDecompiler { @@ -72,7 +72,7 @@ public XamlDecompiler(PEFile module, IAssemblyResolver assemblyResolver, BamlDec { } - internal XamlDecompiler(BamlDecompilerTypeSystem typeSystem, BamlDecompilerSettings settings) + public XamlDecompiler(BamlDecompilerTypeSystem typeSystem, BamlDecompilerSettings settings) { this.typeSystem = typeSystem ?? throw new ArgumentNullException(nameof(typeSystem)); this.settings = settings; diff --git a/ILSpy.BamlDecompiler/XmlnsDictionary.cs b/ICSharpCode.BamlDecompiler/XmlnsDictionary.cs similarity index 97% rename from ILSpy.BamlDecompiler/XmlnsDictionary.cs rename to ICSharpCode.BamlDecompiler/XmlnsDictionary.cs index 74ada58150..74f7f7f0db 100644 --- a/ILSpy.BamlDecompiler/XmlnsDictionary.cs +++ b/ICSharpCode.BamlDecompiler/XmlnsDictionary.cs @@ -25,9 +25,9 @@ THE SOFTWARE. using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.TypeSystem; -using ILSpy.BamlDecompiler.Xaml; +using ICSharpCode.BamlDecompiler.Xaml; -namespace ILSpy.BamlDecompiler +namespace ICSharpCode.BamlDecompiler { internal class XmlnsScope : List { diff --git a/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs b/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs index 9ed326403b..970618e8ef 100644 --- a/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs +++ b/ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs @@ -23,6 +23,7 @@ using System.Threading; using System.Xml.Linq; +using ICSharpCode.BamlDecompiler; using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Tests.Helpers; using ICSharpCode.Decompiler.Util; diff --git a/ILSpy.BamlDecompiler/BamlResourceEntryNode.cs b/ILSpy.BamlDecompiler/BamlResourceEntryNode.cs index 4c9a93cf82..47470d32aa 100644 --- a/ILSpy.BamlDecompiler/BamlResourceEntryNode.cs +++ b/ILSpy.BamlDecompiler/BamlResourceEntryNode.cs @@ -23,6 +23,7 @@ using System.Threading.Tasks; using ICSharpCode.AvalonEdit.Highlighting; +using ICSharpCode.BamlDecompiler; using ICSharpCode.ILSpy; using ICSharpCode.ILSpy.TextView; using ICSharpCode.ILSpy.TreeNodes; diff --git a/ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs b/ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs index 4ac408de5e..f6af42c987 100644 --- a/ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs +++ b/ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs @@ -19,8 +19,8 @@ using System; using System.ComponentModel.Composition; using System.IO; -using System.Linq; +using ICSharpCode.BamlDecompiler; using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.CSharp.ProjectDecompiler; using ICSharpCode.Decompiler.Metadata; diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj index 8658ab8334..f707d658a3 100644 --- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj +++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj @@ -31,6 +31,7 @@ + diff --git a/ILSpy.sln b/ILSpy.sln index 692222f9ae..604606ee37 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -36,6 +36,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.ILSpyX", "ICSharpCode.ILSpyX\ICSharpCode.ILSpyX.csproj", "{F8EFCF9D-B9A3-4BA0-A1B2-B026A71DAC22}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.BamlDecompiler", "ICSharpCode.BamlDecompiler\ICSharpCode.BamlDecompiler.csproj", "{81A30182-3378-4952-8880-F44822390040}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -94,6 +96,10 @@ Global {F8EFCF9D-B9A3-4BA0-A1B2-B026A71DAC22}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8EFCF9D-B9A3-4BA0-A1B2-B026A71DAC22}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8EFCF9D-B9A3-4BA0-A1B2-B026A71DAC22}.Release|Any CPU.Build.0 = Release|Any CPU + {81A30182-3378-4952-8880-F44822390040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {81A30182-3378-4952-8880-F44822390040}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81A30182-3378-4952-8880-F44822390040}.Release|Any CPU.ActiveCfg = Release|Any CPU + {81A30182-3378-4952-8880-F44822390040}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 0887d3e4d5867ebf87fee503e696a5a371849d2b Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Mon, 18 Mar 2024 17:50:03 +0100 Subject: [PATCH 2/2] Move KnownThings.gen.cs compile remove --- .../ICSharpCode.BamlDecompiler.csproj | 6 +++++- ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj b/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj index 7f9f8b9915..54ea529280 100644 --- a/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj +++ b/ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj @@ -15,7 +15,11 @@ - + + + + + true diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj index f707d658a3..2a16add843 100644 --- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj +++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj @@ -26,10 +26,6 @@ ..\ILSpy\bin\$(Configuration)\ - - - -