From 71b36f2c2f25dca703e51a231d46ac126fa16e5b Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Sat, 4 Dec 2021 17:10:08 +1100 Subject: [PATCH] fix: Uno UI registrations are not initialized (#3082) * fix: Uno UI registrations are not initialized * Update RegistrationNamespace.cs * Update RegistrationNamespace.cs --- ...iApprovalTests.ReactiveUI.DotNet6_0.verified.txt | 13 +++++++------ .../ApiApprovalTests.ReactiveUI.Net4_8.verified.txt | 13 +++++++------ src/ReactiveUI/Mixins/DependencyResolverMixins.cs | 3 ++- src/ReactiveUI/RegistrationNamespace.cs | 7 ++++++- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt index 1bf9afe59c..b9eb3793a6 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt @@ -756,12 +756,13 @@ namespace ReactiveUI Winforms = 2, Wpf = 3, Uno = 4, - Blazor = 5, - Drawing = 6, - Avalonia = 7, - Maui = 8, - Uwp = 9, - WinUI = 10, + UnoWinUI = 5, + Blazor = 6, + Drawing = 7, + Avalonia = 8, + Maui = 9, + Uwp = 10, + WinUI = 11, } public class Registrations { diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt index 45f87056e4..8429790734 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt @@ -763,12 +763,13 @@ namespace ReactiveUI Winforms = 2, Wpf = 3, Uno = 4, - Blazor = 5, - Drawing = 6, - Avalonia = 7, - Maui = 8, - Uwp = 9, - WinUI = 10, + UnoWinUI = 5, + Blazor = 6, + Drawing = 7, + Avalonia = 8, + Maui = 9, + Uwp = 10, + WinUI = 11, } public class Registrations { diff --git a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs index f255de33e1..c3d847d980 100644 --- a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs +++ b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs @@ -44,6 +44,7 @@ public static void InitializeReactiveUI(this IMutableDependencyResolver resolver { RegistrationNamespace.Winforms, "ReactiveUI.Winforms" }, { RegistrationNamespace.Wpf, "ReactiveUI.Wpf" }, { RegistrationNamespace.Uno, "ReactiveUI.Uno" }, + { RegistrationNamespace.UnoWinUI, "ReactiveUI.Uno.WinUI" }, { RegistrationNamespace.Blazor, "ReactiveUI.Blazor" }, { RegistrationNamespace.Drawing, "ReactiveUI.Drawing" }, { RegistrationNamespace.Maui, "ReactiveUI.Maui" }, @@ -153,4 +154,4 @@ private static void ProcessRegistrationForNamespace(string namespaceName, Assemb } } } -} \ No newline at end of file +} diff --git a/src/ReactiveUI/RegistrationNamespace.cs b/src/ReactiveUI/RegistrationNamespace.cs index f96edb1094..955ef411ef 100644 --- a/src/ReactiveUI/RegistrationNamespace.cs +++ b/src/ReactiveUI/RegistrationNamespace.cs @@ -33,6 +33,11 @@ public enum RegistrationNamespace /// Uno, + /// + /// Uno Win UI. + /// + UnoWinUI, + /// /// Blazor. /// @@ -62,4 +67,4 @@ public enum RegistrationNamespace /// WinUI. /// WinUI, -} \ No newline at end of file +}