Continued work on reducing async state machines

Author: itsWindows11

src/Files.App/Actions/Content/Archives/CompressIntoSevenZipAction.cs

@@ -25,7 +25,7 @@ public CompressIntoSevenZipAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
 			var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage);
 
@@ -37,7 +37,7 @@ public async Task ExecuteAsync()
 				FileFormat = ArchiveFormats.SevenZip,
 			};
 
-			await ArchiveHelpers.CompressArchiveAsync(creator);
+			return ArchiveHelpers.CompressArchiveAsync(creator);
 		}
 
 		private bool IsContextPageTypeAdaptedToCommand()

src/Files.App/Actions/Content/Archives/CompressIntoZipAction.cs

@@ -25,7 +25,7 @@ public CompressIntoZipAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
 			var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage);
 
@@ -37,7 +37,7 @@ public async Task ExecuteAsync()
 				FileFormat = ArchiveFormats.Zip,
 			};
 
-			await ArchiveHelpers.CompressArchiveAsync(creator);
+			return ArchiveHelpers.CompressArchiveAsync(creator);
 		}
 
 		private bool IsContextPageTypeAdaptedToCommand()

src/Files.App/Actions/Content/Archives/DecompressArchive.cs

@@ -27,9 +27,9 @@ public DecompressArchive()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
-			await ArchiveHelpers.DecompressArchive(context.ShellPage);
+			return ArchiveHelpers.DecompressArchive(context.ShellPage);
 		}
 
 		private bool IsContextPageTypeAdaptedToCommand()

src/Files.App/Actions/Content/Archives/DecompressArchiveHere.cs

@@ -24,9 +24,9 @@ public DecompressArchiveHere()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
-			await ArchiveHelpers.DecompressArchiveHere(context.ShellPage);
+			return ArchiveHelpers.DecompressArchiveHere(context.ShellPage);
 		}
 
 		private bool IsContextPageTypeAdaptedToCommand()

src/Files.App/Actions/Content/Archives/DecompressArchiveToChildFolderAction.cs

@@ -26,9 +26,9 @@ public DecompressArchiveToChildFolderAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
-			await ArchiveHelpers.DecompressArchiveToChildFolder(context.ShellPage);
+			return ArchiveHelpers.DecompressArchiveToChildFolder(context.ShellPage);
 		}
 
 		private bool IsContextPageTypeAdaptedToCommand()

src/Files.App/Actions/FileSystem/CopyItemAction.cs

@@ -28,10 +28,12 @@ public CopyItemAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
 			if (context.ShellPage is not null)
-				await UIFilesystemHelpers.CopyItem(context.ShellPage);
+				return UIFilesystemHelpers.CopyItem(context.ShellPage);
+
+			return Task.CompletedTask;
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/FileSystem/CopyPathAction.cs

@@ -21,7 +21,7 @@ internal class CopyPathAction : IAction
 
 		public HotKey HotKey { get; } = new(Keys.C, KeyModifiers.CtrlShift);
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
 			if (context.ShellPage?.SlimContentPage is not null)
 			{
@@ -38,6 +38,8 @@ public async Task ExecuteAsync()
 				Clipboard.SetContent(data);
 				Clipboard.Flush();
 			}
+
+			return Task.CompletedTask;
 		}
 	}
 }

src/Files.App/Actions/FileSystem/CreateShortcutFromDialogAction.cs

@@ -18,10 +18,12 @@ internal class CreateShortcutFromDialogAction : ObservableObject, IAction
 
 		public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconShortcut");
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
 			if (context.ShellPage is not null)
-				await UIFilesystemHelpers.CreateShortcutFromDialogAsync(context.ShellPage);
+				return UIFilesystemHelpers.CreateShortcutFromDialogAsync(context.ShellPage);
+
+			return Task.CompletedTask;
 		}
 	}
 }

src/Files.App/Actions/FileSystem/DeleteItemAction.cs

@@ -35,16 +35,16 @@ public DeleteItemAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
 			if (context.ShellPage is null || !IsExecutable)
-				return;
+				return Task.CompletedTask;
 
 			var items = context.SelectedItems.Select(item => StorageHelpers.FromPathAndType(item.ItemPath,
 					item.PrimaryItemAttribute is StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
 
-			await context.ShellPage.FilesystemHelpers.DeleteItemsAsync(items, settings.DeleteConfirmationPolicy, false, true);
-			await context.ShellPage.FilesystemViewModel.ApplyFilesAndFoldersChangesAsync();
+			return context.ShellPage.FilesystemHelpers.DeleteItemsAsync(items, settings.DeleteConfirmationPolicy, false, true)
+				.ContinueWith(async _ => await context.ShellPage.FilesystemViewModel.ApplyFilesAndFoldersChangesAsync());
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/App.xaml.cs

@@ -118,14 +118,14 @@ private static Task StartAppCenter()
 			return Task.CompletedTask;
 		}
 
-		private static async Task InitializeAppComponentsAsync()
+		private static Task InitializeAppComponentsAsync()
 		{
 			var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
 			var addItemService = Ioc.Default.GetRequiredService<IAddItemService>();
 			var preferencesSettingsService = userSettingsService.PreferencesSettingsService;
 
 			// Start off a list of tasks we need to run before we can continue startup
-			await Task.Run(async () =>
+			return Task.Run(async () =>
 			{
 				await Task.WhenAll(
 					StartAppCenter(),
@@ -145,15 +145,16 @@ await Task.WhenAll(
 				);
 
 				FileTagsHelper.UpdateTagsDb();
+			}).ContinueWith(async _ =>
+			{
+				// Check for required updates
+				var updateService = Ioc.Default.GetRequiredService<IUpdateService>();
+				await updateService.CheckForUpdates();
+				await updateService.DownloadMandatoryUpdates();
+				await updateService.CheckAndUpdateFilesLauncherAsync();
+				await updateService.CheckLatestReleaseNotesAsync();
 			});
 
-			// Check for required updates
-			var updateService = Ioc.Default.GetRequiredService<IUpdateService>();
-			await updateService.CheckForUpdates();
-			await updateService.DownloadMandatoryUpdates();
-			await updateService.CheckAndUpdateFilesLauncherAsync();
-			await updateService.CheckLatestReleaseNotesAsync();
-
 			static async Task OptionalTask(Task task, bool condition)
 			{
 				if (condition)