Force process termination when updating

Author: hishitetsu

src/Files.App/App.xaml.cs

@@ -307,7 +307,9 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 				return;
 			}
 
-			if (Ioc.Default.GetRequiredService<IUserSettingsService>().GeneralSettingsService.LeaveAppRunning &&
+			var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
+			if (userSettingsService.GeneralSettingsService.LeaveAppRunning &&
+				!userSettingsService.AppSettingsService.ForceProcessTermination &&
 				!Process.GetProcessesByName("Files").Any(x => x.Id != Process.GetCurrentProcess().Id))
 			{
 				// Close open content dialogs
@@ -341,6 +343,7 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 
 				return;
 			}
+			userSettingsService.AppSettingsService.ForceProcessTermination = false;
 
 			// Method can take a long time, make sure the window is hidden
 			await Task.Yield();

src/Files.App/Services/Settings/AppSettingsService.cs

@@ -27,6 +27,12 @@ public bool RestoreTabsOnStartup
 			set => Set(value);
 		}
 
+		public bool ForceProcessTermination
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		protected override void RaiseOnSettingChangedEvent(object sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
@@ -37,6 +43,9 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(RestoreTabsOnStartup):
 					Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
 					break;
+				case nameof(ForceProcessTermination):
+					Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
+					break;
 			}
 
 			base.RaiseOnSettingChangedEvent(sender, e);

src/Files.App/Services/SideloadUpdateService.cs

@@ -33,6 +33,8 @@ public sealed class SideloadUpdateService : ObservableObject, IUpdateService, ID
 
 		private ILogger? Logger { get; } = Ioc.Default.GetRequiredService<ILogger<App>>();
 
+		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
+
 		private string PackageName { get; } = Package.Current.Id.Name;
 
 		private Version PackageVersion { get; } = new(
@@ -229,6 +231,7 @@ private async Task ApplyPackageUpdate()
 			try
 			{
 				var restartStatus = RegisterApplicationRestart(null, 0);
+				UserSettingsService.AppSettingsService.ForceProcessTermination = true;
 
 				Logger?.LogInformation($"Register for restart: {restartStatus}");
 

src/Files.App/Services/UpdateService.cs

@@ -17,6 +17,8 @@ internal sealed class UpdateService : ObservableObject, IUpdateService
 		private StoreContext? _storeContext;
 		private IList<StorePackageUpdate>? _updatePackages;
 
+		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
+
 		private bool IsMandatory => _updatePackages?.Where(e => e.Mandatory).ToList().Count >= 1;
 
 		private bool _isUpdateAvailable;
@@ -109,6 +111,7 @@ public async Task CheckForUpdates()
 		private async Task DownloadAndInstall()
 		{
 			App.SaveSessionTabs();
+			UserSettingsService.AppSettingsService.ForceProcessTermination = true;
 			var downloadOperation = _storeContext?.RequestDownloadAndInstallStorePackageUpdatesAsync(_updatePackages);
 			await downloadOperation.AsTask();
 		}

src/Files.Core/Services/Settings/IAppSettingsService.cs

@@ -17,5 +17,11 @@ public interface IAppSettingsService : IBaseSettingsService, INotifyPropertyChan
 		/// This is used when prompting users to restart after changing the app language.
 		/// </summary>
 		bool RestoreTabsOnStartup { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether or not to force process termination regardless of background running settings.
+		/// This is used when restarting the app to update.
+		/// </summary>
+		bool ForceProcessTermination { get; set; }
 	}
 }