chore: update WPF sample for updated Dialog API

e2e/Wpf/HelloWorld.Core/DialogServiceExtensions.cs

-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using System;
 
 namespace HelloWorld.Core

e2e/Wpf/HelloWorld/Dialogs/AnotherDialogWindow.xaml.cs

-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using System.Windows;
 
 namespace HelloWorld.Dialogs

e2e/Wpf/HelloWorld/Dialogs/CustomDialogWindow.xaml.cs

-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using System.Windows;
 
 namespace HelloWorld.Dialogs

e2e/Wpf/HelloWorld/Dialogs/DialogViewModelBase.cs

 using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using System;
 
 namespace HelloWorld.Dialogs
@@ -18,18 +18,19 @@ namespace HelloWorld.Dialogs
             set { SetProperty(ref _title, value); }
         }
 
-        public event Action<IDialogResult> RequestClose;
+        public DialogCloseListener RequestClose { get; }
 
         protected virtual void CloseDialog(string parameter)
         {
-            ButtonResult result = ButtonResult.None;
-
-            if (parameter?.ToLower() == "true")
-                result = ButtonResult.OK;
-            else if (parameter?.ToLower() == "false")
-                result = ButtonResult.Cancel;
-
-            RequestClose?.Invoke(new DialogResult(result));
+            var result = parameter?.ToLower() switch
+            {
+                "true" => ButtonResult.OK,
+                "false" => ButtonResult.Cancel,
+                _ => ButtonResult.None
+            };
+
+            //RequestClose.Invoke(new DialogResult(result));
+            RequestClose.Invoke(result);
         }
 
         public virtual bool CanCloseDialog()

e2e/Wpf/HelloWorld/Dialogs/NotificationDialogViewModel.cs

-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 
 namespace HelloWorld.Dialogs
 {

e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs

@@ -3,7 +3,7 @@ using HelloWorld.Core;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 
 namespace HelloWorld.ViewModels
 {

e2e/Wpf/Modules/HelloWorld.Modules.ModuleA/ViewModels/ViewAViewModel.cs

 using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using HelloWorld.Core;
 
 namespace HelloWorld.Modules.ModuleA.ViewModels

src/Prism.Core/Dialogs/DialogCloseListener.cs

@@ -35,6 +35,13 @@ public struct DialogCloseListener
     public void Invoke() =>
         Invoke(new DialogResult());
 
+    /// <summary>
+    /// Invokes the initialized delegate with the specified <see cref="ButtonResult"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="ButtonResult"/>.</param>
+    public void Invoke(ButtonResult result) =>
+        Invoke(new DialogResult(result));
+
     /// <summary>
     /// Invokes the initialized delegate with the specified <see cref="IDialogParameters"/>.
     /// </summary>

src/Prism.Core/Dialogs/DialogResult.cs

@@ -9,6 +9,23 @@ namespace Prism.Dialogs;
 /// </summary>
 public class DialogResult : IDialogResult
 {
+    /// <summary>
+    /// Creates a new <see cref="DialogResult"/>
+    /// </summary>
+    public DialogResult()
+        : this(ButtonResult.None)
+    {
+    }
+
+    /// <summary>
+    /// Creates a new <see cref="DialogResult"/> with a specified <see cref="ButtonResult"/>
+    /// </summary>
+    /// <param name="result"></param>
+    public DialogResult(ButtonResult result)
+    {
+        Result = result;
+    }
+
     /// <summary>
     /// An <see cref="System.Exception"/> that was thrown by the DialogService
     /// </summary>

src/Prism.Core/Dialogs/DialogUtilities.cs

@@ -38,29 +38,35 @@ public static class DialogUtilities
 
     private static void SetListener(IDialogAware dialogAware, DialogCloseListener listener)
     {
-        var type = dialogAware.GetType();
+        var setter = GetListenerSetter(dialogAware, dialogAware.GetType());
+        setter(listener);
+    }
+
+    private static Action<DialogCloseListener> GetListenerSetter(IDialogAware dialogAware, Type type)
+    {
         var propInfo = type.GetProperty(nameof(IDialogAware.RequestClose));
 
-        if(propInfo is not null && propInfo.PropertyType == typeof(DialogCloseListener) && propInfo.SetMethod is not null)
+        if (propInfo is not null && propInfo.PropertyType == typeof(DialogCloseListener) && propInfo.SetMethod is not null)
         {
-            propInfo.SetValue(dialogAware, listener);
-            return;
+            return x => propInfo.SetValue(dialogAware, x);
         }
 
         var fields = type.GetRuntimeFields().Where(x => x.FieldType == typeof(DialogCloseListener));
         var field = fields.FirstOrDefault(x => x.Name == $"<{nameof(IDialogAware.RequestClose)}>k__BackingField");
         if (field is not null)
         {
-            field.SetValue(dialogAware, listener);
+            return x => field.SetValue(dialogAware, x);
         }
         else if (fields.Any())
         {
             field = fields.First();
-            field.SetValue(dialogAware, listener);
+            return x => field.SetValue(dialogAware, x);
         }
-        else
-        {
+
+        var baseType = type.BaseType;
+        if (baseType is null || baseType == typeof(object))
             throw new DialogException(DialogException.UnableToSetTheDialogCloseListener);
-        }
+
+        return GetListenerSetter(dialogAware, baseType);
     }
 }

src/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs

@@ -21,6 +21,6 @@ using System.Windows.Markup;
 [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Regions.Behaviors")]
 [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Mvvm")]
 [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Interactivity")]
-[assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Services.Dialogs")]
+[assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Dialogs")]
 [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Ioc")]