Automatically set MainWindow when showing the first window

samples/Wpf/Demo.ViewEvents/App.xaml.cs

@@ -26,6 +26,6 @@ protected override void OnStartup(StartupEventArgs e)
         var dialogService = Ioc.Default.GetRequiredService<IDialogService>();
         var vm = dialogService.CreateViewModel<MainWindowViewModel>();
         dialogService.Show(null, vm);
-        Application.Current.MainWindow = Application.Current.Windows[0];
+        //Application.Current.MainWindow = Application.Current.Windows[0];
     }
 }

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <VersionSuffix>preview6</VersionSuffix>
+    <VersionSuffix>preview7</VersionSuffix>
     <Authors>Etienne Charland</Authors>
     <Company>Hanuman Institute</Company>
     <Product>HanumanInstitute.MvvmDialogs</Product>

src/MvvmDialogs.Avalonia.Fluent/FluentDialogFactory.cs

@@ -125,7 +125,7 @@ private static TaskDialogButton[] SyncButton(MessageBoxButton value, bool? defau
         };
 
     private static TaskDialogButton GetButton(string text, bool? value, bool? defaultValue) =>
-        new TaskDialogButton(text, value)
+        new(text, value)
         {
             IsDefault = defaultValue == value
         };

src/MvvmDialogs.Avalonia/ViewWrapper.cs

@@ -1,6 +1,7 @@
 // ReSharper disable VirtualMemberCallInConstructor
 
 using System.Collections.Generic;
+using Avalonia.Controls.ApplicationLifetimes;
 
 namespace HanumanInstitute.MvvmDialogs.Avalonia;
 
@@ -91,15 +92,19 @@ public INotifyPropertyChanged ViewModel
     /// <inheritdoc />
     public Task ShowDialogAsync(IView owner)
     {
-        return Ref.ShowDialog<bool?>((Window)owner.RefObj);
+        var window = (Window)owner.RefObj;
+        SetMainWindowIfEmpty(window);
+        return Ref.ShowDialog<bool?>(window);
     }
 
     /// <inheritdoc />
     public void Show(IView? owner)
     {
-        if (owner?.RefObj != null)
+        var own = owner?.RefObj as Window;
+        SetMainWindowIfEmpty(Ref);
+        if (own != null)
         {
-            Ref.Show((Window)owner.RefObj);
+            Ref.Show(own);
         }
         else
         {
@@ -125,4 +130,12 @@ public bool IsEnabled
 
     /// <inheritdoc />    
     public bool ClosingConfirmed { get; set; }
+
+    private void SetMainWindowIfEmpty(Window? window)
+    {
+        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: null } desktop)
+        {
+            desktop.MainWindow = window;
+        }
+    }
 }

src/MvvmDialogs/FrameworkDialogs/FileDialogSettings.cs

@@ -22,7 +22,7 @@ public abstract class FileDialogSettings : DialogSettingsBase
     /// to the descriptions unless it contains '('.
     /// If you do not wish to display extensions, end the name with '()' and it will be trimmed away.
     /// </remarks>
-    public List<FileFilter> Filters { get; set; } = new List<FileFilter>();
+    public List<FileFilter> Filters { get; set; } = new();
 
     /// <summary>
     /// Gets or sets the initial directory that is displayed by a file dialog.