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

* feature: Support Inlines, sync XamlX, use Avalonia 11 * chore: Bump version * chore: Update docs
AvaloniaUI · Feb 19, 2023 · 59056ab · 59056ab
1 parent 4ecf3d6
commit 59056ab
Show file tree

Hide file tree

Showing 38 changed files with 147 additions and 136 deletions.
diff --git 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");
     }
 }
 ```
diff --git a/external/XamlX b/external/XamlX
diff --git 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>
diff --git 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>

diff --git 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" />

diff --git a/src/Avalonia.NameGenerator.Sandbox/Controls/SignUpView.xaml.cs b/src/Avalonia.NameGenerator.Sandbox/Controls/SignUpView.xaml.cs
@@ -48,6 +48,7 @@ public SignUpView()
             UserNameTextBox.Text = "Joseph!";
             PasswordTextBox.Text = "1234";
             ConfirmPasswordTextBox.Text = "1234";
+            SignUpButtonDescription.Text = "Press the button below to sign up.";
         });
     }
 }
diff --git a/...ia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt b/...ia.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");
         }
     }
 }
diff --git a/...ator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt b/...ator.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");
         }
     }
 }
diff --git a/...Generator.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt b/...Generator.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");
         }
     }
 }
diff --git a/...a.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt b/...a.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");
         }
     }
 }
diff --git a/...ia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt b/...ia.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");
         }
     }
 }
diff --git a/...ia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt b/...ia.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");
         }
     }
 }
diff --git a/...nia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt b/...nia.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");
         }
     }
 }
diff --git a/...ia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt b/...ia.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");
         }
     }
 }
diff --git a/...lonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt b/...lonia.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");
         }
     }
 }
diff --git a/...ia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt b/...ia.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");
         }
     }
 }
diff --git a/...a.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt b/...a.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");
         }
     }
 }
diff --git 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");
     }
 }
diff --git 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");
     }
 }
diff --git 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");
     }
 }
diff --git 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");
     }
 }
diff --git 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");
     }
 }
diff --git 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");
     }
 }
+10 −0		Directory.Build.props
+0 −7		XamlX.sln
+61 −0		azure-pipelines.yml
+2 −2		src/Benchmarks/Benchmarks.csproj
+1 −1		src/BenchmarksCompiler/BenchmarksCompiler.csproj
+2 −0		src/XamlX.IL.Cecil/CecilCustomAttribute.cs
+19 −6		src/XamlX.IL.Cecil/CecilEmitter.cs
+4 −2		src/XamlX.IL.Cecil/CecilField.cs
+8 −0		src/XamlX.IL.Cecil/CecilHelpers.cs
+3 −0		src/XamlX.IL.Cecil/CecilMethod.cs
+3 −4		src/XamlX.IL.Cecil/CecilType.cs
+30 −0		src/XamlX.IL.Cecil/CecilTypeBuilder.cs
+5 −0		src/XamlX.IL.Cecil/CecilTypeCache.cs
+20 −4		src/XamlX.IL.Cecil/CecilTypeSystem.cs
+91 −11		src/XamlX/Ast/Clr.cs
+4 −3		src/XamlX/Ast/Intrinsics.cs
+8 −1		src/XamlX/Ast/Xaml.cs
+5 −0		src/XamlX/Compiler/XamlCompiler.cs
+6 −2		src/XamlX/Compiler/XamlImperativeCompiler.cs
+25 −2		src/XamlX/Emit/XamlEmitContext.cs
+2 −1		src/XamlX/Emit/XamlEmitContextWithLocals.cs
+3 −1		src/XamlX/Emit/XamlRuntimeContext.cs
+1 −1		src/XamlX/Exceptions.cs
+5 −0		src/XamlX/FriendAssembly.cs
+14 −0		src/XamlX/IL/CheckingIlEmitter.cs
+2 −2		src/XamlX/IL/Emitters/MarkupExtensionEmitter.cs
+252 −79		src/XamlX/IL/Emitters/PropertyAssignmentEmitter.cs
+6 −3		src/XamlX/IL/ILEmitContext.cs
+3 −5		src/XamlX/IL/ILEmitHelpers.cs
+2 −0		src/XamlX/IL/IXamlILEmitter.cs
+12 −0		src/XamlX/IL/IXamlILLocal.cs
+157 −77		src/XamlX/IL/NamespaceInfoProvider.cs
+14 −0		src/XamlX/IL/RecordingIlEmitter.cs
+10 −7		src/XamlX/IL/RuntimeContext.cs
+55 −7		src/XamlX/IL/SreTypeSystem.cs
+95 −10		src/XamlX/IL/XamlILEmitterExtensions.cs
+35 −11		src/XamlX/IL/XamlIlCompiler.cs
+1 −1		src/XamlX/Parsers/SystemXamlMarkupExtensionParser/SystemXamlMarkupExtensionParser.cs
+112 −28		src/XamlX/Parsers/XDocumentXamlParser.cs
+1 −1		src/XamlX/Parsers/XamlMarkupExtensionParser.cs
+21 −0		src/XamlX/Transform/IXamlIdentifierGenerator.cs
+59 −3		src/XamlX/Transform/TransformerConfiguration.cs
+74 −0		src/XamlX/Transform/Transformers/ApplyWhitespaceNormalization.cs
+23 −5		src/XamlX/Transform/Transformers/ConstructableObjectTransformer.cs
+5 −0		src/XamlX/Transform/Transformers/ConvertPropertyValuesToAssignmentsTransformer.cs
+24 −2		src/XamlX/Transform/Transformers/DeferredContentTransformer.cs
+39 −0		src/XamlX/Transform/Transformers/RemoveWhitespaceBetweenPropertyValuesTransformer.cs
+17 −2		src/XamlX/Transform/Transformers/ResolveContentPropertyTransformer.cs
+41 −5		src/XamlX/Transform/Transformers/ResolvePropertyValueAddersTransformer.cs
+47 −0		src/XamlX/Transform/Transformers/TextNodeMerger.cs
+3 −0		src/XamlX/Transform/Transformers/XArgumentsTransformer.cs
+5 −1		src/XamlX/Transform/Transformers/XamlIntrinsicsTransformer.cs
+150 −0		src/XamlX/Transform/WhitespaceNormalization.cs
+0 −3		src/XamlX/Transform/XamlContextBase.cs
+7 −1		src/XamlX/Transform/XamlLanguageTypeMappings.cs
+92 −38		src/XamlX/Transform/XamlTransformHelpers.cs
+30 −1		src/XamlX/TypeSystem/TypeSystem.cs
+6 −5		src/XamlX/TypeSystem/TypeSystemHelpers.cs
+63 −0		tests/CecilTests/CecilHelpersTest.cs
+10 −0		tests/CecilTests/CecilTests.cs
+2 −2		tests/CecilTests/CompilerTestBase.cs
+118 −2		tests/XamlParserTests/BasicCompilerTests.cs
+28 −10		tests/XamlParserTests/CompilerTestBase.cs
+16 −0		tests/XamlParserTests/ConvertersTests.cs
+317 −0		tests/XamlParserTests/DynamicSettersTests.cs
+80 −2		tests/XamlParserTests/IntrinsicsTests.cs
+123 −12		tests/XamlParserTests/MarkupExtensionTests.cs
+38 −19		tests/XamlParserTests/ParserTests.cs
+7 −7		tests/XamlParserTests/ServiceProviderTests.cs
+29 −0		tests/XamlParserTests/SpecialPropertiesTests.cs
+20 −0		tests/XamlParserTests/TestXamlLanguage.cs
+528 −0		tests/XamlParserTests/WhitespaceTests.cs
+1 −1		tests/XamlParserTests/XamlParserTests.csproj
-Original file line number
+Diff line change
@@ Expand Up / @@ -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");
             }
         }
     }