Code Quality: Apply CA1829 and CA1859 across the solution (#14970)

gumbarros · 0x5bfa · hishitetsu · web-flow · commit 8b9b6bfa5b37 · 2024-03-25T22:51:42.000-04:00
Co-authored-by: 0x5bfa &lt;62196528+0x5bfa@users.noreply.github.com&gt;
Co-authored-by: hishitetsu &lt;66369541+hishitetsu@users.noreply.github.com&gt;
diff --git a/src/Files.App/Actions/Navigation/OpenDirectoryInNewTabAction.cs b/src/Files.App/Actions/Navigation/OpenDirectoryInNewTabAction.cs
@@ -22,7 +22,7 @@ public RichGlyph Glyph
 			context.ShellPage is not null &&
 			context.ShellPage.SlimContentPage is not null &&
 			context.SelectedItems.Count <= 5 &&
-			context.SelectedItems.Where(x => x.IsFolder == true).Count() == context.SelectedItems.Count &&
+			context.SelectedItems.Count(x => x.IsFolder) == context.SelectedItems.Count &&
 			userSettingsService.GeneralSettingsService.ShowOpenInNewTab;
 
 		public OpenDirectoryInNewTabAction()
diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindowItemAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindowItemAction.cs
@@ -27,7 +27,7 @@ public RichGlyph Glyph
 			context.ShellPage is not null &&
 			context.ShellPage.SlimContentPage is not null &&
 			context.SelectedItems.Count <= 5 &&
-			context.SelectedItems.Where(x => x.IsFolder == true).Count() == context.SelectedItems.Count &&
+			context.SelectedItems.Count(x => x.IsFolder) == context.SelectedItems.Count &&
 			userSettingsService.GeneralSettingsService.ShowOpenInNewWindow;
 
 		public OpenInNewWindowItemAction()
diff --git a/src/Files.App/Data/Commands/HotKey/HotKey.cs b/src/Files.App/Data/Commands/HotKey/HotKey.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Collections.Immutable;
+using System.Collections.Frozen;
 using System.Runtime.InteropServices;
 using System.Text;
 using Forms = System.Windows.Forms;
@@ -11,15 +11,15 @@ namespace Files.App.Data.Commands
 	[DebuggerDisplay("{Code}")]
 	public readonly struct HotKey : IEquatable<HotKey>
 	{
-		private static readonly IImmutableDictionary<KeyModifiers, string> modifiers = new Dictionary<KeyModifiers, string>()
+		private static readonly FrozenDictionary<KeyModifiers, string> modifiers = new Dictionary<KeyModifiers, string>()
 		{
 			[KeyModifiers.Menu] = GetKeyString("Menu"),
 			[KeyModifiers.Ctrl] = GetKeyString("Control"),
 			[KeyModifiers.Shift] = GetKeyString("Shift"),
 			[KeyModifiers.Win] = GetKeyString("Windows"),
-		}.ToImmutableDictionary();
+		}.ToFrozenDictionary();
 
-		private static readonly IImmutableDictionary<Keys, string> keys = new Dictionary<Keys, string>()
+		private static readonly FrozenDictionary<Keys, string> keys = new Dictionary<Keys, string>()
 		{
 			[Keys.Enter] = GetKeyString("Enter"),
 			[Keys.Space] = GetKeyString("Space"),
@@ -151,7 +151,7 @@ namespace Files.App.Data.Commands
 			[Keys.Mute] = GetKeyString("MediaMute"),
 			[Keys.VolumeDown] = GetKeyString("MediaVolumeDown"),
 			[Keys.VolumeUp] = GetKeyString("MediaVolumeUp"),
-		}.ToImmutableDictionary();
+		}.ToFrozenDictionary();
 
 		public static HotKey None { get; } = new(Keys.None, KeyModifiers.None);
 
diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs
@@ -1,21 +1,22 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using System.Collections.Frozen;
+using System.Collections.Immutable;
 using Files.App.Actions;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using System.Collections.Immutable;
 
 namespace Files.App.Data.Commands
 {
 	internal sealed class CommandManager : ICommandManager
 	{
 		private readonly IGeneralSettingsService settings = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
 
-		private readonly IImmutableDictionary<CommandCodes, IRichCommand> commands;
-		private IImmutableDictionary<HotKey, IRichCommand> hotKeys = new Dictionary<HotKey, IRichCommand>().ToImmutableDictionary();
+		private readonly FrozenDictionary<CommandCodes, IRichCommand> commands;
+		private ImmutableDictionary<HotKey, IRichCommand> hotKeys = new Dictionary<HotKey, IRichCommand>().ToImmutableDictionary();
 
 		public IRichCommand this[CommandCodes code] => commands.TryGetValue(code, out var command) ? command : None;
 		public IRichCommand this[string code]
@@ -196,16 +197,18 @@ public CommandManager()
 				.Select(action => new ActionCommand(this, action.Key, action.Value))
 				.Cast<IRichCommand>()
 				.Append(new NoneCommand())
-				.ToImmutableDictionary(command => command.Code);
+				.ToFrozenDictionary(command => command.Code);
 
 			settings.PropertyChanged += Settings_PropertyChanged;
 			UpdateHotKeys();
 		}
 
 		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-		public IEnumerator<IRichCommand> GetEnumerator() => commands.Values.GetEnumerator();
 
-		private static IDictionary<CommandCodes, IAction> CreateActions() => new Dictionary<CommandCodes, IAction>
+		public IEnumerator<IRichCommand> GetEnumerator() =>
+			(commands.Values as IEnumerable<IRichCommand>).GetEnumerator();
+
+		private static Dictionary<CommandCodes, IAction> CreateActions() => new Dictionary<CommandCodes, IAction>
 		{
 			[CommandCodes.OpenHelp] = new OpenHelpAction(),
 			[CommandCodes.ToggleFullScreen] = new ToggleFullScreenAction(),
@@ -362,7 +365,7 @@ public CommandManager()
 
 		private void UpdateHotKeys()
 		{
-			ISet<HotKey> useds = new HashSet<HotKey>();
+			var useds = new HashSet<HotKey>();
 
 			var customs = new Dictionary<CommandCodes, HotKeyCollection>();
 			foreach (var custom in settings.Actions)
diff --git a/src/Files.App/Data/Commands/Manager/ModifiableCommandManager.cs b/src/Files.App/Data/Commands/Manager/ModifiableCommandManager.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using System.Collections.Frozen;
 using System.Collections.Immutable;
 
 namespace Files.App.Data.Commands
@@ -9,7 +10,7 @@ internal sealed class ModifiableCommandManager : IModifiableCommandManager
 	{
 		private static readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
 
-		private readonly IImmutableDictionary<CommandCodes, IRichCommand> ModifiableCommands;
+		private readonly FrozenDictionary<CommandCodes, IRichCommand> ModifiableCommands;
 
 		public IRichCommand this[CommandCodes code] => ModifiableCommands.TryGetValue(code, out var command) ? command : None;
 
@@ -19,13 +20,13 @@ internal sealed class ModifiableCommandManager : IModifiableCommandManager
 
 		public ModifiableCommandManager()
 		{
-			ModifiableCommands = CreateModifiableCommands().ToImmutableDictionary();
+			ModifiableCommands = CreateModifiableCommands();
 		}
 
 		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-		public IEnumerator<IRichCommand> GetEnumerator() => ModifiableCommands.Values.GetEnumerator();
+		public IEnumerator<IRichCommand> GetEnumerator() => (ModifiableCommands.Values as IEnumerable<IRichCommand>).GetEnumerator();
 
-		private static IDictionary<CommandCodes, IRichCommand> CreateModifiableCommands() => new Dictionary<CommandCodes, IRichCommand>
+		private static FrozenDictionary<CommandCodes, IRichCommand> CreateModifiableCommands() => new Dictionary<CommandCodes, IRichCommand>
 		{
 			[CommandCodes.None] = new NoneCommand(),
 			[CommandCodes.PasteItem] = new ModifiableCommand(Commands.PasteItem, new() {
@@ -34,6 +35,6 @@ public ModifiableCommandManager()
 			[CommandCodes.DeleteItem] = new ModifiableCommand(Commands.DeleteItem, new() {
 				{ KeyModifiers.Shift,  Commands.DeleteItemPermanently }
 			}),
-		};
+		}.ToFrozenDictionary();
 	}
 }
diff --git a/src/Files.App/Data/Contexts/HomePage/HomePageContext.cs b/src/Files.App/Data/Contexts/HomePage/HomePageContext.cs
@@ -9,7 +9,7 @@ namespace Files.App.Data.Contexts
 {
 	internal sealed class HomePageContext : ObservableObject, IHomePageContext
 	{
-		private static readonly IImmutableList<WidgetFileTagCardItem> emptyTaggedItems = Enumerable.Empty<WidgetFileTagCardItem>().ToImmutableList();
+		private static readonly ImmutableList<WidgetFileTagCardItem> emptyTaggedItems = Enumerable.Empty<WidgetFileTagCardItem>().ToImmutableList();
 
 		public bool IsAnyItemRightClicked => rightClickedItem is not null;
 
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -40,7 +40,7 @@ public static List<ContextMenuFlyoutItemViewModel> Filter(List<ContextMenuFlyout
 			items = items.Where(x => Check(item: x, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems)).ToList();
 			items.ForEach(x => x.Items = x.Items?.Where(y => Check(item: y, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems)).ToList());
 
-			var overflow = items.Where(x => x.ID == "ItemOverflow").FirstOrDefault();
+			var overflow = items.FirstOrDefault(x => x.ID == "ItemOverflow");
 			if (overflow is not null)
 			{
 				if (!shiftPressed && UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu) // items with ShowOnShift to overflow menu
@@ -664,8 +664,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetNewItemItems(BaseLayoutVie
 		public static void SwapPlaceholderWithShellOption(CommandBarFlyout contextMenu, string placeholderName, ContextMenuFlyoutItemViewModel? replacingItem, int position)
 		{
 			var placeholder = contextMenu.SecondaryCommands
-				.Where(x => Equals((x as AppBarButton)?.Tag, placeholderName))
-				.FirstOrDefault() as AppBarButton;
+				.FirstOrDefault(x => Equals((x as AppBarButton)?.Tag, placeholderName)) as AppBarButton;
 
 			if (placeholder is not null)
 				placeholder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
diff --git a/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs b/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs
@@ -74,7 +74,8 @@ public static ObservableCollection<NavigationViewItemButtonStyleItem> Initialize
 
 			if (item is List<ListedItem> listedItems)
 			{
-				var commonFileExt = listedItems.Select(x => x.FileExtension).Distinct().Count() == 1 ? listedItems.First().FileExtension : null;
+				var firstFileExtension = listedItems.FirstOrDefault()?.FileExtension;
+				var commonFileExt = listedItems.All(x => x.FileExtension == firstFileExtension) ? firstFileExtension : null;
 				var compatibilityItemEnabled = listedItems.All(listedItem => FileExtensionHelpers.IsExecutableFile(listedItem is ShortcutItem sht ? sht.TargetPath : commonFileExt, true));
 				var onlyFiles = listedItems.All(listedItem => listedItem.PrimaryItemAttribute == StorageItemTypes.File || listedItem.IsArchive);
 
diff --git a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
@@ -80,9 +80,9 @@ private static void LoadMenuFlyoutItem(
 			var menuItems = menuFlyoutItems.TakeWhile(x => x.Type == MenuItemType.MFT_SEPARATOR || ++itemsCount <= itemsBeforeOverflow).ToList();
 			var overflowItems = menuFlyoutItems.Except(menuItems).ToList();
 
-			if (overflowItems.Where(x => x.Type != MenuItemType.MFT_SEPARATOR).Any())
+			if (overflowItems.Any(x => x.Type != MenuItemType.MFT_SEPARATOR))
 			{
-				var moreItem = menuItemsListLocal.Where(x => x.ID == "ItemOverflow").FirstOrDefault();
+				var moreItem = menuItemsListLocal.FirstOrDefault(x => x.ID == "ItemOverflow");
 				if (moreItem is null)
 				{
 					var menuLayoutSubItem = new ContextMenuFlyoutItemViewModel()
@@ -341,7 +341,7 @@ x.Tag is Win32ContextMenuItem menuItem &&
 						OpacityIconStyle = "ColorIconOpenWith",
 					};
 					var (_, openWithItems) = ContextFlyoutModelToElementHelper.GetAppBarItemsFromModel(new List<ContextMenuFlyoutItemViewModel>() { openWithItem });
-					var placeholder = itemContextMenuFlyout.SecondaryCommands.Where(x => Equals((x as AppBarButton)?.Tag, "OpenWithPlaceholder")).FirstOrDefault() as AppBarButton;
+					var placeholder = itemContextMenuFlyout.SecondaryCommands.FirstOrDefault(x => Equals((x as AppBarButton)?.Tag, "OpenWithPlaceholder")) as AppBarButton;
 					if (placeholder is not null)
 						placeholder.Visibility = Visibility.Collapsed;
 					itemContextMenuFlyout.SecondaryCommands.Insert(0, openWithItems.FirstOrDefault());
@@ -353,7 +353,7 @@ x.Tag is Win32ContextMenuItem menuItem &&
 					await sendToItem.LoadSubMenuAction();
 
 					var (_, sendToItems) = ContextFlyoutModelToElementHelper.GetAppBarItemsFromModel(new List<ContextMenuFlyoutItemViewModel>() { sendToItem });
-					var placeholder = itemContextMenuFlyout.SecondaryCommands.Where(x => Equals((x as AppBarButton)?.Tag, "SendToPlaceholder")).FirstOrDefault() as AppBarButton;
+					var placeholder = itemContextMenuFlyout.SecondaryCommands.FirstOrDefault(x => Equals((x as AppBarButton)?.Tag, "SendToPlaceholder")) as AppBarButton;
 					if (placeholder is not null)
 						placeholder.Visibility = Visibility.Collapsed;
 					itemContextMenuFlyout.SecondaryCommands.Insert(1, sendToItems.FirstOrDefault());
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -1060,7 +1060,7 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
 					BaseStorageFile? matchingStorageFile = null;
 					if (item.Key is not null && FilesAndFolders.IsGrouped && FilesAndFolders.GetExtendedGroupHeaderInfo is not null)
 					{
-						gp = FilesAndFolders.GroupedCollection?.ToList().Where(x => x.Model.Key == item.Key).FirstOrDefault();
+						gp = FilesAndFolders.GroupedCollection?.ToList().FirstOrDefault(x => x.Model.Key == item.Key);
 						loadGroupHeaderInfo = gp is not null && !gp.Model.Initialized && gp.GetExtendedGroupHeaderInfo is not null;
 					}
 
diff --git a/src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs b/src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs
@@ -165,13 +165,13 @@ public string Password
 				}
 			}
 
-			public IImmutableList<FileFormatItem> FileFormats { get; } = new List<FileFormatItem>
+			public ImmutableList<FileFormatItem> FileFormats { get; } = new List<FileFormatItem>
 			{
 				new(ArchiveFormats.Zip, ".zip"),
 				new(ArchiveFormats.SevenZip, ".7z"),
 			}.ToImmutableList();
 
-			public IImmutableList<CompressionLevelItem> CompressionLevels { get; } = new List<CompressionLevelItem>
+			public ImmutableList<CompressionLevelItem> CompressionLevels { get; } = new List<CompressionLevelItem>
 			{
 				new CompressionLevelItem(ArchiveCompressionLevels.Ultra, "CompressionLevelUltra".GetLocalizedResource()),
 				new CompressionLevelItem(ArchiveCompressionLevels.High, "CompressionLevelHigh".GetLocalizedResource()),
@@ -181,7 +181,7 @@ public string Password
 				new CompressionLevelItem(ArchiveCompressionLevels.None, "CompressionLevelNone".GetLocalizedResource()),
 			}.ToImmutableList();
 
-			public IImmutableList<SplittingSizeItem> SplittingSizes { get; } = new List<SplittingSizeItem>
+			public ImmutableList<SplittingSizeItem> SplittingSizes { get; } = new List<SplittingSizeItem>
 			{
 				new(ArchiveSplittingSizes.None, "Do not split".GetLocalizedResource()),
 				new(ArchiveSplittingSizes.Mo10, ToSizeText(10)),
diff --git a/src/Files.App/Services/DialogService.cs b/src/Files.App/Services/DialogService.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using System.Collections.Frozen;
 using Files.App.Dialogs;
 using Files.App.ViewModels.Dialogs;
 using Files.Core.Services;
@@ -16,7 +17,7 @@ namespace Files.App.Services
 	/// <inheritdoc cref="IDialogService"/>
 	internal sealed class DialogService : IDialogService
 	{
-		private readonly IReadOnlyDictionary<Type, Func<ContentDialog>> _dialogs;
+		private readonly FrozenDictionary<Type, Func<ContentDialog>> _dialogs;
 
 		public DialogService()
 		{
@@ -34,7 +35,7 @@ public DialogService()
 				{ typeof(GitHubLoginDialogViewModel), () => new GitHubLoginDialog() },
 				{ typeof(FileTooLargeDialogViewModel), () => new FileTooLargeDialog() },
 				{ typeof(ReleaseNotesDialogViewModel), () => new ReleaseNotesDialog() },
-			};
+			}.ToFrozenDictionary();
 		}
 
 		/// <inheritdoc/>
diff --git a/src/Files.App/Services/JumpListService.cs b/src/Files.App/Services/JumpListService.cs
@@ -113,7 +113,7 @@ private void AddFolder(string path, string group, JumpList instance)
 					var drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
 					// Jumplist item argument can't end with a slash so append a character that can't exist in a directory name to support listing drives.
-					var drive = drivesViewModel.Drives.Where(drive => drive.Path == path).FirstOrDefault();
+					var drive = drivesViewModel.Drives.FirstOrDefault(drive => drive.Path == path);
 					if (drive is null)
 						return;
 
@@ -162,7 +162,7 @@ private void AddFolder(string path, string group, JumpList instance)
 				}
 				else
 				{
-					var pinnedItemsCount = instance.Items.Where(x => x.GroupName == JumpListPinnedGroupHeader).Count();
+					var pinnedItemsCount = instance.Items.Count(x => x.GroupName == JumpListPinnedGroupHeader);
 					instance.Items.Insert(pinnedItemsCount, jumplistItem);
 				}
 			}
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -111,7 +111,7 @@ await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 
 		public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCardItem item, bool isPinned, bool isFolder = false)
 		{
-			var drive = ItemsAdded.Where(x => string.Equals(PathNormalization.NormalizePath(x.Path), PathNormalization.NormalizePath(item.Path), StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+			var drive = ItemsAdded.FirstOrDefault(x => string.Equals(PathNormalization.NormalizePath(x.Path), PathNormalization.NormalizePath(item.Path), StringComparison.OrdinalIgnoreCase));
 			var options = drive?.Item.MenuOptions;
 
 			return new List<ContextMenuFlyoutItemViewModel>()
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -311,7 +311,7 @@ public override async Task PinToSidebarAsync(WidgetCardItem item)
 			var items = (await QuickAccessService.GetPinnedFoldersAsync())
 				.Where(link => !((bool?)link.Properties["System.Home.IsPinned"] ?? false));
 
-			var recentItem = items.Where(x => !ItemsAdded.ToList().Select(y => y.Path).Contains(x.FilePath)).FirstOrDefault();
+			var recentItem = items.FirstOrDefault(x => !ItemsAdded.ToList().Select(y => y.Path).Contains(x.FilePath));
 			if (recentItem is not null)
 			{
 				ModifyItemAsync(this, new ModifyQuickAccessEventArgs(new[] { recentItem.FilePath }, true)
diff --git a/src/Files.App/Utils/Archives/DecompressHelper.cs b/src/Files.App/Utils/Archives/DecompressHelper.cs
@@ -32,7 +32,7 @@ public static async Task<bool> DecompressArchiveAsync(BaseStorageFile archive, B
 			// Fill files
 
 			byte[] buffer = new byte[4096];
-			int entriesAmount = zipFile.ArchiveFileData.Where(x => !x.IsDirectory).Count();
+			int entriesAmount = zipFile.ArchiveFileData.Count(x => !x.IsDirectory);
 
 			StatusCenterItemProgressModel fsProgress = new(
 				progress,
diff --git a/src/Files.App/Utils/Shell/ContextMenu.cs b/src/Files.App/Utils/Shell/ContextMenu.cs
@@ -53,7 +53,7 @@ public async Task<bool> InvokeVerb(string? verb)
 			if (string.IsNullOrEmpty(verb))
 				return false;
 
-			var item = Items.Where(x => x.CommandString == verb).FirstOrDefault();
+			var item = Items.FirstOrDefault(x => x.CommandString == verb);
 			if (item is not null && item.ID >= 0)
 				// Prefer invocation by ID
 				return await InvokeItem(item.ID);
diff --git a/src/Files.App/Utils/Storage/History/StorageHistoryOperations.cs b/src/Files.App/Utils/Storage/History/StorageHistoryOperations.cs
@@ -9,7 +9,7 @@ namespace Files.App.Utils.Storage
 	public sealed class StorageHistoryOperations : IStorageHistoryOperations
 	{
 		private IFilesystemHelpers helpers;
-		private IFilesystemOperations operations;
+		private ShellFilesystemOperations operations;
 
 		private readonly CancellationToken cancellationToken;
 
@@ -47,7 +47,7 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 					if (!IsHistoryNull(history))
 					{
 						NameCollisionOption collision = NameCollisionOption.GenerateUniqueName;
-						for (int i = 0; i < history.Destination.Count(); i++)
+						for (int i = 0; i < history.Destination.Count; i++)
 						{
 							string name = Path.GetFileName(history.Source[i].Path);
 							await operations.RenameAsync(history.Destination[i], name, collision, progress, cancellationToken);
diff --git a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs
@@ -49,7 +49,7 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
 				progress,
 				true,
 				FileSystemStatusCode.InProgress,
-				source.Count());
+				source.Count);
 
 			fsProgress.Report();
 
@@ -353,7 +353,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 				progress,
 				true,
 				FileSystemStatusCode.InProgress,
-				source.Count());
+				source.Count);
 
 			fsProgress.Report();
 
@@ -472,7 +472,7 @@ public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> so
 				progress,
 				true,
 				FileSystemStatusCode.InProgress,
-				source.Count());
+				source.Count);
 
 			fsProgress.Report();
 
diff --git a/src/Files.App/ViewModels/Properties/HashesViewModel.cs b/src/Files.App/ViewModels/Properties/HashesViewModel.cs
@@ -59,7 +59,7 @@ public HashesViewModel(ListedItem item)
 
 		private void ToggleIsEnabled(string? algorithm)
 		{
-			var hashInfoItem = Hashes.Where(x => x.Algorithm == algorithm).First();
+			var hashInfoItem = Hashes.First(x => x.Algorithm == algorithm);
 			hashInfoItem.IsEnabled = !hashInfoItem.IsEnabled;
 
 			if (ShowHashes[hashInfoItem.Algorithm] != hashInfoItem.IsEnabled)
diff --git a/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs b/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs
@@ -67,8 +67,7 @@ private void UpdateSelectedResource()
 			}
 
 			SelectedAppThemeResources = AppThemeResources
-				.Where(p => p.BackgroundColor == themeBackgroundColor)
-				.FirstOrDefault() ?? AppThemeResources[0];
+				.FirstOrDefault(p => p.BackgroundColor == themeBackgroundColor) ?? AppThemeResources[0];
 		}
 
 		private AppThemeResourceItem selectedAppThemeResources;
diff --git a/src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs
diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
diff --git a/src/Files.Core/Data/Models/ByteSize.cs b/src/Files.Core/Data/Models/ByteSize.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) 2024 Files Community`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE.`
`3`	`3`
	`4`	`+using System.Collections.Frozen;`
`4`	`5`	`using System.Collections.Immutable;`
`5`	`6`
`6`	`7`	`namespace Files.App.Data.Commands`
`@@ -9,7 +10,7 @@ internal sealed class ModifiableCommandManager : IModifiableCommandManager`
`9`	`10`	`{`
`10`	`11`	`private static readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();`
`11`	`12`
`12`		`- private readonly IImmutableDictionary<CommandCodes, IRichCommand> ModifiableCommands;`
	`13`	`+ private readonly FrozenDictionary<CommandCodes, IRichCommand> ModifiableCommands;`
`13`	`14`
`14`	`15`	`public IRichCommand this[CommandCodes code] => ModifiableCommands.TryGetValue(code, out var command) ? command : None;`
`15`	`16`
`@@ -19,13 +20,13 @@ internal sealed class ModifiableCommandManager : IModifiableCommandManager`
`19`	`20`
`20`	`21`	`public ModifiableCommandManager()`
`21`	`22`	`{`
`22`		`- ModifiableCommands = CreateModifiableCommands().ToImmutableDictionary();`
	`23`	`+ ModifiableCommands = CreateModifiableCommands();`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();`
`26`		`- public IEnumerator<IRichCommand> GetEnumerator() => ModifiableCommands.Values.GetEnumerator();`
	`27`	`+ public IEnumerator<IRichCommand> GetEnumerator() => (ModifiableCommands.Values as IEnumerable<IRichCommand>).GetEnumerator();`
`27`	`28`
`28`		`- private static IDictionary<CommandCodes, IRichCommand> CreateModifiableCommands() => new Dictionary<CommandCodes, IRichCommand>`
	`29`	`+ private static FrozenDictionary<CommandCodes, IRichCommand> CreateModifiableCommands() => new Dictionary<CommandCodes, IRichCommand>`
`29`	`30`	`{`
`30`	`31`	`[CommandCodes.None] = new NoneCommand(),`
`31`	`32`	`[CommandCodes.PasteItem] = new ModifiableCommand(Commands.PasteItem, new() {`
`@@ -34,6 +35,6 @@ public ModifiableCommandManager()`
`34`	`35`	`[CommandCodes.DeleteItem] = new ModifiableCommand(Commands.DeleteItem, new() {`
`35`	`36`	`{ KeyModifiers.Shift, Commands.DeleteItemPermanently }`
`36`	`37`	`}),`
`37`		`- };`
	`38`	`+ }.ToFrozenDictionary();`
`38`	`39`	`}`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Files.App.Data.Contexts`
`9`	`9`	`{`
`10`	`10`	`internal sealed class HomePageContext : ObservableObject, IHomePageContext`
`11`	`11`	`{`
`12`		`- private static readonly IImmutableList<WidgetFileTagCardItem> emptyTaggedItems = Enumerable.Empty<WidgetFileTagCardItem>().ToImmutableList();`
	`12`	`+ private static readonly ImmutableList<WidgetFileTagCardItem> emptyTaggedItems = Enumerable.Empty<WidgetFileTagCardItem>().ToImmutableList();`
`13`	`13`
`14`	`14`	`public bool IsAnyItemRightClicked => rightClickedItem is not null;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ public static ObservableCollection<NavigationViewItemButtonStyleItem> Initialize`
`74`	`74`
`75`	`75`	`if (item is List<ListedItem> listedItems)`
`76`	`76`	`{`
`77`		`- var commonFileExt = listedItems.Select(x => x.FileExtension).Distinct().Count() == 1 ? listedItems.First().FileExtension : null;`
	`77`	`+ var firstFileExtension = listedItems.FirstOrDefault()?.FileExtension;`
	`78`	`+ var commonFileExt = listedItems.All(x => x.FileExtension == firstFileExtension) ? firstFileExtension : null;`
`78`	`79`	`var compatibilityItemEnabled = listedItems.All(listedItem => FileExtensionHelpers.IsExecutableFile(listedItem is ShortcutItem sht ? sht.TargetPath : commonFileExt, true));`
`79`	`80`	`var onlyFiles = listedItems.All(listedItem => listedItem.PrimaryItemAttribute == StorageItemTypes.File \|\| listedItem.IsArchive);`
`80`	`81`
Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,7 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)`
`1060`	`1060`	`BaseStorageFile? matchingStorageFile = null;`
`1061`	`1061`	`if (item.Key is not null && FilesAndFolders.IsGrouped && FilesAndFolders.GetExtendedGroupHeaderInfo is not null)`
`1062`	`1062`	`{`
`1063`		`- gp = FilesAndFolders.GroupedCollection?.ToList().Where(x => x.Model.Key == item.Key).FirstOrDefault();`
	`1063`	`+ gp = FilesAndFolders.GroupedCollection?.ToList().FirstOrDefault(x => x.Model.Key == item.Key);`
`1064`	`1064`	`loadGroupHeaderInfo = gp is not null && !gp.Model.Initialized && gp.GetExtendedGroupHeaderInfo is not null;`
`1065`	`1065`	`}`
`1066`	`1066`