v1 -> v2로 재실행할 때 앱이 두 번 실행되는 버그 수정

src/TableCloth.Test/ContainerFixture.cs

@@ -108,7 +108,7 @@ private ServiceProvider ConfigureServices()
         services
             .AddWindow<MainWindowV2, MainWindowV2ViewModel>()
             .AddSingleton<MainWindowV2LoadedCommand>()
-            .AddSingleton<MainWindowClosedCommand>();
+            .AddSingleton<MainWindowV2ClosedCommand>();
 
         // Catalog Page
         services

src/TableCloth/App.xaml.cs

@@ -145,7 +145,7 @@ private ServiceProvider ConfigureServices()
         services
             .AddWindow<MainWindowV2, MainWindowV2ViewModel>()
             .AddSingleton<MainWindowV2LoadedCommand>()
-            .AddSingleton<MainWindowClosedCommand>();
+            .AddSingleton<MainWindowV2ClosedCommand>();
 
         // Catalog Page
         services

src/TableCloth/Commands/MainWindow/MainWindowClosedCommand.cs

@@ -0,0 +1,20 @@
+using TableCloth.Components;
+
+namespace TableCloth.Commands.MainWindow;
+
+public sealed class MainWindowClosedCommand : CommandBase
+{
+    public MainWindowClosedCommand(
+        SandboxCleanupManager sandboxCleanupManager,
+        AppRestartManager appRestartManager)
+    {
+        _sandboxCleanupManager = sandboxCleanupManager;
+    }
+
+    private readonly SandboxCleanupManager _sandboxCleanupManager;
+
+    public override void Execute(object? parameter)
+    {
+        _sandboxCleanupManager.TryCleanup();
+    }
+}

src/TableCloth/Commands/MainWindowClosedCommand.cs → src/TableCloth/Commands/MainWindowV2/MainWindowV2ClosedCommand.cs

@@ -1,25 +1,25 @@
-using TableCloth.Components;
-
-namespace TableCloth.Commands;
-
-public sealed class MainWindowClosedCommand : CommandBase
-{
-    public MainWindowClosedCommand(
-        SandboxCleanupManager sandboxCleanupManager,
-        AppRestartManager appRestartManager)
-    {
-        _sandboxCleanupManager = sandboxCleanupManager;
-        _appRestartManager = appRestartManager;
-    }
-
-    private readonly SandboxCleanupManager _sandboxCleanupManager;
-    private readonly AppRestartManager _appRestartManager;
-
-    public override void Execute(object? parameter)
-    {
-        _sandboxCleanupManager.TryCleanup();
-
-        if (_appRestartManager.ReserveRestart)
-            _appRestartManager.RestartNow();
-    }
-}
+using TableCloth.Components;
+
+namespace TableCloth.Commands.MainWindowV2;
+
+public sealed class MainWindowV2ClosedCommand : CommandBase
+{
+    public MainWindowV2ClosedCommand(
+        SandboxCleanupManager sandboxCleanupManager,
+        AppRestartManager appRestartManager)
+    {
+        _sandboxCleanupManager = sandboxCleanupManager;
+        _appRestartManager = appRestartManager;
+    }
+
+    private readonly SandboxCleanupManager _sandboxCleanupManager;
+    private readonly AppRestartManager _appRestartManager;
+
+    public override void Execute(object? parameter)
+    {
+        _sandboxCleanupManager.TryCleanup();
+
+        if (_appRestartManager.ReserveRestart)
+            _appRestartManager.RestartNow();
+    }
+}

src/TableCloth/Components/AppRestartManager.cs

@@ -26,9 +26,8 @@ public AppRestartManager(
     public bool AskRestart()
         => _appMessageBox.DisplayInfo(StringResources.Ask_RestartRequired, MessageBoxButton.OKCancel).Equals(MessageBoxResult.OK);
 
-    public void RestartNow([CallerFilePath] string file = "", [CallerMemberName] string member = "", [CallerLineNumber] int line = 0)
+    public void RestartNow()
     {
-        _appMessageBox.DisplayInfo($"{file} - {member} - {line}");
         Process.Start(_sharedLocations.ExecutableFilePath, Helpers.GetCommandLineArguments());
         _application.Shutdown();
     }

src/TableCloth/ViewModels/MainWindowV2ViewModel.cs

@@ -15,18 +15,18 @@ protected MainWindowV2ViewModel() { }
 
     public MainWindowV2ViewModel(
         MainWindowV2LoadedCommand mainWindowV2LoadedCommand,
-        MainWindowClosedCommand mainWindowClosedCommand)
+        MainWindowV2ClosedCommand mainWindowClosedCommand)
     {
         _mainWindowV2LoadedCommand = mainWindowV2LoadedCommand;
         _mainWindowClosedCommand = mainWindowClosedCommand;
     }
 
     private readonly MainWindowV2LoadedCommand _mainWindowV2LoadedCommand;
-    private readonly MainWindowClosedCommand _mainWindowClosedCommand;
+    private readonly MainWindowV2ClosedCommand _mainWindowClosedCommand;
 
     public MainWindowV2LoadedCommand MainWindowV2LoadedCommand
         => _mainWindowV2LoadedCommand;
 
-    public MainWindowClosedCommand MainWindowClosedCommand
+    public MainWindowV2ClosedCommand MainWindowClosedCommand
         => _mainWindowClosedCommand;
 }