Merge branch 'master' of git://github.com/icsharpcode/ILSpy

ICSharpCode.Decompiler/Ast/AstBuilder.cs

@@ -1,3 +1,21 @@
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -28,7 +46,8 @@ namespace ICSharpCode.Decompiler.Ast
 	{
 		None = 0,
 		IncludeNamespace = 1,
-		IncludeTypeParameterDefinitions = 2
+		IncludeTypeParameterDefinitions = 2,
+		DoNotUsePrimitiveTypeNames = 4
 	}
 	
 	public class AstBuilder : ICodeMappings
@@ -462,39 +481,42 @@ namespace ICSharpCode.Decompiler.Ast
 					return new PrimitiveType("dynamic");
 				} else {
 					if (ns == "System") {
-						switch (name) {
-							case "SByte":
-								return new PrimitiveType("sbyte");
-							case "Int16":
-								return new PrimitiveType("short");
-							case "Int32":
-								return new PrimitiveType("int");
-							case "Int64":
-								return new PrimitiveType("long");
-							case "Byte":
-								return new PrimitiveType("byte");
-							case "UInt16":
-								return new PrimitiveType("ushort");
-							case "UInt32":
-								return new PrimitiveType("uint");
-							case "UInt64":
-								return new PrimitiveType("ulong");
-							case "String":
-								return new PrimitiveType("string");
-							case "Single":
-								return new PrimitiveType("float");
-							case "Double":
-								return new PrimitiveType("double");
-							case "Decimal":
-								return new PrimitiveType("decimal");
-							case "Char":
-								return new PrimitiveType("char");
-							case "Boolean":
-								return new PrimitiveType("bool");
-							case "Void":
-								return new PrimitiveType("void");
-							case "Object":
-								return new PrimitiveType("object");
+						if ((options & ConvertTypeOptions.DoNotUsePrimitiveTypeNames)
+						    != ConvertTypeOptions.DoNotUsePrimitiveTypeNames) {
+							switch (name) {
+								case "SByte":
+									return new PrimitiveType("sbyte");
+								case "Int16":
+									return new PrimitiveType("short");
+								case "Int32":
+									return new PrimitiveType("int");
+								case "Int64":
+									return new PrimitiveType("long");
+								case "Byte":
+									return new PrimitiveType("byte");
+								case "UInt16":
+									return new PrimitiveType("ushort");
+								case "UInt32":
+									return new PrimitiveType("uint");
+								case "UInt64":
+									return new PrimitiveType("ulong");
+								case "String":
+									return new PrimitiveType("string");
+								case "Single":
+									return new PrimitiveType("float");
+								case "Double":
+									return new PrimitiveType("double");
+								case "Decimal":
+									return new PrimitiveType("decimal");
+								case "Char":
+									return new PrimitiveType("char");
+								case "Boolean":
+									return new PrimitiveType("bool");
+								case "Void":
+									return new PrimitiveType("void");
+								case "Object":
+									return new PrimitiveType("object");
+							}
 						}
 					}
 					

ICSharpCode.Decompiler/Ast/AstMethodBodyBuilder.cs

@@ -1,3 +1,21 @@
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Ast/CecilTypeResolveContext.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Ast/CommentStatement.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Linq;

ICSharpCode.Decompiler/Ast/DecompilerContext.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Ast/NRefactoryExtensions.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using ICSharpCode.NRefactory.CSharp;

ICSharpCode.Decompiler/Ast/NameVariables.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Ast/TextOutputFormatter.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Ast/TypesHierarchyHelpers.cs

@@ -1,4 +1,22 @@
-using System;
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;

ICSharpCode.Decompiler/ILAst/ILAstBuilder.cs

@@ -426,13 +426,12 @@ namespace ICSharpCode.Decompiler.ILAst
 				}
 			}
 			
-			// Occasionally the compiler generates unreachable code - it can be usually just ignored
-			var reachableBody   = body.Where(b => b.StackBefore != null);
-			var unreachableBody = body.Where(b => b.StackBefore == null);
+			// Occasionally the compilers or obfuscators generate unreachable code (which migt be intentonally invalid)
+			// I belive it is safe to just remove it
+			body.RemoveAll(b => b.StackBefore == null);
 			
 			// Genertate temporary variables to replace stack
-			// Unrachable code does not need temporary variables - the values are never pushed on the stack for consuption
-			foreach(ByteCode byteCode in reachableBody) {
+			foreach(ByteCode byteCode in body) {
 				int argIdx = 0;
 				int popCount = byteCode.PopCount ?? byteCode.StackBefore.Count;
 				for (int i = byteCode.StackBefore.Count - popCount; i < byteCode.StackBefore.Count; i++) {
@@ -450,19 +449,18 @@ namespace ICSharpCode.Decompiler.ILAst
 			
 			// Try to use single temporary variable insted of several if possilbe (especially useful for dup)
 			// This has to be done after all temporary variables are assigned so we know about all loads
-			// Unrachable code will not have any StoreTo
-			foreach(ByteCode byteCode in reachableBody) {
+			foreach(ByteCode byteCode in body) {
 				if (byteCode.StoreTo != null && byteCode.StoreTo.Count > 1) {
 					var locVars = byteCode.StoreTo;
 					// For each of the variables, find the location where it is loaded - there should be preciesly one
-					var loadedBy = locVars.Select(locVar => reachableBody.SelectMany(bc => bc.StackBefore).Single(s => s.LoadFrom == locVar)).ToList();
+					var loadedBy = locVars.Select(locVar => body.SelectMany(bc => bc.StackBefore).Single(s => s.LoadFrom == locVar)).ToList();
 					// We now know that all the variables have a single load,
 					// Let's make sure that they have also a single store - us
 					if (loadedBy.All(slot => slot.PushedBy.Length == 1 && slot.PushedBy[0] == byteCode)) {
 						// Great - we can reduce everything into single variable
 						ILVariable tmpVar = new ILVariable() { Name = string.Format("expr_{0:X2}", byteCode.Offset), IsGenerated = true };
 						byteCode.StoreTo = new List<ILVariable>() { tmpVar };
-						foreach(ByteCode bc in reachableBody) {
+						foreach(ByteCode bc in body) {
 							for (int i = 0; i < bc.StackBefore.Count; i++) {
 								// Is it one of the variable to be merged?
 								if (locVars.Contains(bc.StackBefore[i].LoadFrom)) {
@@ -658,12 +656,14 @@ namespace ICSharpCode.Decompiler.ILAst
 				// Find the first and widest scope
 				int tryStart = ehs.Min(eh => eh.TryStart.Offset);
 				int tryEnd   = ehs.Where(eh => eh.TryStart.Offset == tryStart).Max(eh => eh.TryEnd.Offset);
-				var handlers = ehs.Where(eh => eh.TryStart.Offset == tryStart && eh.TryEnd.Offset == tryEnd).ToList();
+				var handlers = ehs.Where(eh => eh.TryStart.Offset == tryStart && eh.TryEnd.Offset == tryEnd).OrderBy(eh => eh.TryStart.Offset).ToList();
+				
+				// Remember that any part of the body migt have been removed due to unreachability
 				
 				// Cut all instructions up to the try block
 				{
-					int tryStartIdx;
-					for (tryStartIdx = 0; body[tryStartIdx].Offset != tryStart; tryStartIdx++);
+					int tryStartIdx = 0;
+					while (tryStartIdx < body.Count && body[tryStartIdx].Offset < tryStart) tryStartIdx++;
 					ast.AddRange(ConvertToAst(body.CutRange(0, tryStartIdx)));
 				}
 				
@@ -671,24 +671,22 @@ namespace ICSharpCode.Decompiler.ILAst
 				{
 					HashSet<ExceptionHandler> nestedEHs = new HashSet<ExceptionHandler>(ehs.Where(eh => (tryStart <= eh.TryStart.Offset && eh.TryEnd.Offset < tryEnd) || (tryStart < eh.TryStart.Offset && eh.TryEnd.Offset <= tryEnd)));
 					ehs.ExceptWith(nestedEHs);
-					int tryEndIdx;
-					for (tryEndIdx = 0; tryEndIdx < body.Count && body[tryEndIdx].Offset != tryEnd; tryEndIdx++);
+					int tryEndIdx = 0;
+					while (tryEndIdx < body.Count && body[tryEndIdx].Offset < tryEnd) tryEndIdx++;
 					tryCatchBlock.TryBlock = new ILBlock(ConvertToAst(body.CutRange(0, tryEndIdx), nestedEHs));
 				}
 				
 				// Cut all handlers
 				tryCatchBlock.CatchBlocks = new List<ILTryCatchBlock.CatchBlock>();
 				foreach(ExceptionHandler eh in handlers) {
-					int startIndex;
-					for (startIndex = 0; body[startIndex].Offset != eh.HandlerStart.Offset; startIndex++);
-					int endInclusiveIndex;
-					if (eh.HandlerEnd == null) endInclusiveIndex = body.Count - 1;
-					// Note that the end(exclusive) instruction may not necessarly be in our body
-					else for (endInclusiveIndex = 0; body[endInclusiveIndex].Next.Offset != eh.HandlerEnd.Offset; endInclusiveIndex++);
-					int count = 1 + endInclusiveIndex - startIndex;
-					HashSet<ExceptionHandler> nestedEHs = new HashSet<ExceptionHandler>(ehs.Where(e => (eh.HandlerStart.Offset <= e.TryStart.Offset && e.TryEnd.Offset < eh.HandlerEnd.Offset) || (eh.HandlerStart.Offset < e.TryStart.Offset && e.TryEnd.Offset <= eh.HandlerEnd.Offset)));
+					int handlerEndOffset = eh.HandlerEnd == null ? methodDef.Body.CodeSize : eh.HandlerEnd.Offset;
+					int startIdx = 0;
+					while (startIdx < body.Count && body[startIdx].Offset < eh.HandlerStart.Offset) startIdx++;
+					int endIdx = 0;
+					while (endIdx < body.Count && body[endIdx].Offset < handlerEndOffset) endIdx++;
+					HashSet<ExceptionHandler> nestedEHs = new HashSet<ExceptionHandler>(ehs.Where(e => (eh.HandlerStart.Offset <= e.TryStart.Offset && e.TryEnd.Offset < handlerEndOffset) || (eh.HandlerStart.Offset < e.TryStart.Offset && e.TryEnd.Offset <= handlerEndOffset)));
 					ehs.ExceptWith(nestedEHs);
-					List<ILNode> handlerAst = ConvertToAst(body.CutRange(startIndex, count), nestedEHs);
+					List<ILNode> handlerAst = ConvertToAst(body.CutRange(startIdx, endIdx - startIdx), nestedEHs);
 					if (eh.HandlerType == ExceptionHandlerType.Catch) {
 						ILTryCatchBlock.CatchBlock catchBlock = new ILTryCatchBlock.CatchBlock() {
 							ExceptionType = eh.CatchType,

ICSharpCode.Decompiler/ILAst/ILInlining.cs

@@ -385,7 +385,7 @@ namespace ICSharpCode.Decompiler.ILAst
 			for (int i = 0; i < expr.Arguments.Count; i++) {
 				// Stop when seeing an opcode that does not guarantee that its operands will be evaluated.
 				// Inlining in that case might result in the inlined expresion not being evaluted.
-				if (i == 1 && (expr.Code == ILCode.LogicAnd || expr.Code == ILCode.LogicOr || expr.Code == ILCode.TernaryOp))
+				if (i == 1 && (expr.Code == ILCode.LogicAnd || expr.Code == ILCode.LogicOr || expr.Code == ILCode.TernaryOp || expr.Code == ILCode.NullCoalescing))
 					return false;
 				
 				ILExpression arg = expr.Arguments[i];

ICSharpCode.Decompiler/ILAst/SimpleControlFlow.cs

@@ -306,7 +306,7 @@ namespace ICSharpCode.Decompiler.ILAst
 			if (!opBitwiseCallExpr.Match(ILCode.Call, out opBitwise, out leftVarExpression, out rightExpression))
 				return false;
 			
-			if (!opFalseArg.MatchLdloc(leftVarExpression.Operand as ILVariable))
+			if (!leftVarExpression.MatchLdloc(leftVar))
 				return false;
 			
 			// ignore operators other than op_BitwiseAnd and op_BitwiseOr

ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs

@@ -690,6 +690,8 @@ namespace ICSharpCode.Decompiler.ILAst
 				case ILCode.Castclass:
 				case ILCode.Unbox_Any:
 					return (TypeReference)expr.Operand;
+				case ILCode.Unbox:
+					return new ByReferenceType((TypeReference)expr.Operand);
 				case ILCode.Isinst:
 					{
 						// isinst performs the equivalent of a cast only for reference types;

ICSharpCode.Decompiler/ReferenceResolvingException.cs

@@ -1,4 +1,22 @@
-using System;
+// Copyright (c) 2011 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ICSharpCode.Decompiler/Tests/CallOverloadedMethod.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Tests/CheckedUnchecked.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 public class CheckedUnchecked
 {

ICSharpCode.Decompiler/Tests/CodeSampleFileParser.cs

@@ -1,4 +1,22 @@
-using System;
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ICSharpCode.Decompiler/Tests/CustomShortCircuitOperators.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/DecompilerTestBase.cs

@@ -1,4 +1,22 @@
-using System;
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
+
+using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;

ICSharpCode.Decompiler/Tests/DelegateConstruction.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Tests/ExceptionHandling.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Threading;

ICSharpCode.Decompiler/Tests/Generics.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Tests/IncrementDecrement.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/InitializerTests.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Tests/Loops.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections;

ICSharpCode.Decompiler/Tests/MultidimensionalArray.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/PropertiesAndEvents.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Text;

ICSharpCode.Decompiler/Tests/QueryExpressions.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ICSharpCode.Decompiler/Tests/Switch.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/TestRunner.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.CodeDom.Compiler;

ICSharpCode.Decompiler/Tests/UndocumentedExpressions.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/UnsafeCode.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/ValueTypes.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 

ICSharpCode.Decompiler/Tests/YieldReturn.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// Copyright (c) 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
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// 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.
 
 using System;
 using System.Collections.Generic;

ILSpy.BamlDecompiler/BamlResourceEntryNode.cs

@@ -0,0 +1,61 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+using ICSharpCode.AvalonEdit.Highlighting;
+using ICSharpCode.ILSpy.TextView;
+using ICSharpCode.ILSpy.TreeNodes;
+using Ricciolo.StylesExplorer.MarkupReflection;
+
+namespace ILSpy.BamlDecompiler
+{
+	public sealed class BamlResourceEntryNode : ResourceEntryNode
+	{
+		public BamlResourceEntryNode(string key, Stream data) : base(key, data)
+		{
+		}
+		
+		public override bool View(DecompilerTextView textView)
+		{
+			AvalonEditTextOutput output = new AvalonEditTextOutput();
+			IHighlightingDefinition highlighting = null;
+			
+			textView.RunWithCancellation(
+				token => Task.Factory.StartNew(
+					() => {
+						try {
+							if (LoadBaml(output))
+								highlighting = HighlightingManager.Instance.GetDefinitionByExtension(".xml");
+						} catch (Exception ex) {
+							output.Write(ex.ToString());
+						}
+						return output;
+					}),
+				t => textView.ShowNode(t.Result, this, highlighting)
+			);
+			return true;
+		}
+		
+		bool LoadBaml(AvalonEditTextOutput output)
+		{
+			var asm = this.Ancestors().OfType<AssemblyTreeNode>().FirstOrDefault().LoadedAssembly;
+			MemoryStream bamlStream = new MemoryStream();
+			Data.Position = 0;
+			Data.CopyTo(bamlStream);
+			bamlStream.Position = 0;
+			
+			XDocument xamlDocument;
+			using (XmlBamlReader reader = new XmlBamlReader(bamlStream, new CecilTypeResolver(asm)))
+				xamlDocument = XDocument.Load(reader);
+			
+			output.Write(xamlDocument.ToString());
+			return true;
+		}
+	}
+}

ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs

@@ -0,0 +1,29 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+
+using ICSharpCode.ILSpy.TreeNodes;
+
+namespace ILSpy.BamlDecompiler
+{
+	[Export(typeof(IResourceNodeFactory))]
+	public sealed class BamlResourceNodeFactory : IResourceNodeFactory
+	{
+		public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
+		{
+			return null;
+		}
+		
+		public ILSpyTreeNode CreateNode(string key, Stream data)
+		{
+			if (key.EndsWith(".baml", StringComparison.OrdinalIgnoreCase))
+				return new BamlResourceEntryNode(key, data);
+			else
+				return null;
+		}
+	}
+}

ILSpy.BamlDecompiler/CecilDependencyPropertyDescriptor.cs

@@ -0,0 +1,34 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Linq;
+using ICSharpCode.ILSpy;
+using Mono.Cecil;
+using Ricciolo.StylesExplorer.MarkupReflection;
+
+namespace ILSpy.BamlDecompiler
+{
+	public class CecilDependencyPropertyDescriptor : IDependencyPropertyDescriptor
+	{
+		string member;
+		TypeDefinition type;
+		
+		public CecilDependencyPropertyDescriptor(string member, TypeDefinition type)
+		{
+			this.member = member;
+			this.type = type;
+		}
+		
+		public bool IsAttached {
+			get {
+				return type.Methods.Any(m  => m.Name == "Get" + member);
+			}
+		}
+		
+		public override string ToString()
+		{
+			return string.Format("[CecilDependencyPropertyDescriptor Member={0}, Type={1}]", member, type);
+		}
+	}
+}

ILSpy.BamlDecompiler/CecilType.cs

@@ -0,0 +1,71 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Linq;
+using ICSharpCode.ILSpy;
+using Mono.Cecil;
+using Ricciolo.StylesExplorer.MarkupReflection;
+
+namespace ILSpy.BamlDecompiler
+{
+	public class CecilType : IType
+	{
+		internal readonly TypeDefinition type;
+		
+		public CecilType(TypeDefinition type)
+		{
+			this.type = type;
+		}
+		
+		public string AssemblyQualifiedName {
+			get {
+				return type.FullName +
+					", " + type.Module.Assembly.FullName;
+			}
+		}
+		
+		public bool IsSubclassOf(IType type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			if (!(type is CecilType))
+				throw new ArgumentException("type has to be a CecilType");
+			
+			CecilType ct = (CecilType)type;
+			
+			var t = ct.type;
+			
+			while (t != null) {
+				if (t == ct.type)
+					return true;
+				foreach (var @interface in t.Interfaces) {
+					var resolved = @interface.Resolve();
+					if (resolved == ct.type)
+						return true;
+				}
+				if (t.BaseType == null)
+					break;
+				
+				t = t.BaseType.Resolve();
+			}
+			
+			return false;
+		}
+		
+		public bool Equals(IType type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			if (!(type is CecilType))
+				throw new ArgumentException("type has to be a CecilType");
+			
+			return this.type == ((CecilType)type).type;
+		}
+		
+		public override string ToString()
+		{
+			return string.Format("[CecilType Type={0}]", type);
+		}
+	}
+}

ILSpy.BamlDecompiler/CecilTypeResolver.cs

@@ -0,0 +1,53 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Linq;
+using ICSharpCode.ILSpy;
+using Mono.Cecil;
+using Ricciolo.StylesExplorer.MarkupReflection;
+
+namespace ILSpy.BamlDecompiler
+{
+	/// <summary>
+	/// Description of CecilTypeResolver.
+	/// </summary>
+	public class CecilTypeResolver : ITypeResolver
+	{
+		LoadedAssembly assembly;
+		
+		public CecilTypeResolver(LoadedAssembly assembly)
+		{
+			this.assembly = assembly;
+		}
+		
+		public IType GetTypeByAssemblyQualifiedName(string name)
+		{
+			int comma = name.IndexOf(',');
+			
+			if (comma == -1)
+				throw new ArgumentException("invalid name");
+			
+			string fullName = name.Substring(0, comma);
+			string assemblyName = name.Substring(comma + 1).Trim();
+			
+			var type = assembly.AssemblyDefinition.MainModule.GetType(fullName);
+			if (type == null) {
+				var otherAssembly = assembly.LookupReferencedAssembly(assemblyName);
+				if (otherAssembly == null)
+					throw new Exception("could not resolve '" + assemblyName + "'!");
+				type = otherAssembly.AssemblyDefinition.MainModule.GetType(fullName);
+			}
+			
+			return new CecilType(type);
+		}
+		
+		public IDependencyPropertyDescriptor GetDependencyPropertyDescriptor(string name, IType ownerType, IType targetType)
+		{
+			if (!(ownerType is CecilType))
+				throw new ArgumentException();
+			
+			return new CecilDependencyPropertyDescriptor(name, ((CecilType)ownerType).type);
+		}
+	}
+}

ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{A6BAD2BA-76BA-461C-8B6D-418607591247}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ILSpy.BamlDecompiler</RootNamespace>
+    <AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>..\ILSpy\bin\Debug\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>..\ILSpy\bin\Release\</OutputPath>
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BamlResourceNodeFactory.cs" />
+    <Compile Include="BamlResourceEntryNode.cs" />
+    <Compile Include="CecilDependencyPropertyDescriptor.cs" />
+    <Compile Include="CecilType.cs" />
+    <Compile Include="CecilTypeResolver.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\AppDomainTypeResolver.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\BamlAssembly.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\BamlBinaryReader.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\BamlFile.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\BamlRecordType.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\DotNetType.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\IDependencyPropertyDescriptor.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\IType.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\ITypeResolver.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\KnownInfo.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\PropertyDeclaration.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\ResourceName.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\TypeDeclaration.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\WpfDependencyPropertyDescriptor.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlBamlElement.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlBamlNode.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlBamlProperty.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlBamlPropertyElement.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlBamlReader.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlBamlText.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlNamespace.cs" />
+    <Compile Include="Ricciolo.StylesExplorer.MarkupReflection\XmlPIMapping.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Ricciolo.StylesExplorer.MarkupReflection" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
+      <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
+      <Name>ICSharpCode.AvalonEdit</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj">
+      <Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
+      <Name>ICSharpCode.Decompiler</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ILSpy\ILSpy.csproj">
+      <Project>{1E85EFF9-E370-4683-83E4-8A3D063FF791}</Project>
+      <Name>ILSpy</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj">
+      <Project>{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}</Project>
+      <Name>ICSharpCode.TreeView</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>

ILSpy.BamlDecompiler/Properties/AssemblyInfo.cs

@@ -0,0 +1,31 @@
+#region Using directives
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ILSpy.BamlDecompiler.Plugin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ILSpy.BamlDecompiler.Plugin")]
+[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all the values or you can use the default the Revision and 
+// Build Numbers by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.*")]

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/AppDomainTypeResolver.cs

@@ -0,0 +1,172 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reflection;
+using System.Text;
+using System.IO;
+using System.Linq;
+using Microsoft.Win32;
+using System.Threading;
+using System.Security.Permissions;
+using System.Security;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public delegate void AssemblyResolveEventHandler(object s, AssemblyResolveEventArgs e);
+
+	public class AppDomainTypeResolver : MarshalByRefObject, ITypeResolver
+	{
+		private readonly AppDomain _domain;
+		private string baseDir;
+
+		public event AssemblyResolveEventHandler AssemblyResolve;
+
+		public static AppDomainTypeResolver GetIntoNewAppDomain(string baseDir)
+		{
+			AppDomainSetup info = new AppDomainSetup();
+			info.ApplicationBase = Environment.CurrentDirectory;
+			AppDomain domain = AppDomain.CreateDomain("AppDomainTypeResolver", null, info, new PermissionSet(PermissionState.Unrestricted));
+			AppDomainTypeResolver resolver = (AppDomainTypeResolver)domain.CreateInstanceAndUnwrap(typeof(AppDomainTypeResolver).Assembly.FullName,
+			                                                                                       typeof(AppDomainTypeResolver).FullName, false, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.CreateInstance, null, new object[] { domain, baseDir }, null, null, null);
+
+			return resolver;
+		}
+
+		Assembly domain_AssemblyResolve(object sender, ResolveEventArgs args)
+		{
+			// Cerco di risolvere automaticamente
+			AssemblyName name = new AssemblyName(args.Name);
+			string fileName = Path.Combine(this.baseDir, name.Name + ".exe");
+			if (!File.Exists(fileName))
+				fileName = Path.Combine(this.baseDir, name.Name + ".dll");
+
+			// Carico il percorso autocalcolato
+			if (File.Exists(fileName))
+				return Assembly.LoadFile(fileName);
+
+			if (AssemblyResolve != null)
+			{
+				AssemblyResolveEventArgs e = new AssemblyResolveEventArgs(args.Name, this.baseDir);
+				AssemblyResolve(this, e);
+				if (!String.IsNullOrEmpty(e.Location) && File.Exists(e.Location))
+					return Assembly.LoadFile(e.Location);
+			}
+
+			return null;
+		}
+
+		public static void DestroyResolver(AppDomainTypeResolver resolver)
+		{
+			if (resolver == null) throw new ArgumentNullException("resolver");
+
+			ThreadPool.QueueUserWorkItem(delegate
+			                             {
+			                             	AppDomain.Unload(resolver.Domain);
+			                             });
+		}
+
+		protected AppDomainTypeResolver(AppDomain domain, string baseDir)
+		{
+			_domain = domain;
+			this.baseDir = baseDir;
+
+			domain.AssemblyResolve += new ResolveEventHandler(domain_AssemblyResolve);
+		}
+
+		public BamlAssembly LoadAssembly(AssemblyName asm)
+		{
+			//return new BamlAssembly(Assembly.Load(asm));
+			return new BamlAssembly(_domain.Load(asm));
+		}
+
+		public BamlAssembly LoadAssembly(string location)
+		{
+			Assembly asm = Assembly.LoadFile(location);
+			return new BamlAssembly(asm);
+			//return _domain.Load(System.IO.File.ReadAllBytes(location));
+			//return Assembly.LoadFrom(location);
+		}
+
+		public BamlAssembly[] GetReferencedAssemblies(BamlAssembly asm)
+		{
+			AssemblyName[] list = asm.Assembly.GetReferencedAssemblies();
+
+			return (from an in list
+			        select this.LoadAssembly(an)).ToArray();
+		}
+
+		public AppDomain Domain
+		{
+			get { return _domain; }
+		}
+
+		#region ITypeResolver Members
+
+		public IType GetTypeByAssemblyQualifiedName(string name)
+		{
+			return new DotNetType(name);
+		}
+
+		public IDependencyPropertyDescriptor GetDependencyPropertyDescriptor(string name, IType ownerType, IType targetType)
+		{
+			if (name == null) throw new ArgumentNullException("name");
+			if (ownerType == null) throw new ArgumentNullException("ownerType");
+			if (targetType == null) throw new ArgumentNullException("targetType");
+
+			Type dOwnerType = ((DotNetType)ownerType).Type;
+			Type dTargetType = ((DotNetType)targetType).Type;
+
+			try
+			{
+				DependencyPropertyDescriptor propertyDescriptor = DependencyPropertyDescriptor.FromName(name, dOwnerType, dTargetType);
+				if (propertyDescriptor != null)
+					return new WpfDependencyPropertyDescriptor(propertyDescriptor);
+				return null;
+			}
+			catch (Exception)
+			{
+				return null;
+			}
+		}
+
+		#endregion
+
+		public override object InitializeLifetimeService()
+		{
+			return null;
+		}
+	}
+
+	public class AssemblyResolveEventArgs : MarshalByRefObject
+	{
+
+		private string _location;
+		private string _name;
+		private string _baseDir;
+
+		public AssemblyResolveEventArgs(string name, string baseDir)
+		{
+			_name = name;
+			_baseDir = baseDir;
+		}
+
+		public string Location
+		{
+			get { return _location; }
+			set { _location = value; }
+		}
+
+		public string Name
+		{
+			get { return _name; }
+		}
+
+		public string BaseDir
+		{
+			get { return _baseDir; }
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/BamlAssembly.cs

@@ -0,0 +1,112 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Reflection;
+using System.Resources;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public class BamlAssembly : MarshalByRefObject
+	{
+		private readonly string _filePath;
+		private Assembly _assembly;
+		private BamlFileList _bamlFile;
+
+		public BamlAssembly(Assembly assembly)
+		{
+			_assembly = assembly;
+			_filePath = assembly.CodeBase;
+
+			ReadBaml();
+		}
+
+		public BamlAssembly(string filePath)
+		{
+			this._filePath = Path.GetFullPath(filePath);
+			this._assembly = Assembly.LoadFile(this.FilePath);
+			if (String.Compare(this.Assembly.CodeBase, this.FilePath, true) != 0)
+				throw new ArgumentException("Cannot load filePath because Assembly is already loaded", "filePath");
+
+			ReadBaml();
+		}
+
+		private void ReadBaml()
+		{
+			// Get available names
+			string[] resources = this.Assembly.GetManifestResourceNames();
+			foreach (string res in resources)
+			{
+				// Solo le risorse
+				if (String.Compare(Path.GetExtension(res), ".resources", true) != 0) continue;
+
+				// Get stream
+				using (Stream stream = this.Assembly.GetManifestResourceStream(res))
+				{
+					try
+					{
+						ResourceReader reader = new ResourceReader(stream);
+						foreach (DictionaryEntry entry in reader)
+						{
+							if (String.Compare(Path.GetExtension(entry.Key.ToString()), ".baml", true) == 0 && entry.Value is Stream)
+							{
+								BamlFile bm = new BamlFile(GetAssemblyResourceUri(entry.Key.ToString()), (Stream)entry.Value);
+								this.BamlFiles.Add(bm);
+							}
+						}
+					}
+					catch (ArgumentException)
+					{}
+				}
+			}
+		}
+
+		private Uri GetAssemblyResourceUri(string resourceName)
+		{
+			AssemblyName asm = this.Assembly.GetName();
+			byte[] data = asm.GetPublicKeyToken();
+			StringBuilder token = new StringBuilder(data.Length * 2);
+			for (int x = 0; x < data.Length; x++)
+			{
+				token.Append(data[x].ToString("x", System.Globalization.CultureInfo.InvariantCulture));
+			}
+
+			return new Uri(String.Format(@"{0};V{1};{2};component\{3}", asm.Name, asm.Version, token, Path.ChangeExtension(resourceName, ".xaml")), UriKind.RelativeOrAbsolute);
+		}
+
+		public string FilePath
+		{
+			get { return _filePath; }
+		}
+
+		public Assembly Assembly
+		{
+			get { return _assembly; }
+		}
+
+		public BamlFileList BamlFiles
+		{
+			get
+			{
+				if (_bamlFile == null)
+					_bamlFile = new BamlFileList();
+				return _bamlFile;
+			}
+		}
+
+		public override object InitializeLifetimeService()
+		{
+			return null;
+		}
+	}
+
+	[Serializable()]
+	public class BamlFileList : Collection<BamlFile>
+	{}
+
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/BamlBinaryReader.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.IO;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class BamlBinaryReader : BinaryReader
+	{
+		// Methods
+		public BamlBinaryReader(Stream stream)
+			: base(stream)
+		{
+		}
+
+		public virtual double ReadCompressedDouble()
+		{
+			switch (this.ReadByte())
+			{
+				case 1:
+					return 0;
+
+				case 2:
+					return 1;
+
+				case 3:
+					return -1;
+
+				case 4:
+					{
+						double num = this.ReadInt32();
+						return (num * 1E-06);
+					}
+				case 5:
+					return this.ReadDouble();
+			}
+			throw new NotSupportedException();
+		}
+
+		public int ReadCompressedInt32()
+		{
+			return base.Read7BitEncodedInt();
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/BamlFile.cs

@@ -0,0 +1,80 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Resources;
+using System.Text;
+using System.Windows;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	/// <summary>
+	/// Rappresenta un singole file Baml all'interno di un assembly
+	/// </summary>
+	public class BamlFile : Component
+	{
+		private Uri _uri;
+		private readonly Stream _stream;
+
+		public BamlFile(Uri uri, Stream stream)
+		{
+			if (uri == null)
+				new ArgumentNullException("uri");
+			if (stream == null)
+				throw new ArgumentNullException("stream");
+
+			_uri = uri;
+			_stream = stream;
+		}
+
+		/// <summary>
+		/// Carica il Baml attraverso il motore di WPF con Application.LoadComponent
+		/// </summary>
+		/// <returns></returns>
+		public object LoadContent()
+		{
+			try
+			{
+				return Application.LoadComponent(this.Uri);
+			}
+			catch (Exception e)
+			{
+				throw new InvalidOperationException("Invalid baml file.", e);
+			}
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			base.Dispose(disposing);
+
+			if (disposing)
+				this.Stream.Dispose();
+		}
+
+		public override object InitializeLifetimeService()
+		{
+			return null;
+		}
+
+		/// <summary>
+		/// Restituisce lo stream originale contenente il Baml
+		/// </summary>
+		public Stream Stream
+		{
+			get { return _stream; }
+		}
+
+		/// <summary>
+		/// Restituisce l'indirizzo secondo lo schema pack://
+		/// </summary>
+		public Uri Uri
+		{
+			get { return _uri; }
+		}
+
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/BamlRecordType.cs

@@ -0,0 +1,72 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal enum BamlRecordType : byte
+	{
+		AssemblyInfo = 0x1c,
+		AttributeInfo = 0x1f,
+		ClrEvent = 0x13,
+		Comment = 0x17,
+		ConnectionId = 0x2d,
+		ConstructorParametersEnd = 0x2b,
+		ConstructorParametersStart = 0x2a,
+		ConstructorParameterType = 0x2c,
+		ContentProperty = 0x2e,
+		DefAttribute = 0x19,
+		DefAttributeKeyString = 0x26,
+		DefAttributeKeyType = 0x27,
+		DeferableContentStart = 0x25,
+		DefTag = 0x18,
+		DocumentEnd = 2,
+		DocumentStart = 1,
+		ElementEnd = 4,
+		ElementStart = 3,
+		EndAttributes = 0x1a,
+		KeyElementEnd = 0x29,
+		KeyElementStart = 40,
+		LastRecordType = 0x39,
+		LineNumberAndPosition = 0x35,
+		LinePosition = 0x36,
+		LiteralContent = 15,
+		NamedElementStart = 0x2f,
+		OptimizedStaticResource = 0x37,
+		PIMapping = 0x1b,
+		PresentationOptionsAttribute = 0x34,
+		ProcessingInstruction = 0x16,
+		Property = 5,
+		PropertyArrayEnd = 10,
+		PropertyArrayStart = 9,
+		PropertyComplexEnd = 8,
+		PropertyComplexStart = 7,
+		PropertyCustom = 6,
+		PropertyDictionaryEnd = 14,
+		PropertyDictionaryStart = 13,
+		PropertyListEnd = 12,
+		PropertyListStart = 11,
+		PropertyStringReference = 0x21,
+		PropertyTypeReference = 0x22,
+		PropertyWithConverter = 0x24,
+		PropertyWithExtension = 0x23,
+		PropertyWithStaticResourceId = 0x38,
+		RoutedEvent = 0x12,
+		StaticResourceEnd = 0x31,
+		StaticResourceId = 50,
+		StaticResourceStart = 0x30,
+		StringInfo = 0x20,
+		Text = 0x10,
+		TextWithConverter = 0x11,
+		TextWithId = 0x33,
+		TypeInfo = 0x1d,
+		TypeSerializerInfo = 30,
+		Unknown = 0,
+		XmlAttribute = 0x15,
+		XmlnsProperty = 20
+	}
+
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/DotNetType.cs

@@ -0,0 +1,58 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public class DotNetType : MarshalByRefObject, IType
+	{
+		private readonly string _assemblyQualifiedName;
+		private Type _type;
+
+		public DotNetType(string assemblyQualifiedName)
+		{
+			if (assemblyQualifiedName == null) throw new ArgumentNullException("assemblyQualifiedName");
+
+			_assemblyQualifiedName = assemblyQualifiedName;
+			_type = Type.GetType(assemblyQualifiedName, false, true);
+		}
+
+		#region IType Members
+
+		public string AssemblyQualifiedName
+		{
+			get { return _assemblyQualifiedName; }
+		}
+
+		public bool IsSubclassOf(IType type)
+		{
+			if (type == null) throw new ArgumentNullException("type");
+			if (!(type is DotNetType)) throw new ArgumentException("type");
+			if (_type == null) return false;
+			return this._type.IsSubclassOf(((DotNetType)type).Type);
+		}
+
+		public bool Equals(IType type)
+		{
+			if (type == null) throw new ArgumentNullException("type");
+			if (!(type is DotNetType)) throw new ArgumentException("type");
+			if (_type == null) return false;
+			return this._type.Equals(((DotNetType)type).Type);
+		}
+
+		#endregion
+
+		public Type Type
+		{
+			get { return _type; }
+		}
+
+		public override object InitializeLifetimeService()
+		{
+			return null;
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/IDependencyPropertyDescriptor.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public interface IDependencyPropertyDescriptor
+	{
+		bool IsAttached { get; }
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/IType.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	/// <summary>
+	/// Interface rappresenting a DotNet type
+	/// </summary>
+	public interface IType
+	{
+		string AssemblyQualifiedName { get; }
+		bool IsSubclassOf(IType type);
+		bool Equals(IType type);
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/ITypeResolver.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public interface ITypeResolver
+	{
+		IType GetTypeByAssemblyQualifiedName(string name);
+		IDependencyPropertyDescriptor GetDependencyPropertyDescriptor(string name, IType ownerType, IType targetType);
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/PropertyDeclaration.cs

@@ -0,0 +1,58 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class PropertyDeclaration
+	{
+		private TypeDeclaration declaringType;
+		private string name;
+
+		// Methods
+		public PropertyDeclaration(string name)
+		{
+			this.name = name;
+			this.declaringType = null;
+		}
+
+		public PropertyDeclaration(string name, TypeDeclaration declaringType)
+		{
+			this.name = name;
+			this.declaringType = declaringType;
+		}
+
+		public override string ToString()
+		{
+			if (((this.DeclaringType != null) && (this.DeclaringType.Name == "XmlNamespace")) && ((this.DeclaringType.Namespace == null) && (this.DeclaringType.Assembly == null)))
+			{
+				if ((this.Name == null) || (this.Name.Length == 0))
+				{
+					return "xmlns";
+				}
+				return ("xmlns:" + this.Name);
+			}
+			return this.Name;
+		}
+
+		// Properties
+		public TypeDeclaration DeclaringType
+		{
+			get
+			{
+				return this.declaringType;
+			}
+		}
+
+		public string Name
+		{
+			get
+			{
+				return this.name;
+			}
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/ResourceName.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public class ResourceName
+	{
+		private string name;
+
+		public ResourceName(string name)
+		{
+			this.name = name;
+		}
+
+		public override string ToString()
+		{
+			return this.Name;
+		}
+
+		public string Name
+		{
+			get
+			{
+				return this.name;
+			}
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/TypeDeclaration.cs

@@ -0,0 +1,137 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class TypeDeclaration
+	{
+		private readonly XmlBamlReader reader;
+
+		private readonly short _assemblyId;
+		private readonly bool _isKnown;
+		private readonly string _name;
+		private readonly string _namespaceName;
+		private readonly bool _isExtension;
+		private IType _type;
+		private bool _typeLoaded;
+		private readonly ITypeResolver resolver;
+
+		public TypeDeclaration(ITypeResolver resolver, string name, string namespaceName, short assemblyId)
+			: this(null, resolver, name, namespaceName, assemblyId, true)
+		{
+
+		}
+
+		public TypeDeclaration(ITypeResolver resolver, string name, string namespaceName, short assemblyId, bool isExtension)
+			: this(null, resolver, name, namespaceName, assemblyId, true)
+		{
+			_isExtension = isExtension;
+		}
+
+		public TypeDeclaration(XmlBamlReader reader, ITypeResolver resolver, string name, string namespaceName, short assemblyId)
+			: this(reader, resolver, name, namespaceName, assemblyId, true)
+		{
+		}
+
+		public TypeDeclaration(XmlBamlReader reader, ITypeResolver resolver, string name, string namespaceName, short assemblyId, bool isKnown)
+		{
+			this.reader = reader;
+			this.resolver = resolver;
+			this._name = name;
+			this._namespaceName = namespaceName;
+			this._assemblyId = assemblyId;
+			this._isKnown = isKnown;
+
+			if (!_isExtension)
+				_isExtension = name.EndsWith("Extension");
+		}
+
+		public override string ToString()
+		{
+			return this._name;
+		}
+
+		public bool IsExtension
+		{
+			get { return _isExtension; }
+		}
+
+		public string Assembly
+		{
+			get
+			{
+				if (reader != null)
+					return this.reader.GetAssembly(this.AssemblyId);
+				else
+					return KnownInfo.KnownAssemblyTable[this.AssemblyId];
+			}
+		}
+
+		public short AssemblyId
+		{
+			get { return _assemblyId; }
+		}
+
+		public string Name
+		{
+			get
+			{
+				return this._name;
+			}
+		}
+
+		public bool IsKnown
+		{
+			get { return _isKnown; }
+		}
+
+		//public Type DotNetType
+		//{
+		//    get
+		//    {
+		//        if (!_typeLoaded)
+		//        {
+		//            _type = Type.GetType(String.Format("{0}.{1}, {2}", this.Namespace, this.Name, this.Assembly), false, true);
+		//            _typeLoaded = true;
+		//        }
+
+		//        return _type;
+		//    }
+		//}
+
+		public IType Type
+		{
+			get
+			{
+				if (!_typeLoaded)
+				{
+					if (this.Name.Length > 0)
+						_type = resolver.GetTypeByAssemblyQualifiedName(String.Format("{0}.{1}, {2}", this.Namespace, this.Name, this.Assembly));
+					_typeLoaded = true;
+				}
+
+				return _type;
+			}
+		}
+
+		public string Namespace
+		{
+			get
+			{
+				return this._namespaceName;
+			}
+		}
+
+		public override bool Equals(object obj)
+		{
+			TypeDeclaration td = obj as TypeDeclaration;
+			if (td != null)
+				return (this.Name == td.Name && this.Namespace == td.Namespace && this.AssemblyId == td.AssemblyId);
+			else
+				return false;
+		}
+	}
+
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/WpfDependencyPropertyDescriptor.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	public class WpfDependencyPropertyDescriptor : MarshalByRefObject, IDependencyPropertyDescriptor
+	{
+		private readonly DependencyPropertyDescriptor _propertyDescriptor;
+
+		public WpfDependencyPropertyDescriptor(DependencyPropertyDescriptor propertyDescriptor)
+		{
+			if (propertyDescriptor == null) throw new ArgumentNullException("propertyDescriptor");
+			_propertyDescriptor = propertyDescriptor;
+		}
+
+		#region IDependencyPropertyDescriptor Members
+
+		public bool IsAttached
+		{
+			get { return _propertyDescriptor.IsAttached; }
+		}
+
+		#endregion
+
+		public override object InitializeLifetimeService()
+		{
+			return null;
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlElement.cs

@@ -0,0 +1,193 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class XmlBamlElement : XmlBamlNode
+	{
+		private ArrayList _arguments = new ArrayList();
+		private XmlNamespaceCollection _namespaces = new XmlNamespaceCollection();
+		private TypeDeclaration _typeDeclaration;
+		private KeysResourcesCollection _keysResources = new KeysResourcesCollection();
+		private long _position;
+
+		public XmlBamlElement()
+		{
+		}
+
+
+		public XmlBamlElement(XmlBamlElement parent)
+		{
+			this.Namespaces.AddRange(parent.Namespaces);
+		}
+
+		public XmlNamespaceCollection Namespaces
+		{
+			get { return _namespaces; }
+		}
+
+		public TypeDeclaration TypeDeclaration
+		{
+			get
+			{
+				return this._typeDeclaration;
+			}
+			set
+			{
+				this._typeDeclaration = value;
+			}
+		}
+
+		public override XmlNodeType NodeType
+		{
+			get
+			{
+				return XmlNodeType.Element;
+			}
+		}
+
+		public long Position
+		{
+			get { return _position; }
+			set { _position = value; }
+		}
+
+		public override string ToString()
+		{
+			return String.Format("Element: {0}", TypeDeclaration.Name);
+		}
+	}
+
+	internal class XmlBamlEndElement : XmlBamlElement
+	{
+		public XmlBamlEndElement(XmlBamlElement start)
+		{
+			this.TypeDeclaration = start.TypeDeclaration;
+			this.Namespaces.AddRange(start.Namespaces);
+		}
+
+		public override XmlNodeType NodeType
+		{
+			get
+			{
+				return XmlNodeType.EndElement;
+			}
+		}
+
+		public override string ToString()
+		{
+			return String.Format("EndElement: {0}", TypeDeclaration.Name);
+		}
+	}
+
+	internal class KeyMapping
+	{
+		private string _key;
+		private TypeDeclaration _declaration;
+		private string _trueKey;
+
+		public KeyMapping(string key, TypeDeclaration declaration, string trueKey)
+		{
+			_key = key;
+			_declaration = declaration;
+			_trueKey = trueKey;
+		}
+
+		public string Key
+		{
+			get { return _key; }
+		}
+
+		public TypeDeclaration Declaration
+		{
+			get { return _declaration; }
+		}
+
+		public string TrueKey
+		{
+			get { return _trueKey; }
+		}
+
+		public override string ToString()
+		{
+			return String.Format("{0} - {1} - {2}", Key, Declaration, TrueKey);
+		}
+	}
+
+	internal class KeysResourcesCollection : List<KeysResource>
+	{
+		public KeysResource Last
+		{
+			get
+			{
+				if (this.Count == 0)
+					return null;
+				return this[this.Count - 1];
+			}
+		}
+
+		public KeysResource First
+		{
+			get
+			{
+				if (this.Count == 0)
+					return null;
+				return this[0];
+			}
+		}
+	}
+
+	internal class KeysResource
+	{
+		private KeysTable _keys = new KeysTable();
+		private ArrayList _staticResources = new ArrayList();
+
+		public KeysTable Keys
+		{
+			get { return _keys; }
+		}
+
+		public ArrayList StaticResources
+		{
+			get { return _staticResources; }
+		}
+	}
+
+	internal class KeysTable
+	{
+		private Hashtable table = new Hashtable();
+
+		public String this[long position]
+		{
+			get
+			{
+				return (string)this.table[position];
+			}
+			set
+			{
+				this.table[position] = value;
+			}
+		}
+
+		public int Count
+		{
+			get { return this.table.Count; }
+		}
+
+		public void Remove(long position)
+		{
+			this.table.Remove(position);
+		}
+
+		public bool HasKey(long position)
+		{
+			return this.table.ContainsKey(position);
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlNode.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class XmlBamlNode
+	{
+		public virtual XmlNodeType NodeType
+		{
+			get { return XmlNodeType.None;}
+		}
+	}
+
+	internal class XmlBamlNodeCollection : List<XmlBamlNode>
+	{}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlProperty.cs

@@ -0,0 +1,86 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class XmlBamlProperty : XmlBamlNode
+	{
+		private PropertyDeclaration propertyDeclaration;
+		private PropertyType propertyType;
+		private object value;
+
+		public XmlBamlProperty(PropertyType propertyType)
+		{
+			this.propertyType = propertyType;
+		}
+
+		public XmlBamlProperty(PropertyType propertyType, PropertyDeclaration propertyDeclaration)
+		{
+			this.propertyDeclaration = propertyDeclaration;
+			this.propertyType = propertyType;
+		}
+
+		public override string ToString()
+		{
+			return this.PropertyDeclaration.Name;
+		}
+
+		public PropertyDeclaration PropertyDeclaration
+		{
+			get
+			{
+				return this.propertyDeclaration;
+			}
+			set
+			{
+				this.propertyDeclaration = value;
+			}
+		}
+
+		public PropertyType PropertyType
+		{
+			get
+			{
+				return this.propertyType;
+			}
+		}
+
+		public object Value
+		{
+			get
+			{
+				return this.value;
+			}
+			set
+			{
+				this.value = value;
+			}
+		}
+
+		public override XmlNodeType NodeType
+		{
+			get
+			{
+				return XmlNodeType.Attribute;
+			}
+		}
+	}
+
+	internal enum PropertyType
+	{
+		Key,
+		Value,
+		Content,
+		List,
+		Dictionary,
+		Complex
+	}
+
+	internal class XmlBamlPropertyCollection : List<XmlBamlNode>
+	{ }
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlPropertyElement.cs

@@ -0,0 +1,48 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class XmlBamlPropertyElement : XmlBamlElement
+	{
+		private readonly PropertyType _propertyType;
+		private PropertyDeclaration propertyDeclaration;
+
+
+		public XmlBamlPropertyElement(PropertyType propertyType, PropertyDeclaration propertyDeclaration)
+		{
+			_propertyType = propertyType;
+			this.propertyDeclaration = propertyDeclaration;
+		}
+
+		public XmlBamlPropertyElement(XmlBamlElement parent, PropertyType propertyType, PropertyDeclaration propertyDeclaration)
+			: base(parent)
+		{
+			_propertyType = propertyType;
+			this.propertyDeclaration = propertyDeclaration;
+			this.TypeDeclaration = propertyDeclaration.DeclaringType;
+		}
+
+		public PropertyDeclaration PropertyDeclaration
+		{
+			get
+			{
+				return this.propertyDeclaration;
+			}
+		}
+
+		public PropertyType PropertyType
+		{
+			get { return _propertyType; }
+		}
+
+		public override string ToString()
+		{
+			return String.Format("PropertyElement: {0}.{1}", TypeDeclaration.Name, PropertyDeclaration.Name);
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlText.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class XmlBamlText : XmlBamlNode
+	{
+		private string _text;
+
+		public XmlBamlText(string text)
+		{
+			_text = text;
+		}
+
+		public string Text
+		{
+			get { return _text; }
+		}
+
+		public override System.Xml.XmlNodeType NodeType
+		{
+			get
+			{
+				return XmlNodeType.Text;
+			}
+		}
+	}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlNamespace.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System.Collections.Generic;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	internal class XmlNamespace
+	{
+		private string _prefix;
+		private string _namespace;
+
+		public XmlNamespace(string prefix, string ns)
+		{
+			_prefix = prefix;
+			_namespace = ns;
+		}
+
+		public string Prefix
+		{
+			get { return _prefix; }
+		}
+
+		public string Namespace
+		{
+			get { return _namespace; }
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (obj is XmlNamespace)
+			{
+				XmlNamespace o = (XmlNamespace)obj;
+				return (o.Prefix.Equals(this.Prefix) && o.Namespace.Equals(this.Namespace));
+			}
+			return base.Equals(obj);
+		}
+
+		public override int GetHashCode()
+		{
+			return _prefix.GetHashCode() + _namespace.GetHashCode() >> 20;
+		}
+	}
+
+	internal class XmlNamespaceCollection : List<XmlNamespace>
+	{}
+}

ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlPIMapping.cs

@@ -0,0 +1,63 @@
+// Copyright (c) Cristian Civera (cristian@aspitalia.com)
+// This code is distributed under the MS-PL (for details please see \doc\MS-PL.txt)
+
+using System;
+
+namespace Ricciolo.StylesExplorer.MarkupReflection
+{
+	/// <summary>
+	/// Rappresenta la mappatura tra namespace XML e namespace CLR con relativo assembly
+	/// </summary>
+	public class XmlPIMapping
+	{
+		private string _xmlNamespace;
+		private short _assemblyId;
+		private string _clrNamespace;
+		private static XmlPIMapping _default = new XmlPIMapping(PresentationNamespace, 0, String.Empty);
+
+		public const string XamlNamespace = "http://schemas.microsoft.com/winfx/2006/xaml";
+		public const string PresentationNamespace = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+		public const string PresentationOptionsNamespace = "http://schemas.microsoft.com/winfx/2006/xaml/presentation/options";
+		public const string McNamespace = "http://schemas.openxmlformats.org/markup-compatibility/2006";
+
+		public XmlPIMapping(string xmlNamespace, short assemblyId, string clrNamespace)
+		{
+			_xmlNamespace = xmlNamespace;
+			_assemblyId = assemblyId;
+			_clrNamespace = clrNamespace;
+		}
+
+		/// <summary>
+		/// Restituisce o imposta il namespace XML
+		/// </summary>
+		public string XmlNamespace
+		{
+			get { return _xmlNamespace; }
+			set { _xmlNamespace = value;}
+		}
+
+		/// <summary>
+		/// Restituisce l'id dell'assembly
+		/// </summary>
+		public short AssemblyId
+		{
+			get { return _assemblyId; }
+		}
+
+		/// <summary>
+		/// Restituisce il namespace clr
+		/// </summary>
+		public string ClrNamespace
+		{
+			get { return _clrNamespace; }
+		}
+
+		/// <summary>
+		/// Restituisce il mapping di default di WPF
+		/// </summary>
+		public static XmlPIMapping Presentation
+		{
+			get { return _default; }
+		}
+	}
+}

ILSpy.sln

@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPlugin", "TestPlugin\Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "Mono.Cecil\symbols\pdb\Mono.Cecil.Pdb.csproj", "{63E6915C-7EA4-4D76-AB28-0D7191EEA626}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler", "ILSpy.BamlDecompiler\ILSpy.BamlDecompiler.csproj", "{A6BAD2BA-76BA-461C-8B6D-418607591247}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -105,6 +107,14 @@ Global
 		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
 		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.Build.0 = net_4_0_Debug|Any CPU
 		{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.Build.0 = Debug|x86
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|x86.ActiveCfg = Debug|x86
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.Build.0 = Release|x86
+		{A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|x86.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ILSpy/BamlDecompiler.cs

@@ -1,445 +0,0 @@
-// Copyright (c) 2011 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
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// 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.
-
-using System;
-using System.ComponentModel.Composition;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Windows.Baml2006;
-using System.Xaml;
-using System.Xaml.Schema;
-using System.Xml;
-using System.Xml.Linq;
-using ICSharpCode.AvalonEdit.Highlighting;
-using ICSharpCode.ILSpy.TextView;
-using ICSharpCode.ILSpy.TreeNodes;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace ICSharpCode.ILSpy.Baml
-{
-	/// <remarks>Caution: use in separate AppDomain only!</remarks>
-	sealed class BamlDecompiler : MarshalByRefObject
-	{
-		public BamlDecompiler()
-		{
-		}
-		
-		abstract class XamlNode
-		{
-			public readonly List<XamlNode> Children = new List<XamlNode>();
-			
-			public abstract void WriteTo(XamlWriter writer);
-		}
-
-		[Conditional("DEBUG")]
-		static void Log(string format, params object[] args)
-		{
-			Debug.WriteLine(format, args);
-		}
-		
-		sealed class XamlObjectNode : XamlNode
-		{
-			public readonly XamlType Type;
-			
-			public XamlObjectNode(XamlType type)
-			{
-				this.Type = type;
-			}
-			
-			public override void WriteTo(XamlWriter writer)
-			{
-				Log("StartObject {0}", this.Type);
-				writer.WriteStartObject(this.Type);
-				Debug.Indent();
-				foreach (XamlNode node in this.Children)
-					node.WriteTo(writer);
-				Debug.Unindent();
-				Log("EndObject");
-				writer.WriteEndObject();
-			}
-		}
-		
-		sealed class XamlGetObjectNode : XamlNode
-		{
-			public override void WriteTo(XamlWriter writer)
-			{
-				Log("GetObject");
-				writer.WriteGetObject();
-				Debug.Indent();
-				foreach (XamlNode node in this.Children)
-					node.WriteTo(writer);
-				Debug.Unindent();
-				Log("EndObject");
-				writer.WriteEndObject();
-			}
-		}
-		
-		sealed class XamlMemberNode : XamlNode
-		{
-			public XamlMember Member;
-			
-			public XamlMemberNode(XamlMember member)
-			{
-				this.Member = member;
-			}
-			
-			public override void WriteTo(XamlWriter writer)
-			{
-				Log("StartMember {0}", this.Member);
-				writer.WriteStartMember(this.Member);
-				Debug.Indent();
-				foreach (XamlNode node in this.Children)
-					node.WriteTo(writer);
-				Debug.Unindent();
-				Log("EndMember");
-				writer.WriteEndMember();
-			}
-		}
-		
-		sealed class XamlValueNode : XamlNode
-		{
-			public readonly object Value;
-			
-			public XamlValueNode(object value)
-			{
-				this.Value = value;
-			}
-			
-			public override void WriteTo(XamlWriter writer)
-			{
-				Log("Value {0}", this.Value);
-				Debug.Assert(this.Children.Count == 0);
-				// requires XamlReaderSettings.ValuesMustBeString = true to work properly
-				writer.WriteValue(this.Value);
-			}
-		}
-		
-		sealed class XamlNamespaceDeclarationNode : XamlNode
-		{
-			public readonly NamespaceDeclaration Namespace;
-			
-			public XamlNamespaceDeclarationNode(NamespaceDeclaration @namespace)
-			{
-				this.Namespace = @namespace;
-			}
-			
-			public override void WriteTo(XamlWriter writer)
-			{
-				Log("NamespaceDeclaration {0}", this.Namespace);
-				Debug.Assert(this.Children.Count == 0);
-				writer.WriteNamespace(this.Namespace);
-			}
-		}
-		
-		static List<XamlNode> Parse(XamlReader reader)
-		{
-			List<XamlNode> currentList = new List<XamlNode>();
-			Stack<List<XamlNode>> stack = new Stack<List<XamlNode>>();
-			while (reader.Read()) {
-				switch (reader.NodeType) {
-					case XamlNodeType.None:
-						break;
-					case XamlNodeType.StartObject:
-						XamlObjectNode obj = new XamlObjectNode(reader.Type);
-						currentList.Add(obj);
-						stack.Push(currentList);
-						currentList = obj.Children;
-						break;
-					case XamlNodeType.GetObject:
-						XamlGetObjectNode getObject = new XamlGetObjectNode();
-						currentList.Add(getObject);
-						stack.Push(currentList);
-						currentList = getObject.Children;
-						break;
-					case XamlNodeType.StartMember:
-						XamlMemberNode member = new XamlMemberNode(reader.Member);
-						currentList.Add(member);
-						stack.Push(currentList);
-						currentList = member.Children;
-						break;
-					case XamlNodeType.Value:
-						currentList.Add(new XamlValueNode(reader.Value));
-						break;
-					case XamlNodeType.NamespaceDeclaration:
-						currentList.Add(new XamlNamespaceDeclarationNode(reader.Namespace));
-						break;
-					case XamlNodeType.EndObject:
-					case XamlNodeType.EndMember:
-						currentList = stack.Pop();
-						break;
-					default:
-						throw new InvalidOperationException("Invalid value for XamlNodeType");
-				}
-			}
-			if (stack.Count != 0)
-				throw new InvalidOperationException("Imbalanced stack");
-			return currentList;
-		}
-		
-		void AvoidContentProperties(XamlNode node)
-		{
-			foreach (XamlNode child in node.Children)
-				AvoidContentProperties(child);
-			
-
-			XamlObjectNode obj = node as XamlObjectNode;
-			if (obj != null) {
-				// Visit all except for the last child:
-				for (int i = 0; i < obj.Children.Count - 1; i++) {
-					// Avoids using content property syntax for simple string values, if the content property is not the last member.
-					// Without this, we cannot decompile &lt;GridViewColumn Header="Culture" DisplayMemberBinding="{Binding Culture}" /&gt;,
-					// because the Header property is the content property, but there is no way to represent the Binding as an element.
-					XamlMemberNode memberNode = obj.Children[i] as XamlMemberNode;
-					if (memberNode != null && memberNode.Member == obj.Type.ContentProperty) {
-						if (memberNode.Children.Count == 1 && memberNode.Children[0] is XamlValueNode) {
-							// By creating a clone of the XamlMember, we prevent WPF from knowing that it's the content property.
-							XamlMember member = memberNode.Member;
-							memberNode.Member = new XamlMember(member.Name, member.DeclaringType, member.IsAttachable);
-						}
-					}
-				}
-				// We also need to avoid using content properties that have a markup extension as value, as the XamlXmlWriter would always expand those:
-				for (int i = 0; i < obj.Children.Count; i++) {
-					XamlMemberNode memberNode = obj.Children[i] as XamlMemberNode;
-					if (memberNode != null && memberNode.Member == obj.Type.ContentProperty && memberNode.Children.Count == 1) {
-						XamlObjectNode me = memberNode.Children[0] as XamlObjectNode;
-						if (me != null && me.Type.IsMarkupExtension) {
-							// By creating a clone of the XamlMember, we prevent WPF from knowing that it's the content property.
-							XamlMember member = memberNode.Member;
-							memberNode.Member = new XamlMember(member.Name, member.DeclaringType, member.IsAttachable);
-						}
-					}
-				}
-			}
-		}
-
-		/// <summary>
-		/// It seems like BamlReader will always output 'x:Key' as last property. However, it must be specified as attribute in valid .xaml, so we move it to the front
-		/// of the attribute list.
-		/// </summary>
-		void MoveXKeyToFront(XamlNode node)
-		{
-			foreach (XamlNode child in node.Children)
-				MoveXKeyToFront(child);
-
-			XamlObjectNode obj = node as XamlObjectNode;
-			if (obj != null && obj.Children.Count > 0) {
-				XamlMemberNode memberNode = obj.Children[obj.Children.Count - 1] as XamlMemberNode;
-				if (memberNode != null && memberNode.Member == XamlLanguage.Key) {
-					// move memberNode in front of the first member node:
-					for (int i = 0; i < obj.Children.Count; i++) {
-						if (obj.Children[i] is XamlMemberNode) {
-							obj.Children.Insert(i, memberNode);
-							obj.Children.RemoveAt(obj.Children.Count - 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-		
-		AssemblyResolver asmResolver;
-		
-		Assembly AssemblyResolve(object sender, ResolveEventArgs args)
-		{
-			string path = asmResolver.FindAssembly(args.Name);
-			
-			if (path == null)
-				return null;
-			
-			return Assembly.LoadFile(path);
-		}
-		
-		public string DecompileBaml(MemoryStream bamlCode, string containingAssemblyFile, ConnectMethodDecompiler connectMethodDecompiler, AssemblyResolver asmResolver)
-		{
-			this.asmResolver = asmResolver;
-			AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
-			
-			bamlCode.Position = 0;
-			TextWriter w = new StringWriter();
-			
-			Assembly assembly = Assembly.LoadFile(containingAssemblyFile);
-			
-			Baml2006Reader reader = new Baml2006Reader(bamlCode, new XamlReaderSettings() { ValuesMustBeString = true, LocalAssembly = assembly });
-			var xamlDocument = Parse(reader);
-			
-			string bamlTypeName = xamlDocument.OfType<XamlObjectNode>().First().Type.UnderlyingType.FullName;
-			
-			var eventMappings = connectMethodDecompiler.DecompileEventMappings(bamlTypeName);
-
-			foreach (var xamlNode in xamlDocument) {
-				RemoveConnectionIds(xamlNode, eventMappings, reader.SchemaContext);
-				AvoidContentProperties(xamlNode);
-				MoveXKeyToFront(xamlNode);
-			}
-			
-			XDocument doc = new XDocument();
-			XamlXmlWriter writer = new XamlXmlWriter(doc.CreateWriter(), reader.SchemaContext, new XamlXmlWriterSettings { AssumeValidInput = true });
-			foreach (var xamlNode in xamlDocument)
-				xamlNode.WriteTo(writer);
-			writer.Close();
-			
-			// Fix namespace references
-			string suffixToRemove = ";assembly=" + assembly.GetName().Name;
-			foreach (XAttribute attrib in doc.Root.Attributes()) {
-				if (attrib.Name.Namespace == XNamespace.Xmlns) {
-					if (attrib.Value.EndsWith(suffixToRemove, StringComparison.Ordinal)) {
-						string newNamespace = attrib.Value.Substring(0, attrib.Value.Length - suffixToRemove.Length);
-						ChangeXmlNamespace(doc, attrib.Value, newNamespace);
-						attrib.Value = newNamespace;
-					}
-				}
-			}
-
-			return doc.ToString();
-		}
-		
-		void RemoveConnectionIds(XamlNode node, Dictionary<int, EventRegistration[]> eventMappings, XamlSchemaContext context)
-		{
-			foreach (XamlNode child in node.Children)
-				RemoveConnectionIds(child, eventMappings, context);
-			
-			XamlObjectNode obj = node as XamlObjectNode;
-			if (obj != null && obj.Children.Count > 0) {
-				var removableNodes = new List<XamlMemberNode>();
-				var addableNodes = new List<XamlMemberNode>();
-				foreach (XamlMemberNode memberNode in obj.Children.OfType<XamlMemberNode>()) {
-					if (memberNode.Member == XamlLanguage.ConnectionId && memberNode.Children.Single() is XamlValueNode) {
-						var value = memberNode.Children.Single() as XamlValueNode;
-						int id;
-						if (value.Value is string && int.TryParse(value.Value as string, out id) && eventMappings.ContainsKey(id)) {
-							var map = eventMappings[id];
-							foreach (var entry in map) {
-								if (entry.IsAttached) {
-									var type = context.GetXamlType(Type.GetType(entry.AttachSourceType));
-									var member = new XamlMemberNode(new XamlMember(entry.EventName, type, true));
-									member.Children.Add(new XamlValueNode(entry.MethodName));
-									addableNodes.Add(member);
-								} else {
-									var member = new XamlMemberNode(obj.Type.GetMember(entry.EventName));
-									member.Children.Add(new XamlValueNode(entry.MethodName));
-									addableNodes.Add(member);
-								}
-							}
-							removableNodes.Add(memberNode);
-						}
-					}
-				}
-				foreach (var rnode in removableNodes)
-					node.Children.Remove(rnode);
-				node.Children.InsertRange(node.Children.Count > 1 ? node.Children.Count - 1 : 0, addableNodes);
-			}
-		}
-		
-		/// <summary>
-		/// Changes all references from oldNamespace to newNamespace in the document.
-		/// </summary>
-		void ChangeXmlNamespace(XDocument doc, XNamespace oldNamespace, XNamespace newNamespace)
-		{
-			foreach (XElement e in doc.Descendants()) {
-				if (e.Name.Namespace == oldNamespace)
-					e.Name = newNamespace + e.Name.LocalName;
-			}
-		}
-	}
-	
-	[Export(typeof(IResourceNodeFactory))]
-	sealed class BamlResourceNodeFactory : IResourceNodeFactory
-	{
-		public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
-		{
-			return null;
-		}
-		
-		public ILSpyTreeNode CreateNode(string key, Stream data)
-		{
-			if (key.EndsWith(".baml", StringComparison.OrdinalIgnoreCase))
-				return new BamlResourceEntryNode(key, data);
-			else
-				return null;
-		}
-	}
-	
-	sealed class BamlResourceEntryNode : ResourceEntryNode
-	{
-		public BamlResourceEntryNode(string key, Stream data) : base(key, data)
-		{
-		}
-		
-		internal override bool View(DecompilerTextView textView)
-		{
-			AvalonEditTextOutput output = new AvalonEditTextOutput();
-			IHighlightingDefinition highlighting = null;
-			
-			textView.RunWithCancellation(
-				token => Task.Factory.StartNew(
-					() => {
-						try {
-							if (LoadBaml(output))
-								highlighting = HighlightingManager.Instance.GetDefinitionByExtension(".xml");
-						} catch (Exception ex) {
-							output.Write(ex.ToString());
-						}
-						return output;
-					}),
-				t => textView.ShowNode(t.Result, this, highlighting)
-			);
-			return true;
-		}
-		
-		bool LoadBaml(AvalonEditTextOutput output)
-		{
-			var asm = this.Ancestors().OfType<AssemblyTreeNode>().FirstOrDefault().LoadedAssembly;
-			
-			AppDomain bamlDecompilerAppDomain = null;
-			try {
-				BamlDecompiler decompiler = CreateBamlDecompilerInAppDomain(ref bamlDecompilerAppDomain, asm.FileName);
-				
-				MemoryStream bamlStream = new MemoryStream();
-				Data.Position = 0;
-				Data.CopyTo(bamlStream);
-				
-				output.Write(decompiler.DecompileBaml(bamlStream, asm.FileName, new ConnectMethodDecompiler(asm), new AssemblyResolver(asm)));
-				return true;
-			} finally {
-				if (bamlDecompilerAppDomain != null)
-					AppDomain.Unload(bamlDecompilerAppDomain);
-			}
-		}
-		
-		public static BamlDecompiler CreateBamlDecompilerInAppDomain(ref AppDomain appDomain, string assemblyFileName)
-		{
-			if (appDomain == null) {
-				// Construct and initialize settings for a second AppDomain.
-				AppDomainSetup bamlDecompilerAppDomainSetup = new AppDomainSetup();
-//				bamlDecompilerAppDomainSetup.ApplicationBase = "file:///" + Path.GetDirectoryName(assemblyFileName);
-				bamlDecompilerAppDomainSetup.DisallowBindingRedirects = false;
-				bamlDecompilerAppDomainSetup.DisallowCodeDownload = true;
-				bamlDecompilerAppDomainSetup.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
-
-				// Create the second AppDomain.
-				appDomain = AppDomain.CreateDomain("BamlDecompiler AD", null, bamlDecompilerAppDomainSetup);
-			}
-			return (BamlDecompiler)appDomain.CreateInstanceAndUnwrap(typeof(BamlDecompiler).Assembly.FullName, typeof(BamlDecompiler).FullName);
-		}
-	}
-}

ILSpy/CSharpLanguage.cs

@@ -437,17 +437,18 @@ namespace ICSharpCode.ILSpy
 								if (fileName.EndsWith(".baml", StringComparison.OrdinalIgnoreCase)) {
 									MemoryStream ms = new MemoryStream();
 									entryStream.CopyTo(ms);
-									var decompiler = Baml.BamlResourceEntryNode.CreateBamlDecompilerInAppDomain(ref bamlDecompilerAppDomain, assembly.FileName);
-									string xaml = null;
-									try {
-										xaml = decompiler.DecompileBaml(ms, assembly.FileName, new ConnectMethodDecompiler(assembly), new AssemblyResolver(assembly));
-									}
-									catch (XamlXmlWriterException) { } // ignore XAML writer exceptions
-									if (xaml != null) {
-										File.WriteAllText(Path.Combine(options.SaveAsProjectDirectory, Path.ChangeExtension(fileName, ".xaml")), xaml);
-										yield return Tuple.Create("Page", Path.ChangeExtension(fileName, ".xaml"));
-										continue;
-									}
+									// TODO implement extension point
+//									var decompiler = Baml.BamlResourceEntryNode.CreateBamlDecompilerInAppDomain(ref bamlDecompilerAppDomain, assembly.FileName);
+//									string xaml = null;
+//									try {
+//										xaml = decompiler.DecompileBaml(ms, assembly.FileName, new ConnectMethodDecompiler(assembly), new AssemblyResolver(assembly));
+//									}
+//									catch (XamlXmlWriterException) { } // ignore XAML writer exceptions
+//									if (xaml != null) {
+//										File.WriteAllText(Path.Combine(options.SaveAsProjectDirectory, Path.ChangeExtension(fileName, ".xaml")), xaml);
+//										yield return Tuple.Create("Page", Path.ChangeExtension(fileName, ".xaml"));
+//										continue;
+//									}
 								}
 								using (FileStream fs = new FileStream(Path.Combine(options.SaveAsProjectDirectory, fileName), FileMode.Create, FileAccess.Write)) {
 									entryStream.CopyTo(fs);
@@ -508,6 +509,12 @@ namespace ICSharpCode.ILSpy
 			ConvertTypeOptions options = ConvertTypeOptions.IncludeTypeParameterDefinitions;
 			if (includeNamespace)
 				options |= ConvertTypeOptions.IncludeNamespace;
+
+			return TypeToString(options, type, typeAttributes);
+		}
+
+		string TypeToString(ConvertTypeOptions options, TypeReference type, ICustomAttributeProvider typeAttributes = null)
+		{
 			AstType astType = AstBuilder.ConvertType(type, typeAttributes, options);
 
 			StringWriter w = new StringWriter();
@@ -556,6 +563,14 @@ namespace ICSharpCode.ILSpy
 			} else
 				return property.Name;
 		}
+		
+		public override string FormatTypeName(TypeDefinition type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			
+			return TypeToString(ConvertTypeOptions.DoNotUsePrimitiveTypeNames | ConvertTypeOptions.IncludeTypeParameterDefinitions, type);
+		}
 
 		public override bool ShowMember(MemberReference member)
 		{

ILSpy/ILSpy.csproj

@@ -93,7 +93,6 @@
     </Compile>
     <Compile Include="AssemblyList.cs" />
     <Compile Include="AssemblyListManager.cs" />
-    <Compile Include="BamlDecompiler.cs" />
     <Compile Include="CommandLineArguments.cs" />
     <Compile Include="Commands.cs" />
     <Compile Include="ConnectMethodDecompiler.cs" />

ILSpy/Language.cs

@@ -127,6 +127,13 @@ namespace ICSharpCode.ILSpy
 				throw new ArgumentNullException("property");
 			return property.Name;
 		}
+		
+		public virtual string FormatTypeName(TypeDefinition type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			return type.Name;
+		}
 
 		/// <summary>
 		/// Used for WPF keyboard navigation.

ILSpy/TreeNodes/ILSpyTreeNode.cs

@@ -69,7 +69,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		/// This method is called on the main thread when only a single item is selected.
 		/// If it returns false, normal decompilation is used to view the item.
 		/// </summary>
-		internal virtual bool View(TextView.DecompilerTextView textView)
+		public virtual bool View(TextView.DecompilerTextView textView)
 		{
 			return false;
 		}

ILSpy/TreeNodes/ResourceEntryNode.cs

@@ -132,7 +132,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			get { return Images.ResourceImage; }
 		}
 
-		internal override bool View(DecompilerTextView textView)
+		public override bool View(DecompilerTextView textView)
 		{
 			try {
 				AvalonEditTextOutput output = new AvalonEditTextOutput();

ILSpy/TreeNodes/ResourceTreeNode.cs

@@ -78,7 +78,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 		}
 		
-		internal override bool View(DecompilerTextView textView)
+		public override bool View(DecompilerTextView textView)
 		{
 			EmbeddedResource er = r as EmbeddedResource;
 			if (er != null) {

ILSpy/TreeNodes/TypeTreeNode.cs

@@ -59,7 +59,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Text {
-			get { return HighlightSearchMatch(this.Language.TypeToString(type, includeNamespace: false)); }
+			get { return HighlightSearchMatch(this.Language.FormatTypeName(type)); }
 		}
 		
 		public bool IsPublicAPI {

ILSpy/TreeNodes/XamlResourceNode.cs

@@ -52,7 +52,7 @@ namespace ICSharpCode.ILSpy.Xaml
 		{
 		}
 		
-		internal override bool View(DecompilerTextView textView)
+		public override bool View(DecompilerTextView textView)
 		{
 			AvalonEditTextOutput output = new AvalonEditTextOutput();
 			IHighlightingDefinition highlighting = null;

TestPlugin/TestPlugin.csproj

@@ -29,7 +29,7 @@
     <Optimize>False</Optimize>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <StartAction>Program</StartAction>
+    <StartAction>Project</StartAction>
     <StartProgram>bin\Debug\ILSpy.exe</StartProgram>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

doc/MS-PL.txt

@@ -0,0 +1,31 @@
+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.