From 4460b1accc8ae359c3242adf10a5dd507a5fe933 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 24 Jun 2024 15:05:06 -0700
Subject: [PATCH] Make BindingDemo use source generators

---
 build/EmbedXaml.props                              |  1 +
 samples/BindingDemo/App.xaml.cs                    |  2 +-
 samples/BindingDemo/BindingDemo.csproj             |  6 +++---
 samples/BindingDemo/MainWindow.xaml.cs             | 14 +++-----------
 samples/BindingDemo/TestItemView.xaml.cs           |  9 ++-------
 .../Generators.Sandbox/Generators.Sandbox.csproj   |  9 ++-------
 6 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/build/EmbedXaml.props b/build/EmbedXaml.props
index 0bb8da4f47..ccf49d2370 100644
--- a/build/EmbedXaml.props
+++ b/build/EmbedXaml.props
@@ -8,5 +8,6 @@
     <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
+    <AdditionalFiles Include="**\*.xaml" SourceItemGroup="AvaloniaXaml" />
   </ItemGroup>
 </Project>
diff --git a/samples/BindingDemo/App.xaml.cs b/samples/BindingDemo/App.xaml.cs
index 8a5364c70b..805fc24cd7 100644
--- a/samples/BindingDemo/App.xaml.cs
+++ b/samples/BindingDemo/App.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
 
 namespace BindingDemo
 {
-    public class App : Application
+    public partial class App : Application
     {
         public override void Initialize()
         {
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index faeb643d8a..130df8f560 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -2,18 +2,18 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
+    <IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
-    <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\Rx.props" />
-  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\SourceGenerators.props" />
 </Project>
diff --git a/samples/BindingDemo/MainWindow.xaml.cs b/samples/BindingDemo/MainWindow.xaml.cs
index eaa57e1f5f..061b693711 100644
--- a/samples/BindingDemo/MainWindow.xaml.cs
+++ b/samples/BindingDemo/MainWindow.xaml.cs
@@ -1,22 +1,14 @@
 using BindingDemo.ViewModels;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace BindingDemo
 {
-    public class MainWindow : Window
+    public partial class MainWindow : Window
     {
         public MainWindow()
         {
-            this.InitializeComponent();
-            this.DataContext = new MainWindowViewModel();
-            this.AttachDevTools();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
+            InitializeComponent();
+            DataContext = new MainWindowViewModel();
         }
     }
 }
diff --git a/samples/BindingDemo/TestItemView.xaml.cs b/samples/BindingDemo/TestItemView.xaml.cs
index 8c0b592f00..df2b7281b0 100644
--- a/samples/BindingDemo/TestItemView.xaml.cs
+++ b/samples/BindingDemo/TestItemView.xaml.cs
@@ -3,16 +3,11 @@ using Avalonia.Markup.Xaml;
 
 namespace BindingDemo
 {
-    public class TestItemView : UserControl
+    public partial class TestItemView : UserControl
     {
         public TestItemView()
         {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
+            InitializeComponent();
         }
     }
 }
diff --git a/samples/Generators.Sandbox/Generators.Sandbox.csproj b/samples/Generators.Sandbox/Generators.Sandbox.csproj
index 6cbf210d3f..9bd3876d90 100644
--- a/samples/Generators.Sandbox/Generators.Sandbox.csproj
+++ b/samples/Generators.Sandbox/Generators.Sandbox.csproj
@@ -5,12 +5,6 @@
     <IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AvaloniaResource Include="**\*.xaml"/>
-    <!-- Note this AdditionalFiles directive. -->
-    <AdditionalFiles Include="**\*.xaml" SourceItemGroup="AvaloniaXaml" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Validation" Version="3.0.22"/>
   </ItemGroup>
@@ -23,6 +17,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj"/>
   </ItemGroup>
 
-  <Import Project="..\..\build\BuildTargets.targets"/>
+  <Import Project="..\..\build\EmbedXaml.props"/>
   <Import Project="..\..\build\SourceGenerators.props"/>
+  <Import Project="..\..\build\BuildTargets.targets"/>
 </Project>