feature: Support Inlines, sync XamlX, use Avalonia 11 (#106)

* feature: Support Inlines, sync XamlX, use Avalonia 11 * chore: Bump version * chore: Update docs
3 years ago · 59056ab95a
38 changed files with 147 additions and 136 deletions
--- a/README.md
+++ b/README.md
@ -171,15 +171,15 @@ namespace Sample.App
            } 
 #endif

-            UserNameTextBox = this.FindControl<global::Avalonia.NameGenerator.Sandbox.Controls.CustomTextBox>("UserNameTextBox");
-            UserNameValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("UserNameValidation");
-            PasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-            PasswordValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("PasswordValidation");
-            AwesomeListView = this.FindControl<global::Avalonia.Controls.ListBox>("AwesomeListView");
-            ConfirmPasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
-            ConfirmPasswordValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
-            SignUpButton = this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
-            CompoundValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("CompoundValidation");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.NameGenerator.Sandbox.Controls.CustomTextBox>("UserNameTextBox");
+            UserNameValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("UserNameValidation");
+            PasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+            PasswordValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("PasswordValidation");
+            AwesomeListView = this.FindNameScope()?.Find<global::Avalonia.Controls.ListBox>("AwesomeListView");
+            ConfirmPasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
+            ConfirmPasswordValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
+            SignUpButton = this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
+            CompoundValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("CompoundValidation");
        }
    }
 }
@ -196,14 +196,14 @@ namespace Avalonia.NameGenerator.Sandbox.Views
 {
    partial class SignUpView
    {
-        internal global::Avalonia.NameGenerator.Sandbox.Controls.CustomTextBox UserNameTextBox => this.FindControl<global::Avalonia.NameGenerator.Sandbox.Controls.CustomTextBox>("UserNameTextBox");
-        public global::Avalonia.Controls.TextBlock UserNameValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("UserNameValidation");
-        private global::Avalonia.Controls.TextBox PasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-        internal global::Avalonia.Controls.TextBlock PasswordValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("PasswordValidation");
-        internal global::Avalonia.Controls.TextBox ConfirmPasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
-        internal global::Avalonia.Controls.TextBlock ConfirmPasswordValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
-        internal global::Avalonia.Controls.Button SignUpButton => this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
-        internal global::Avalonia.Controls.TextBlock CompoundValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("CompoundValidation");
+        internal global::Avalonia.NameGenerator.Sandbox.Controls.CustomTextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.NameGenerator.Sandbox.Controls.CustomTextBox>("UserNameTextBox");
+        public global::Avalonia.Controls.TextBlock UserNameValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("UserNameValidation");
+        private global::Avalonia.Controls.TextBox PasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+        internal global::Avalonia.Controls.TextBlock PasswordValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("PasswordValidation");
+        internal global::Avalonia.Controls.TextBox ConfirmPasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
+        internal global::Avalonia.Controls.TextBlock ConfirmPasswordValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
+        internal global::Avalonia.Controls.Button SignUpButton => this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
+        internal global::Avalonia.Controls.TextBlock CompoundValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("CompoundValidation");
    }
 }
 ```
--- a/external/XamlX
+++ b/external/XamlX
@ -1 +1 @@
-Subproject commit 5420df861ce6f2be5ead9efa078fe7242ce88f18
+Subproject commit 5e498f8bcca403a34aff5efc825cbb4e12b7fa8e
--- a/src/Avalonia.NameGenerator.Sandbox/App.xaml
+++ b/src/Avalonia.NameGenerator.Sandbox/App.xaml
@ -2,6 +2,6 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             x:Class="Avalonia.NameGenerator.Sandbox.App">
    <Application.Styles>
-        <FluentTheme Mode="Dark" />
+        <FluentTheme />
    </Application.Styles>
 </Application>
--- a/src/Avalonia.NameGenerator.Sandbox/Avalonia.NameGenerator.Sandbox.csproj
+++ b/src/Avalonia.NameGenerator.Sandbox/Avalonia.NameGenerator.Sandbox.csproj
@ -7,12 +7,7 @@
        <InstallAvalonia>true</InstallAvalonia>
    </PropertyGroup>
    <ItemGroup>
-        <Compile Update="**\*.xaml.cs">
-            <DependentUpon>%(Filename)</DependentUpon>
-        </Compile>
-        <EmbeddedResource Include="**\*.xaml">
-            <SubType>Designer</SubType>
-        </EmbeddedResource>
+        <AvaloniaResource Include="**\*.xaml" />
        <!-- Note this AdditionalFiles directive. -->
        <AdditionalFiles Include="**\*.xaml" />
    </ItemGroup>
--- a/src/Avalonia.NameGenerator.Sandbox/Controls/SignUpView.xaml
+++ b/src/Avalonia.NameGenerator.Sandbox/Controls/SignUpView.xaml
@ -27,6 +27,13 @@
                   TextWrapping="Wrap"
                   Foreground="Red"
                   FontSize="12" />
+        <TextBlock>
+            <TextBlock.Inlines>
+                <InlineCollection>
+                    <Run x:Name="SignUpButtonDescription" />
+                </InlineCollection>
+            </TextBlock.Inlines>
+        </TextBlock>
        <Button Margin="0 10 0 5"
                Content="Sign up"
                x:Name="SignUpButton" />
--- a/src/Avalonia.NameGenerator.Sandbox/Controls/SignUpView.xaml.cs
+++ b/src/Avalonia.NameGenerator.Sandbox/Controls/SignUpView.xaml.cs
@ -48,6 +48,7 @@ public partial class SignUpView : ReactiveUserControl<SignUpViewModel>
            UserNameTextBox.Text = "Joseph!";
            PasswordTextBox.Text = "1234";
            ConfirmPasswordTextBox.Text = "1234";
+            SignUpButtonDescription.Text = "Press the button below to sign up.";
        });
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt
@ -22,7 +22,7 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt
@ -30,7 +30,7 @@ namespace Sample.App
            }
 #endif

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt
@ -22,7 +22,7 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt
@ -24,9 +24,9 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            ClrNamespaceRoutedViewHost = this.FindControl<global::Avalonia.ReactiveUI.RoutedViewHost>("ClrNamespaceRoutedViewHost");
-            UriRoutedViewHost = this.FindControl<global::Avalonia.ReactiveUI.RoutedViewHost>("UriRoutedViewHost");
-            UserNameTextBox = this.FindControl<global::Controls.CustomTextBox>("UserNameTextBox");
+            ClrNamespaceRoutedViewHost = this.FindNameScope()?.Find<global::Avalonia.ReactiveUI.RoutedViewHost>("ClrNamespaceRoutedViewHost");
+            UriRoutedViewHost = this.FindNameScope()?.Find<global::Avalonia.ReactiveUI.RoutedViewHost>("UriRoutedViewHost");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Controls.CustomTextBox>("UserNameTextBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt
@ -23,8 +23,8 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
-            NamedListBox = this.FindControl<global::Avalonia.Controls.ListBox>("NamedListBox");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            NamedListBox = this.FindNameScope()?.Find<global::Avalonia.Controls.ListBox>("NamedListBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt
@ -27,12 +27,12 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            FirstNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("FirstNameTextBox");
-            LastNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("LastNameTextBox");
-            PasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-            ConfirmPasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
-            SignUpButton = this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
-            RegisterButton = this.FindControl<global::Avalonia.Controls.Button>("RegisterButton");
+            FirstNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("FirstNameTextBox");
+            LastNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("LastNameTextBox");
+            PasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+            ConfirmPasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
+            SignUpButton = this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
+            RegisterButton = this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("RegisterButton");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt
@ -22,7 +22,7 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt
@ -24,9 +24,9 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
-            PasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-            SignUpButton = this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            PasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+            SignUpButton = this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt
@ -15,6 +15,7 @@ namespace Sample.App
        internal global::Avalonia.Controls.ListBox AwesomeListView;
        internal global::Avalonia.Controls.TextBox ConfirmPasswordTextBox;
        internal global::Avalonia.Controls.TextBlock ConfirmPasswordValidation;
+        internal global::Avalonia.Controls.Documents.Run SignUpButtonDescription;
        internal global::Avalonia.Controls.Button SignUpButton;
        internal global::Avalonia.Controls.TextBlock CompoundValidation;

@ -30,15 +31,16 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Controls.CustomTextBox>("UserNameTextBox");
-            UserNameValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("UserNameValidation");
-            PasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-            PasswordValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("PasswordValidation");
-            AwesomeListView = this.FindControl<global::Avalonia.Controls.ListBox>("AwesomeListView");
-            ConfirmPasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
-            ConfirmPasswordValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
-            SignUpButton = this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
-            CompoundValidation = this.FindControl<global::Avalonia.Controls.TextBlock>("CompoundValidation");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Controls.CustomTextBox>("UserNameTextBox");
+            UserNameValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("UserNameValidation");
+            PasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+            PasswordValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("PasswordValidation");
+            AwesomeListView = this.FindNameScope()?.Find<global::Avalonia.Controls.ListBox>("AwesomeListView");
+            ConfirmPasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
+            ConfirmPasswordValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
+            SignUpButtonDescription = this.FindNameScope()?.Find<global::Avalonia.Controls.Documents.Run>("SignUpButtonDescription");
+            SignUpButton = this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
+            CompoundValidation = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("CompoundValidation");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt
@ -22,7 +22,7 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt
@ -24,9 +24,9 @@ namespace Sample.App
                AvaloniaXamlLoader.Load(this);
            }

-            UserNameTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
-            PasswordTextBox = this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-            SignUpButton = this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
+            UserNameTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+            PasswordTextBox = this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+            SignUpButton = this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
        }
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/AttachedProps.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/AttachedProps.txt
@ -6,6 +6,6 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/ControlWithoutWindow.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/ControlWithoutWindow.txt
@ -6,6 +6,6 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/CustomControls.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/CustomControls.txt
@ -6,8 +6,8 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.ReactiveUI.RoutedViewHost ClrNamespaceRoutedViewHost => this.FindControl<global::Avalonia.ReactiveUI.RoutedViewHost>("ClrNamespaceRoutedViewHost");
-        internal global::Avalonia.ReactiveUI.RoutedViewHost UriRoutedViewHost => this.FindControl<global::Avalonia.ReactiveUI.RoutedViewHost>("UriRoutedViewHost");
-        internal global::Controls.CustomTextBox UserNameTextBox => this.FindControl<global::Controls.CustomTextBox>("UserNameTextBox");
+        internal global::Avalonia.ReactiveUI.RoutedViewHost ClrNamespaceRoutedViewHost => this.FindNameScope()?.Find<global::Avalonia.ReactiveUI.RoutedViewHost>("ClrNamespaceRoutedViewHost");
+        internal global::Avalonia.ReactiveUI.RoutedViewHost UriRoutedViewHost => this.FindNameScope()?.Find<global::Avalonia.ReactiveUI.RoutedViewHost>("UriRoutedViewHost");
+        internal global::Controls.CustomTextBox UserNameTextBox => this.FindNameScope()?.Find<global::Controls.CustomTextBox>("UserNameTextBox");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/DataTemplates.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/DataTemplates.txt
@ -6,7 +6,7 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
-        internal global::Avalonia.Controls.ListBox NamedListBox => this.FindControl<global::Avalonia.Controls.ListBox>("NamedListBox");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.ListBox NamedListBox => this.FindNameScope()?.Find<global::Avalonia.Controls.ListBox>("NamedListBox");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/FieldModifier.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/FieldModifier.txt
@ -6,11 +6,11 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        public global::Avalonia.Controls.TextBox FirstNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("FirstNameTextBox");
-        public global::Avalonia.Controls.TextBox LastNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("LastNameTextBox");
-        protected global::Avalonia.Controls.TextBox PasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-        private global::Avalonia.Controls.TextBox ConfirmPasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
-        internal global::Avalonia.Controls.Button SignUpButton => this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
-        internal global::Avalonia.Controls.Button RegisterButton => this.FindControl<global::Avalonia.Controls.Button>("RegisterButton");
+        public global::Avalonia.Controls.TextBox FirstNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("FirstNameTextBox");
+        public global::Avalonia.Controls.TextBox LastNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("LastNameTextBox");
+        protected global::Avalonia.Controls.TextBox PasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+        private global::Avalonia.Controls.TextBox ConfirmPasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
+        internal global::Avalonia.Controls.Button SignUpButton => this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
+        internal global::Avalonia.Controls.Button RegisterButton => this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("RegisterButton");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControl.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControl.txt
@ -6,6 +6,6 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControls.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControls.txt
@ -6,8 +6,8 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
-        internal global::Avalonia.Controls.TextBox PasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-        internal global::Avalonia.Controls.Button SignUpButton => this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBox PasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+        internal global::Avalonia.Controls.Button SignUpButton => this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/SignUpView.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/SignUpView.txt
@ -6,14 +6,15 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Controls.CustomTextBox UserNameTextBox => this.FindControl<global::Controls.CustomTextBox>("UserNameTextBox");
-        internal global::Avalonia.Controls.TextBlock UserNameValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("UserNameValidation");
-        internal global::Avalonia.Controls.TextBox PasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-        internal global::Avalonia.Controls.TextBlock PasswordValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("PasswordValidation");
-        internal global::Avalonia.Controls.ListBox AwesomeListView => this.FindControl<global::Avalonia.Controls.ListBox>("AwesomeListView");
-        internal global::Avalonia.Controls.TextBox ConfirmPasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
-        internal global::Avalonia.Controls.TextBlock ConfirmPasswordValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
-        internal global::Avalonia.Controls.Button SignUpButton => this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
-        internal global::Avalonia.Controls.TextBlock CompoundValidation => this.FindControl<global::Avalonia.Controls.TextBlock>("CompoundValidation");
+        internal global::Controls.CustomTextBox UserNameTextBox => this.FindNameScope()?.Find<global::Controls.CustomTextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBlock UserNameValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("UserNameValidation");
+        internal global::Avalonia.Controls.TextBox PasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+        internal global::Avalonia.Controls.TextBlock PasswordValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("PasswordValidation");
+        internal global::Avalonia.Controls.ListBox AwesomeListView => this.FindNameScope()?.Find<global::Avalonia.Controls.ListBox>("AwesomeListView");
+        internal global::Avalonia.Controls.TextBox ConfirmPasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("ConfirmPasswordTextBox");
+        internal global::Avalonia.Controls.TextBlock ConfirmPasswordValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("ConfirmPasswordValidation");
+        internal global::Avalonia.Controls.Documents.Run SignUpButtonDescription => this.FindNameScope()?.Find<global::Avalonia.Controls.Documents.Run>("SignUpButtonDescription");
+        internal global::Avalonia.Controls.Button SignUpButton => this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
+        internal global::Avalonia.Controls.TextBlock CompoundValidation => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBlock>("CompoundValidation");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControl.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControl.txt
@ -6,6 +6,6 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControls.txt
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControls.txt
@ -6,8 +6,8 @@ namespace Sample.App
 {
    partial class SampleView
    {
-        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("UserNameTextBox");
-        internal global::Avalonia.Controls.TextBox PasswordTextBox => this.FindControl<global::Avalonia.Controls.TextBox>("PasswordTextBox");
-        internal global::Avalonia.Controls.Button SignUpButton => this.FindControl<global::Avalonia.Controls.Button>("SignUpButton");
+        internal global::Avalonia.Controls.TextBox UserNameTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("UserNameTextBox");
+        internal global::Avalonia.Controls.TextBox PasswordTextBox => this.FindNameScope()?.Find<global::Avalonia.Controls.TextBox>("PasswordTextBox");
+        internal global::Avalonia.Controls.Button SignUpButton => this.FindNameScope()?.Find<global::Avalonia.Controls.Button>("SignUpButton");
    }
 }
--- a/src/Avalonia.NameGenerator.Tests/Views/SignUpView.xml
+++ b/src/Avalonia.NameGenerator.Tests/Views/SignUpView.xml
@ -34,6 +34,13 @@
                   TextWrapping="Wrap"
                   Foreground="Red"
                   FontSize="12" />
+        <TextBlock>
+            <TextBlock.Inlines>
+                <InlineCollection>
+                    <Run x:Name="SignUpButtonDescription" />
+                </InlineCollection>
+            </TextBlock.Inlines>
+        </TextBlock>
        <Button Margin="0 10 0 5"
                Content="Sign up"
                x:Name="SignUpButton" />
--- a/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
+++ b/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
@ -108,7 +108,7 @@ public class XamlXNameResolverTests
        var controls = ResolveNames(xaml);

        Assert.NotEmpty(controls);
-        Assert.Equal(9, controls.Count);
+        Assert.Equal(10, controls.Count);
        Assert.Equal("UserNameTextBox", controls[0].Name);
        Assert.Equal("UserNameValidation", controls[1].Name);
        Assert.Equal("PasswordTextBox", controls[2].Name);
@ -116,8 +116,9 @@ public class XamlXNameResolverTests
        Assert.Equal("AwesomeListView", controls[4].Name);
        Assert.Equal("ConfirmPasswordTextBox", controls[5].Name);
        Assert.Equal("ConfirmPasswordValidation", controls[6].Name);
-        Assert.Equal("SignUpButton", controls[7].Name);
-        Assert.Equal("CompoundValidation", controls[8].Name);
+        Assert.Equal("SignUpButtonDescription", controls[7].Name);
+        Assert.Equal("SignUpButton", controls[8].Name);
+        Assert.Equal("CompoundValidation", controls[9].Name);
    }

    private static IReadOnlyList<ResolvedName> ResolveNames(string xaml)
--- a/src/Avalonia.NameGenerator/Compiler/MiniCompiler.cs
+++ b/src/Avalonia.NameGenerator/Compiler/MiniCompiler.cs
@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using XamlX.Compiler;
 using XamlX.Emit;
 using XamlX.Transform;
@ -19,7 +21,7 @@ internal sealed class MiniCompiler : XamlCompiler<object, IXamlEmitResult>

        var configuration = new TransformerConfiguration(
            typeSystem,
-            typeSystem.Assemblies[0],
+            typeSystem.Assemblies.First(),
            mappings);
        return new MiniCompiler(configuration);
    }
@ -37,8 +39,12 @@ internal sealed class MiniCompiler : XamlCompiler<object, IXamlEmitResult>

    protected override XamlEmitContext<object, IXamlEmitResult> InitCodeGen(
        IFileSource file,
-        Func<string, IXamlType, IXamlTypeBuilder<object>> createSubType,
-        object codeGen, XamlRuntimeContext<object, IXamlEmitResult> context,
+        Func<string, IXamlType,
+        IXamlTypeBuilder<object>> createSubType,
+        Func<string, IXamlType, IEnumerable<IXamlType>,
+        IXamlTypeBuilder<object>> createDelegateType,
+        object codeGen,
+        XamlRuntimeContext<object, IXamlEmitResult> context,
        bool needContextLocal) =>
        throw new NotSupportedException();
 }
--- a/src/Avalonia.NameGenerator/Compiler/RoslynTypeSystem.cs
+++ b/src/Avalonia.NameGenerator/Compiler/RoslynTypeSystem.cs
@ -25,7 +25,7 @@ public class RoslynTypeSystem : IXamlTypeSystem
        _assemblies.AddRange(assemblySymbols);
    }

-    public IReadOnlyList<IXamlAssembly> Assemblies => _assemblies;
+    public IEnumerable<IXamlAssembly> Assemblies => _assemblies;

    public IXamlAssembly FindAssembly(string name) =>
        Assemblies
--- a/src/Avalonia.NameGenerator/Generator/InitializeComponentCodeGenerator.cs
+++ b/src/Avalonia.NameGenerator/Generator/InitializeComponentCodeGenerator.cs
@ -34,7 +34,7 @@ internal class InitializeComponentCodeGenerator: ICodeGenerator
        {
            var (typeName, name, fieldModifier) = resolvedName;
            properties.Add($"        {fieldModifier} {typeName} {name};");
-            initializations.Add($"            {name} = this.FindControl<{typeName}>(\"{name}\");");
+            initializations.Add($"            {name} = this.FindNameScope()?.Find<{typeName}>(\"{name}\");");
        }

        var attachDevTools = _diagnosticsAreConnected && IsWindow(xamlType);
--- a/src/Avalonia.NameGenerator/Generator/OnlyPropertiesCodeGenerator.cs
+++ b/src/Avalonia.NameGenerator/Generator/OnlyPropertiesCodeGenerator.cs
@ -12,7 +12,7 @@ internal class OnlyPropertiesCodeGenerator : ICodeGenerator
        var namedControls = names
            .Select(info => "        " +
                            $"{info.FieldModifier} {info.TypeName} {info.Name} => " +
-                            $"this.FindControl<{info.TypeName}>(\"{info.Name}\");")
+                            $"this.FindNameScope()?.Find<{info.TypeName}>(\"{info.Name}\");")
            .ToList();
        var lines = string.Join("\n", namedControls);
        return $@"// <auto-generated />
--- a/src/Avalonia.NameGenerator/Generator/ResolverExtensions.cs
+++ b/src/Avalonia.NameGenerator/Generator/ResolverExtensions.cs
@ -1,33 +1,25 @@
-using System.Linq;
-using XamlX.TypeSystem;
-
-namespace Avalonia.NameGenerator.Generator;
-
-internal static class ResolverExtensions
-{
-	public static bool IsAvaloniaControl(this IXamlType clrType)
-	{
-		return clrType.HasControlBaseType() || clrType.HasIControlInterface();
-	}
-
-	private static bool HasControlBaseType(this IXamlType clrType)
-	{
-		// Check for the base type since IControl interface is removed.
-		// https://github.com/AvaloniaUI/Avalonia/pull/9553
-		if (clrType.FullName == "Avalonia.Controls.Control")
-			return true;
-
-		if (clrType.BaseType != null)
-			return IsAvaloniaControl(clrType.BaseType);
-
-		return false;
-	}
-
-	private static bool HasIControlInterface(this IXamlType clrType)
-	{
-		return clrType
-			.Interfaces
-			.Any(abstraction => abstraction.IsInterface &&
-			                    abstraction.FullName == "Avalonia.Controls.IControl");
-	}
+using System.Linq;
+using XamlX.TypeSystem;
+
+namespace Avalonia.NameGenerator.Generator;
+
+internal static class ResolverExtensions
+{
+    public static bool IsAvaloniaStyledElement(this IXamlType clrType) =>
+        clrType.HasStyledElementBaseType() ||
+        clrType.HasIStyledElementInterface();
+
+    private static bool HasStyledElementBaseType(this IXamlType clrType)
+    {
+        // Check for the base type since IStyledElement interface is removed.
+        // https://github.com/AvaloniaUI/Avalonia/pull/9553
+        if (clrType.FullName == "Avalonia.StyledElement")
+            return true;
+        return clrType.BaseType != null && IsAvaloniaStyledElement(clrType.BaseType);
+    }
+
+    private static bool HasIStyledElementInterface(this IXamlType clrType) =>
+        clrType.Interfaces.Any(abstraction =>
+            abstraction.IsInterface &&
+            abstraction.FullName == "Avalonia.IStyledElement");
 }
--- a/src/Avalonia.NameGenerator/Generator/XamlXNameResolver.cs
+++ b/src/Avalonia.NameGenerator/Generator/XamlXNameResolver.cs
@ -31,8 +31,7 @@ internal class XamlXNameResolver : INameResolver, IXamlAstVisitor
            return node;

        var clrType = objectNode.Type.GetClrType();
-
-        if (!clrType.IsAvaloniaControl())
+        if (!clrType.IsAvaloniaStyledElement())
            return node;

        foreach (var child in objectNode.Children)
--- a/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
+++ b/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
@ -63,8 +63,7 @@ internal class XamlXViewResolver : IViewResolver, IXamlAstVisitor
            return node;

        var clrType = objectNode.Type.GetClrType();
-
-        if (!clrType.IsAvaloniaControl())
+        if (!clrType.IsAvaloniaStyledElement())
            return node;

        foreach (var child in objectNode.Children)
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -18,10 +18,11 @@
        <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
    </ItemGroup>
    <ItemGroup Condition="'$(InstallAvalonia)' == 'true'">
-        <PackageReference Include="Avalonia" Version="0.10.999-cibuild0012810-beta" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0012810-beta" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012810-beta" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012810-beta" />
+        <PackageReference Include="Avalonia" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview5" />
    </ItemGroup>
    <ItemGroup>
        <None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
--- a/version.json
+++ b/version.json
@ -1,6 +1,6 @@
 {
  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.5",
+  "version": "1.6",
  "assemblyVersion": {
    "precision": "revision"
  },