From b0ec01de8065ed5fd38def776d10bccd3245a255 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 19 Apr 2022 13:19:43 +0200
Subject: [PATCH] Fix #2610: Explicitly qualify members in TemplateBindings.

At a later point, we can add some more logic that tries to infer the target type of the binding and applies simplification accordingly.
---
 ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml          | 2 +-
 .../Handlers/Records/PropertyWithExtensionHandler.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml b/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml
index 31d456472..9fa0840bd 100644
--- a/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml
+++ b/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml
@@ -21,7 +21,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ad:Resizer}">
-					<Border Background="{TemplateBinding Background}" />
+					<Border Background="{TemplateBinding Control.Background}" />
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs b/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs
index 284b4a881..66da03452 100644
--- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs
+++ b/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs
@@ -59,7 +59,7 @@ namespace ILSpy.BamlDecompiler.Handlers
 				var value = ctx.ResolveProperty(record.ValueId);
 
 				value.DeclaringType.ResolveNamespace(parent.Xaml, ctx);
-				var xName = value.ToXName(ctx, parent.Xaml, false);
+				var xName = value.ToXName(ctx, parent.Xaml, true);
 
 				ext.Initializer = new object[] { ctx.ToString(parent.Xaml, xName) };
 			}