From 6820d019d947870699346f78a0ace186d551cf97 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Mon, 25 Jul 2022 11:12:40 +0200
Subject: [PATCH] Fix merge

---
 .../Transformers/AvaloniaXamlIlSetterTransformer.cs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
index d6251badd5..ddfba5eab2 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -27,18 +27,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 
             if (styleParent != null)
             {
-                var selectorProperty = styleParent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                    .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Selector");
-
-                if (selectorProperty == null)
-                    throw new XamlParseException(
-                        "Can not find parent Style Selector", node);
-
-                var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-
-                targetType = selector?.TargetType
+                targetType = styleParent.TargetType.GetClrType()
                              ?? throw new XamlParseException("Can not resolve parent Style Selector type", node);
-                lineInfo = selector;
+                lineInfo = on;
             }
             else
             {