From 7c3e2391eaa00f87b15394fb10a0372865d5c53d Mon Sep 17 00:00:00 2001
From: David Vreony <dpvreony@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:28:19 +0100
Subject: [PATCH 1/6] add avalonia generation

---
 ...UI.Avalonia.ViewToViewModelBindings.csproj | 30 +++++++++++++
 ...loniaControlBindingModelSourceGenerator.cs | 35 ++++++++++++++++
 .../AvaloniaPlatformResolver.cs               | 42 +++++++++++++++++++
 src/Vetuviem.sln                              | 23 ++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj
 create mode 100644 src/Vetuviem.Avalonia.SourceGenerator/AvaloniaControlBindingModelSourceGenerator.cs
 create mode 100644 src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs

diff --git a/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj b/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj
new file mode 100644
index 00000000..6435ef59
--- /dev/null
+++ b/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041</TargetFramework>
+    <LangVersion>9</LangVersion>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+    <UseWPF>true</UseWPF>
+    <!--
+    If you're seeing CS8032 warnings, it can be because the upstream source generator dll has been rebuilt or you've changed the
+    target frameworks in this project. Visual Studio seems to have a cache that invalidates. Reloading Visual Studio can
+    solve the issue.
+    -->
+    <!--<WarningsAsErrors>8032,8785</WarningsAsErrors>-->
+    <TreatWarningsAsErrors />
+    <IsPackable>False</IsPackable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Vetuviem.Avalonia.SourceGenerator\Vetuviem.Avalonia.SourceGenerator.csproj" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\Vetuviem.Core\Vetuviem.Core.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\Vetuviem.SourceGenerator\Vetuviem-SourceGenerator.props" />
+  <PropertyGroup>
+    <Vetuviem_Make_Classes_Public>true</Vetuviem_Make_Classes_Public>
+  </PropertyGroup>
+</Project>
diff --git a/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaControlBindingModelSourceGenerator.cs b/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaControlBindingModelSourceGenerator.cs
new file mode 100644
index 00000000..2f29d041
--- /dev/null
+++ b/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaControlBindingModelSourceGenerator.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 2022 DPVreony and Contributors. All rights reserved.
+// DPVreony and Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using Microsoft.CodeAnalysis;
+using Vetuviem.SourceGenerator;
+using Vetuviem.SourceGenerator.Features.Core;
+
+namespace Vetuviem.Avalonia.SourceGenerator
+{
+    /// <summary>
+    /// Control Binding Model Source Generator for Blazor.
+    /// </summary>
+    [Generator]
+    public sealed class AvaloniaControlBindingModelSourceGenerator : AbstractControlBindingModelSourceGenerator
+    {
+        /// <inheritdoc />
+        protected override MetadataReference? CheckIfShouldAddMissingAssemblyReference(string assemblyOfInterest)
+        {
+            return null;
+        }
+
+        /// <inheritdoc />
+        protected override IPlatformResolver GetPlatformResolver()
+        {
+            return new AvaloniaPlatformResolver();
+        }
+
+        /// <inheritdoc />
+        protected override string GetPlatformName()
+        {
+            return "Avalonia";
+        }
+    }
+}
diff --git a/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs b/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs
new file mode 100644
index 00000000..499c5d23
--- /dev/null
+++ b/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs
@@ -0,0 +1,42 @@
+// Copyright (c) 2022 DPVreony and Contributors. All rights reserved.
+// DPVreony and Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using Vetuviem.SourceGenerator.Features.Core;
+
+namespace Vetuviem.Avalonia.SourceGenerator
+{
+    /// <summary>
+    /// UI Platform resolver for Blazor.
+    /// </summary>
+    public sealed class AvaloniaPlatformResolver : IPlatformResolver
+    {
+        /// <inheritdoc />
+        public string[] GetAssemblyNames()
+        {
+            return new[]
+            {
+                "Avalonia.Controls.dll",
+                "Avalonia.ReactiveUI.dll",
+            };
+        }
+
+        /// <inheritdoc />
+        public string GetBaseUiElement()
+        {
+            return "global::Avalonia.Visual";
+        }
+
+        /// <inheritdoc />
+        public string? GetCommandSourceInterface()
+        {
+            return "global::Avalonia.Input.ICommandSource";
+        }
+
+        /// <inheritdoc />
+        public string GetCommandInterface()
+        {
+            return "global::Avalonia.Input.ICommand";
+        }
+    }
+}
diff --git a/src/Vetuviem.sln b/src/Vetuviem.sln
index e2ea1c37..ddba71ff 100644
--- a/src/Vetuviem.sln
+++ b/src/Vetuviem.sln
@@ -47,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vetuviem.Winforms.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vetuviem.Avalonia.SourceGenerator", "Vetuviem.Avalonia.SourceGenerator\Vetuviem.Avalonia.SourceGenerator.csproj", "{00BC63E3-7FD3-483E-A2E0-CCB9897947E0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Avalonia.ViewToViewModelBindings", "ReactiveUI.Avalonia.ViewToViewModelBindings\ReactiveUI.Avalonia.ViewToViewModelBindings.csproj", "{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -441,6 +443,26 @@ Global
 		{00BC63E3-7FD3-483E-A2E0-CCB9897947E0}.Release|x64.Build.0 = Release|Any CPU
 		{00BC63E3-7FD3-483E-A2E0-CCB9897947E0}.Release|x86.ActiveCfg = Release|Any CPU
 		{00BC63E3-7FD3-483E-A2E0-CCB9897947E0}.Release|x86.Build.0 = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|ARM.Build.0 = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|x64.Build.0 = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Debug|x86.Build.0 = Debug|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|ARM.Build.0 = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|ARM64.Build.0 = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|x64.ActiveCfg = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|x64.Build.0 = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|x86.ActiveCfg = Release|Any CPU
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -455,6 +477,7 @@ Global
 		{15274B47-731E-4352-9CBD-2639C548D9A9} = {1B3AF279-0165-4820-947C-222B1AE379D9}
 		{3AA61E19-4EC3-4B5E-B7DB-3AB65F931F6C} = {1B3AF279-0165-4820-947C-222B1AE379D9}
 		{D8E39D69-FD9A-4ACF-8743-048EF199884C} = {106C1632-9789-48A3-B7D0-FE793EC46DB8}
+		{ED7AD6E7-AA52-419A-A127-6AEA2933EEFB} = {1B3AF279-0165-4820-947C-222B1AE379D9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3C43A2D4-5AAF-4846-936D-75F742D25A81}

From ddabfc9290e34ab8148569fb2f8d5ea519d937bf Mon Sep 17 00:00:00 2001
From: David Vreony <dpvreony@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:35:17 +0100
Subject: [PATCH 2/6] Update ReactiveUI.Avalonia.ViewToViewModelBindings.csproj

---
 .../ReactiveUI.Avalonia.ViewToViewModelBindings.csproj           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj b/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj
index 6435ef59..11fde669 100644
--- a/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj
+++ b/src/ReactiveUI.Avalonia.ViewToViewModelBindings/ReactiveUI.Avalonia.ViewToViewModelBindings.csproj
@@ -4,7 +4,6 @@
     <LangVersion>9</LangVersion>
     <DebugType>full</DebugType>
     <DebugSymbols>True</DebugSymbols>
-    <UseWPF>true</UseWPF>
     <!--
     If you're seeing CS8032 warnings, it can be because the upstream source generator dll has been rebuilt or you've changed the
     target frameworks in this project. Visual Studio seems to have a cache that invalidates. Reloading Visual Studio can

From ac7c885e4d7ed8e61a6f101f17fc7c92c4aec81c Mon Sep 17 00:00:00 2001
From: David Vreony <dpvreony@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:43:37 +0100
Subject: [PATCH 3/6] add base dll

---
 .../AvaloniaPlatformResolver.cs                                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs b/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs
index 499c5d23..b9ff369f 100644
--- a/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs
+++ b/src/Vetuviem.Avalonia.SourceGenerator/AvaloniaPlatformResolver.cs
@@ -16,8 +16,9 @@ public string[] GetAssemblyNames()
         {
             return new[]
             {
+                "Avalonia.Base.dll",
                 "Avalonia.Controls.dll",
-                "Avalonia.ReactiveUI.dll",
+                "Avalonia.ReactiveUI.dll"
             };
         }
 

From c67189b2505fc8a6cae9237dc13e9d8c9abb0c9e Mon Sep 17 00:00:00 2001
From: David Vreony <dpvreony@users.noreply.github.com>
Date: Fri, 14 Jun 2024 16:51:48 +0100
Subject: [PATCH 4/6] fix "new" properties

---
 .../ControlBindingModelPropertyGenerator.cs   | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs b/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
index 52edffc8..290f90cf 100644
--- a/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
+++ b/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.ComponentModel;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -58,9 +59,7 @@ public static SyntaxList<MemberDeclarationSyntax> GetProperties(
 
             foreach (var prop in properties)
             {
-                var propertySymbol = prop as IPropertySymbol;
-
-                if (propertySymbol == null
+                if (prop is not IPropertySymbol propertySymbol
                     || propertySymbol.IsIndexer
                     || propertySymbol.IsOverride
                     || propertySymbol.DeclaredAccessibility != Accessibility.Public
@@ -78,12 +77,23 @@ public static SyntaxList<MemberDeclarationSyntax> GetProperties(
                     continue;
                 }
 
-                // windows forms has an issue where some properties are provided as "new" instances instead of overridden
-                // we're getting build warnings for these.
+                var treatAsNewImplementation = false;
                 if (ReplacesBaseProperty(propertySymbol, namedTypeSymbol))
                 {
-                    // for now we skip, but we may adjust our model moving forward to make them "new".
-                    continue;
+                    // avalonia has properties that are provided as "new" instances instead of overridden
+                    var declaringSyntaxReferences = propertySymbol.DeclaringSyntaxReferences;
+                    var declaringPropertySyntax = declaringSyntaxReferences.Single().GetSyntax() as PropertyDeclarationSyntax;
+                    if (declaringPropertySyntax?.Modifiers.Any(SyntaxKind.NewKeyword) == true)
+                    {
+                        treatAsNewImplementation = true;
+                    }
+                    else
+                    {
+                        // windows forms has an issue where some properties are overridden without a keyword
+                        // so need to ignore these
+                        continue;
+                    }
+
                 }
 
                 var accessorList = GetAccessorDeclarationSyntaxes();
@@ -97,7 +107,8 @@ public static SyntaxList<MemberDeclarationSyntax> GetProperties(
                     accessorList,
                     summary,
                     desiredCommandInterface,
-                    makeClassesPublic);
+                    makeClassesPublic,
+                    treatAsNewImplementation);
 
                 nodes.Add(propSyntax);
             }
@@ -196,18 +207,27 @@ private static PropertyDeclarationSyntax GetPropertyDeclaration(
             AccessorDeclarationSyntax[] accessorList,
             IEnumerable<SyntaxTrivia> summary,
             string? desiredCommandInterface,
-            bool makeClassesPublic)
+            bool makeClassesPublic,
+            bool treatAsNewImplementation)
         {
             TypeSyntax type = GetBindingTypeSyntax(prop, desiredCommandInterface);
 
+            var modifiers =
+                SyntaxFactory.Token(makeClassesPublic ? SyntaxKind.PublicKeyword : SyntaxKind.InternalKeyword);
+
             var result = SyntaxFactory.PropertyDeclaration(
                     type,
                     prop.Name)
-                .AddModifiers(SyntaxFactory.Token(makeClassesPublic ? SyntaxKind.PublicKeyword : SyntaxKind.InternalKeyword))
+                .AddModifiers(modifiers)
                 .WithAccessorList(
                     SyntaxFactory.AccessorList(SyntaxFactory.List(accessorList)))
                 .WithLeadingTrivia(summary);
 
+            if (treatAsNewImplementation)
+            {
+                result = result.AddModifiers(SyntaxFactory.Token(SyntaxKind.NewKeyword));
+            }
+
             return result;
         }
 

From a724e98d5276fcbcb1df529d57179087eb2e1c2c Mon Sep 17 00:00:00 2001
From: David Vreony <dpvreony@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:39:51 +0100
Subject: [PATCH 5/6] add avalonia int test

---
 .../AvaloniaViewBindingModelGeneratorTests.cs | 79 +++++++++++++++++++
 .../Vetuviem.IntegrationTests.csproj          |  3 +
 .../ControlBindingModelPropertyGenerator.cs   | 45 +----------
 3 files changed, 86 insertions(+), 41 deletions(-)
 create mode 100644 src/Vetuviem.IntegrationTests/ReactiveUI/Avalonia/AvaloniaViewBindingModelGeneratorTests.cs

diff --git a/src/Vetuviem.IntegrationTests/ReactiveUI/Avalonia/AvaloniaViewBindingModelGeneratorTests.cs b/src/Vetuviem.IntegrationTests/ReactiveUI/Avalonia/AvaloniaViewBindingModelGeneratorTests.cs
new file mode 100644
index 00000000..24fa9281
--- /dev/null
+++ b/src/Vetuviem.IntegrationTests/ReactiveUI/Avalonia/AvaloniaViewBindingModelGeneratorTests.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 2022 DPVreony and Contributors. All rights reserved.
+// DPVreony and Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Vetuviem.Avalonia.SourceGenerator;
+using Vetuviem.SourceGenerator.Features.ControlBindingModels;
+using Vetuviem.Testing;
+using Vetuviem.Winforms.SourceGenerator;
+using Xunit.Abstractions;
+
+namespace Vetuviem.IntegrationTests.ReactiveUI.Avalonia
+{
+    /// <summary>
+    /// Unit Tests for the ViewBinding Model Source Generator.
+    /// </summary>
+    public static class AvaloniaViewBindingModelGeneratorTests
+    {
+        /// <inheritdoc />
+        public sealed class ExecuteMethod : BaseGeneratorTests.BaseExecuteMethod<AvaloniaControlBindingModelSourceGenerator, ControlBindingModelGeneratorProcessor>
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="ExecuteMethod"/> class.
+            /// </summary>
+            /// <param name="output">Test Output Helper.</param>
+            public ExecuteMethod(ITestOutputHelper output)
+                : base(output)
+            {
+            }
+
+            /// <inheritdoc />
+            protected override AnalyzerConfigOptionsProvider? GetAnalyzerConfigOptionsProvider()
+            {
+                return null;
+            }
+
+            /// <inheritdoc />
+            protected override void AddReferenceAssemblies(IList<MetadataReference> metadataReferences)
+            {
+                if (metadataReferences == null)
+                {
+                    throw new ArgumentNullException(nameof(metadataReferences));
+                }
+
+                var trustedAssembliesPaths = GetPlatformAssemblyPaths();
+                if (trustedAssembliesPaths == null)
+                {
+                    return;
+                }
+
+                foreach (string trustedAssembliesPath in trustedAssembliesPaths)
+                {
+                    var metadataReference = MetadataReference.CreateFromFile(trustedAssembliesPath);
+                    metadataReferences.Add(metadataReference);
+                }
+            }
+
+            /// <inheritdoc />
+            protected override Func<AvaloniaControlBindingModelSourceGenerator> GetFactory()
+            {
+                return () => new AvaloniaControlBindingModelSourceGenerator();
+            }
+
+            private static string[]? GetPlatformAssemblyPaths()
+            {
+                if (AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES") is string trustedPlatformAssemblies)
+                {
+                    return trustedPlatformAssemblies.Split(Path.PathSeparator);
+                }
+
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj b/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj
index 0b1711e9..1e01b672 100644
--- a/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj
+++ b/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj
@@ -7,12 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
     <PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
     <PackageReference Include="ReactiveUI.WPF" Version="20.1.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Vetuviem.Avalonia.SourceGenerator\Vetuviem.Avalonia.SourceGenerator.csproj" />
+    <ProjectReference Include="..\Vetuviem.Maui.SourceGenerator\Vetuviem.Maui.SourceGenerator.csproj" />
     <ProjectReference Include="..\Vetuviem.Testing\Vetuviem.Testing.csproj" />
     <ProjectReference Include="..\Vetuviem.Winforms.SourceGenerator\Vetuviem.Winforms.SourceGenerator.csproj" />
     <ProjectReference Include="..\Vetuviem.WinUi.SourceGenerator\Vetuviem.WinUi.SourceGenerator.csproj" />
diff --git a/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs b/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
index 290f90cf..3346dda0 100644
--- a/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
+++ b/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
@@ -77,24 +77,7 @@ public static SyntaxList<MemberDeclarationSyntax> GetProperties(
                     continue;
                 }
 
-                var treatAsNewImplementation = false;
-                if (ReplacesBaseProperty(propertySymbol, namedTypeSymbol))
-                {
-                    // avalonia has properties that are provided as "new" instances instead of overridden
-                    var declaringSyntaxReferences = propertySymbol.DeclaringSyntaxReferences;
-                    var declaringPropertySyntax = declaringSyntaxReferences.Single().GetSyntax() as PropertyDeclarationSyntax;
-                    if (declaringPropertySyntax?.Modifiers.Any(SyntaxKind.NewKeyword) == true)
-                    {
-                        treatAsNewImplementation = true;
-                    }
-                    else
-                    {
-                        // windows forms has an issue where some properties are overridden without a keyword
-                        // so need to ignore these
-                        continue;
-                    }
-
-                }
+                var treatAsNewImplementation = ReplacesBaseProperty(propertySymbol);
 
                 var accessorList = GetAccessorDeclarationSyntaxes();
 
@@ -156,31 +139,11 @@ private static MemberDeclarationSyntax GetBindCommandPropertyDeclaration(
                 platformCommandType);
         }
 
-        private static bool ReplacesBaseProperty(
-            IPropertySymbol propertySymbol,
-            INamedTypeSymbol namedTypeSymbol)
+        private static bool ReplacesBaseProperty(IPropertySymbol propertySymbol)
         {
-            var wantedName = propertySymbol.Name;
-            var baseType = namedTypeSymbol.BaseType;
-            while (baseType != null)
-            {
-                var nameMatches = baseType.GetMembers()
-                    .Where(x => x.Kind == SymbolKind.Property && x.Name.Equals(wantedName, StringComparison.Ordinal))
-                    .Cast<IPropertySymbol>()
-                    .ToImmutableArray();
-
-                foreach (var nameMatch in nameMatches)
-                {
-                    if (SymbolEqualityComparer.Default.Equals(nameMatch.Type, propertySymbol.Type))
-                    {
-                        return true;
-                    }
-                }
-
-                baseType = baseType.BaseType;
-            }
+            var accessor = propertySymbol.GetMethod ?? propertySymbol.SetMethod;
 
-            return false;
+            return accessor is { HidesBaseMethodsByName: true };
         }
 
         private static PropertyDeclarationSyntax GetBindCommandPropertyDeclaration(

From 32df81f0cc37da261139b697f1f6c7aa35254d7a Mon Sep 17 00:00:00 2001
From: David Vreony <dpvreony@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:33:59 +0100
Subject: [PATCH 6/6] fix override detection not working

---
 .../ControlBindingModelPropertyGenerator.cs   | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs b/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
index 3346dda0..823a50ce 100644
--- a/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
+++ b/src/Vetuviem.SourceGenerator/Features/ControlBindingModels/ControlBindingModelPropertyGenerator.cs
@@ -77,7 +77,7 @@ public static SyntaxList<MemberDeclarationSyntax> GetProperties(
                     continue;
                 }
 
-                var treatAsNewImplementation = ReplacesBaseProperty(propertySymbol);
+                var treatAsNewImplementation = ReplacesBaseProperty(propertySymbol, namedTypeSymbol);
 
                 var accessorList = GetAccessorDeclarationSyntaxes();
 
@@ -139,11 +139,31 @@ private static MemberDeclarationSyntax GetBindCommandPropertyDeclaration(
                 platformCommandType);
         }
 
-        private static bool ReplacesBaseProperty(IPropertySymbol propertySymbol)
+        private static bool ReplacesBaseProperty(
+            IPropertySymbol propertySymbol,
+            INamedTypeSymbol namedTypeSymbol)
         {
-            var accessor = propertySymbol.GetMethod ?? propertySymbol.SetMethod;
+            var wantedName = propertySymbol.Name;
+            var baseType = namedTypeSymbol.BaseType;
+            while (baseType != null)
+            {
+                var nameMatches = baseType.GetMembers()
+                    .Where(x => x.Kind == SymbolKind.Property && x.Name.Equals(wantedName, StringComparison.Ordinal))
+                    .Cast<IPropertySymbol>()
+                    .ToImmutableArray();
+
+                foreach (var nameMatch in nameMatches)
+                {
+                    if (SymbolEqualityComparer.Default.Equals(nameMatch.Type, propertySymbol.Type))
+                    {
+                        return !propertySymbol.IsOverride;
+                    }
+                }
+
+                baseType = baseType.BaseType;
+            }
 
-            return accessor is { HidesBaseMethodsByName: true };
+            return false;
         }
 
         private static PropertyDeclarationSyntax GetBindCommandPropertyDeclaration(