From 2ef3d9956e51e7854068c4618bdd89862ff4ab71 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Sat, 8 Jul 2023 10:41:22 +0100
Subject: [PATCH] Fix For ViewModelViewHost not working on WinUI projects
 (#3575)

---
 src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs | 8 ++------
 src/ReactiveUI.Maui/Common/ReactiveUserControl.cs         | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs b/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
index 571c98fc60..4f576813c3 100644
--- a/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
+++ b/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
@@ -23,18 +23,14 @@ public class AutoDataTemplateBindingHook : IPropertyBindingHook
         /// <summary>
         /// Gets the default item template.
         /// </summary>
-        [SuppressMessage("Design", "CA1307: Use the currency locale settings", Justification = "Not available on all platforms.")]
         public static Lazy<DataTemplate> DefaultItemTemplate { get; } = new(() =>
         {
             const string template = "<DataTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' " +
-                     "xmlns:xaml='clr-namespace:ReactiveUI;assembly=__ASSEMBLYNAME__'> " +
+                     "xmlns:xaml='clr-namespace:ReactiveUI'>" +
                  "<xaml:ViewModelViewHost ViewModel=\"{Binding Mode=OneWay}\" VerticalContentAlignment=\"Stretch\" HorizontalContentAlignment=\"Stretch\" IsTabStop=\"False\" />" +
              "</DataTemplate>";
 
-            var assemblyName = typeof(AutoDataTemplateBindingHook).Assembly.FullName;
-            assemblyName = assemblyName?.Substring(0, assemblyName.IndexOf(','));
-
-            return (DataTemplate)XamlReader.Load(template.Replace("__ASSEMBLYNAME__", assemblyName));
+            return (DataTemplate)XamlReader.Load(template);
         });
 
         /// <inheritdoc/>
diff --git a/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs b/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
index b8c907171b..0854ed3dc4 100644
--- a/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
+++ b/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
@@ -74,9 +74,8 @@ namespace ReactiveUI
     /// <typeparam name="TViewModel">
     /// The type of the view model backing the view.
     /// </typeparam>
-    [SuppressMessage("Design", "CA1010:Collections should implement generic interface", Justification = "Deliberate usage")]
     public
-        class ReactiveUserControl<TViewModel> :
+    class ReactiveUserControl<TViewModel> :
             UserControl, IViewFor<TViewModel>
             where TViewModel : class
     {