From 15f542b01da300d350b8ddb49855155c45531e8b Mon Sep 17 00:00:00 2001 From: "Artyom V. Gorchakov" Date: Fri, 5 Mar 2021 02:32:16 +0300 Subject: [PATCH 1/4] fix: Use Namespaces instead of DefaultNamespaces --- src/ReactiveUI/Mixins/DependencyResolverMixins.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs index 61a1b80e15..8e76ce4798 100644 --- a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs +++ b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs @@ -41,7 +41,7 @@ public static void InitializeReactiveUI(this IMutableDependencyResolver resolver if (registrationNamespaces.Length == 0) { - registrationNamespaces = PlatformRegistrationManager.DefaultRegistrationNamespaces; + registrationNamespaces = PlatformRegistrationManager.NamespacesToRegister; } var extraNs = From 12327a145efbd49255cc486a52c61e12cf3a34b5 Mon Sep 17 00:00:00 2001 From: "Artyom V. Gorchakov" Date: Fri, 5 Mar 2021 11:19:50 +0300 Subject: [PATCH 2/4] Add RegistrationNamespace.Avalonia --- src/ReactiveUI/RegistrationNamespace.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ReactiveUI/RegistrationNamespace.cs b/src/ReactiveUI/RegistrationNamespace.cs index e5c38e8d94..3cecdd51f2 100644 --- a/src/ReactiveUI/RegistrationNamespace.cs +++ b/src/ReactiveUI/RegistrationNamespace.cs @@ -38,6 +38,11 @@ public enum RegistrationNamespace /// /// Drawing. /// - Drawing + Drawing, + + /// + /// Avalonia. + /// + Avalonia } } From 9c353f642d757d5fdce5bbdd7a525ba49e2a4444 Mon Sep 17 00:00:00 2001 From: "Artyom V. Gorchakov" Date: Fri, 5 Mar 2021 11:20:36 +0300 Subject: [PATCH 3/4] Use DefaultRegistrationNamespaces --- src/ReactiveUI/Mixins/DependencyResolverMixins.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs index 8e76ce4798..61a1b80e15 100644 --- a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs +++ b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs @@ -41,7 +41,7 @@ public static void InitializeReactiveUI(this IMutableDependencyResolver resolver if (registrationNamespaces.Length == 0) { - registrationNamespaces = PlatformRegistrationManager.NamespacesToRegister; + registrationNamespaces = PlatformRegistrationManager.DefaultRegistrationNamespaces; } var extraNs = From 6a19916f6e0fd10337cefa829c59e670d011de6c Mon Sep 17 00:00:00 2001 From: artyom Date: Fri, 5 Mar 2021 12:32:40 +0300 Subject: [PATCH 4/4] Fix API approval tests --- .../API/ApiApprovalTests.ReactiveUI.net472.approved.txt | 1 + .../API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt | 1 + .../API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt index 82d18736c5..c1e244b05b 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt @@ -655,6 +655,7 @@ namespace ReactiveUI Uno = 3, Blazor = 4, Drawing = 5, + Avalonia = 6, } public class Registrations { diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt index 333a0d3eca..3154b3f96c 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt @@ -650,6 +650,7 @@ namespace ReactiveUI Uno = 3, Blazor = 4, Drawing = 5, + Avalonia = 6, } public class Registrations { diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt index 35e6b5c4f1..0ca16ef123 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt @@ -648,6 +648,7 @@ namespace ReactiveUI Uno = 3, Blazor = 4, Drawing = 5, + Avalonia = 6, } public class Registrations {