Fix For ViewModelViewHost not working on WinUI projects (#3575)

reactiveui · Jul 8, 2023 · 2ef3d99 · 2ef3d99
1 parent 9d73fba
commit 2ef3d99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
     {