Merge branch 'feature_open_in_ide' of https://github.com/ferrariofilippo/Files into feature_open_in_ide

ferrariofilippo · ferrariofilippo · commit 16c1ced2c1ef · 2025-02-23T21:44:52.000+01:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,5 +5,6 @@
     <TargetWindowsVersion>10.0.22621.0</TargetWindowsVersion>
     <MinimalWindowsVersion>10.0.19041.0</MinimalWindowsVersion>
     <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj b/src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+        <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
         <DefaultLanguage>en-US</DefaultLanguage>
         <TargetPlatformMinVersion>$(MinimalWindowsVersion)</TargetPlatformMinVersion>
         <IsTrimmable>true</IsTrimmable>
diff --git a/src/Files.App.Controls/BladeView/BladeItem.cs b/src/Files.App.Controls/BladeView/BladeItem.cs
@@ -37,7 +37,6 @@ public BladeItem()
 		protected override void OnApplyTemplate()
 		{
 			_loaded = true;
-			base.OnApplyTemplate();
 
 			_closeButton = GetTemplateChild("CloseButton") as Button;
 			_enlargeButton = GetTemplateChild("EnlargeButton") as Button;
@@ -66,10 +65,9 @@ private void OnExpanding(Expander sender, ExpanderExpandingEventArgs args)
 			{
 				Width = _normalModeWidth;
 				VisualStateManager.GoToState(this, "Expanded", true);
-				var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("CommunityToolkit.WinUI.UI.Controls.Layout/Resources");
 				if (_enlargeButton != null)
 				{
-					AutomationProperties.SetName(_enlargeButton, name);
+					AutomationProperties.SetName(_enlargeButton, "Expand Blade Item");
 				}
 			}
 		}
@@ -80,11 +78,9 @@ private void OnCollapsed(Expander sender, ExpanderCollapsedEventArgs args)
 			if (_loaded)
 			{
 				Width = double.NaN;
-				VisualStateManager.GoToState(this, "Collapsed", true);
-				var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("CommunityToolkit.WinUI.UI.Controls.Layout/Resources");
 				if (_enlargeButton != null)
 				{
-					AutomationProperties.SetName(_enlargeButton, name);
+					AutomationProperties.SetName(_enlargeButton, "Collapse Blade Item");
 				}
 			}
 		}
diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+        <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
         <TargetPlatformMinVersion>$(MinimalWindowsVersion)</TargetPlatformMinVersion>
         <UseWinUI>true</UseWinUI>
         <Nullable>enable</Nullable>
diff --git a/src/Files.App.Controls/GridSplitter/GridSplitter.cs b/src/Files.App.Controls/GridSplitter/GridSplitter.cs
@@ -161,8 +161,7 @@ public GridSplitter()
 		{
 			DefaultStyleKey = typeof(GridSplitter);
 			Loaded += GridSplitter_Loaded;
-			string automationName = CommunityToolkit.WinUI.StringExtensions.GetLocalized("WCT_GridSplitter_AutomationName", "CommunityToolkit.WinUI.UI.Controls.Layout/Resources");
-			AutomationProperties.SetName(this, automationName);
+			AutomationProperties.SetName(this, "Grid Splitter");
 		}
 
 		/// <inheritdoc />
diff --git a/src/Files.App.CsWin32/Files.App.CsWin32.csproj b/src/Files.App.CsWin32/Files.App.CsWin32.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+        <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
         <TargetPlatformMinVersion>$(MinimalWindowsVersion)</TargetPlatformMinVersion>
         <Nullable>enable</Nullable>
         <IsTrimmable>true</IsTrimmable>
diff --git a/src/Files.App.Server/Files.App.Server.csproj b/src/Files.App.Server/Files.App.Server.csproj
@@ -6,7 +6,7 @@
         <DefaultLanguage>en-US</DefaultLanguage>
         <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
         <AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
-        <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+        <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
         <TargetPlatformMinVersion>$(MinimalWindowsVersion)</TargetPlatformMinVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/src/Files.App.Storage/Files.App.Storage.csproj b/src/Files.App.Storage/Files.App.Storage.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+        <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
         <TargetPlatformMinVersion>$(MinimalWindowsVersion)</TargetPlatformMinVersion>
         <Nullable>enable</Nullable>
         <IsTrimmable>true</IsTrimmable>
diff --git a/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs b/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs
@@ -59,7 +59,7 @@ public WidgetFileTagsContainerItem(string tagUid)
 		/// <inheritdoc/>
 		public async Task InitAsync(CancellationToken cancellationToken = default)
 		{
-			await foreach (var item in FileTagsService.GetItemsForTagAsync(_tagUid))
+			await foreach (var item in FileTagsService.GetItemsForTagAsync(_tagUid, cancellationToken))
 			{
 				var icon = await ImageService.GetIconAsync(item.Storable, default);
 				Tags.Add(new(item.Storable, icon));
diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+        <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
         <OutputType>WinExe</OutputType>
         <AssemblyName>Files</AssemblyName>
         <DefaultLanguage>en-US</DefaultLanguage>
diff --git a/src/Files.App/Utils/Storage/Operations/FileSizeCalculator.cs b/src/Files.App/Utils/Storage/Operations/FileSizeCalculator.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Concurrent;
 using System.IO;
+using System.Runtime.InteropServices;
 using Windows.Win32;
 using Windows.Win32.Storage.FileSystem;
 
@@ -29,12 +30,12 @@ await Parallel.ForEachAsync(
 				_paths,
 				cancellationToken,
 				async (path, token) => await Task.Factory.StartNew(() =>
-					{
-						ComputeSizeRecursively(path, token);
-					},
-					token,
-					TaskCreationOptions.LongRunning,
-					TaskScheduler.Default));
+				{
+					ComputeSizeRecursively(path, token);
+				},
+				token,
+				TaskCreationOptions.LongRunning,
+				TaskScheduler.Default));
 
 			unsafe void ComputeSizeRecursively(string path, CancellationToken token)
 			{
@@ -73,24 +74,30 @@ unsafe void ComputeSizeRecursively(string path, CancellationToken token)
 
 									var itemPath = Path.Combine(directory, findData.cFileName.ToString());
 
-									if (attributes.HasFlag(FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_DIRECTORY))
+									// Skip current and parent directory entries
+									var fileName = findData.cFileName.ToString();
+									if (fileName.Equals(".", StringComparison.OrdinalIgnoreCase) ||
+										fileName.Equals("..", StringComparison.OrdinalIgnoreCase))
 									{
-										ComputeFileSize(itemPath);
+										continue;
 									}
-									else if (findData.cFileName.ToString() is string fileName &&
-										fileName.Equals(".", StringComparison.OrdinalIgnoreCase) &&
-										fileName.Equals("..", StringComparison.OrdinalIgnoreCase))
+
+									if (attributes.HasFlag(FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_DIRECTORY))
 									{
 										queue.Enqueue(itemPath);
 									}
+									else
+									{
+										ComputeFileSize(itemPath);
+									}
 
 									if (token.IsCancellationRequested)
 										break;
 								}
 								while (PInvoke.FindNextFile(hFile, &findData));
-							}
 
-							PInvoke.CloseHandle(hFile);
+								PInvoke.FindClose(hFile);
+							}
 						}
 					}
 				}
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs
@@ -166,7 +166,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				{
 					// CopyFileFromApp only works on file not directories
 					var fsSourceFolder = await source.ToStorageItemResult();
-					var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));
+					var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 					var fsResult = (FilesystemResult)(fsSourceFolder.ErrorCode | fsDestinationFolder.ErrorCode);
 
 					if (fsResult)
@@ -219,7 +219,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				{
 					Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
 
-					FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));
+					FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 					var sourceResult = await source.ToStorageItemResult();
 					fsResult = sourceResult.ErrorCode | destinationResult.ErrorCode;
 
@@ -373,7 +373,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 						Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
 
 						var fsSourceFolder = await source.ToStorageItemResult();
-						var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));
+						var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 						fsResult = fsSourceFolder.ErrorCode | fsDestinationFolder.ErrorCode;
 
 						if (fsResult)
@@ -432,7 +432,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				{
 					Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
 
-					FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));
+					FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 					var sourceResult = await source.ToStorageItemResult();
 					fsResult = sourceResult.ErrorCode | destinationResult.ErrorCode;
 
@@ -512,12 +512,12 @@ public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IPro
 			{
 				if (source.ItemType == FilesystemItemType.File)
 				{
-					fsResult = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path)
+					fsResult = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken)
 						.OnSuccess((t) => t.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());
 				}
 				else if (source.ItemType == FilesystemItemType.Directory)
 				{
-					fsResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path)
+					fsResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken)
 						.OnSuccess((t) => t.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());
 				}
 			}
@@ -539,7 +539,7 @@ public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IPro
 				// Recycle bin also stores a file starting with $I for each item
 				string iFilePath = Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileName(source.Path).Replace("$R", "$I", StringComparison.Ordinal));
 
-				await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath)
+				await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)
 					.OnSuccess(iFile => iFile.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());
 			}
 			fsProgress.ReportStatus(fsResult);
@@ -738,8 +738,8 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so
 			{
 				if (source.ItemType == FilesystemItemType.Directory)
 				{
-					FilesystemResult<BaseStorageFolder> sourceFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path);
-					FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));
+					FilesystemResult<BaseStorageFolder> sourceFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken);
+					FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 
 					fsResult = sourceFolder.ErrorCode | destinationFolder.ErrorCode;
 					fsProgress.ReportStatus(fsResult);
@@ -759,8 +759,8 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so
 				}
 				else
 				{
-					FilesystemResult<BaseStorageFile> sourceFile = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path);
-					FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));
+					FilesystemResult<BaseStorageFile> sourceFile = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken);
+					FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);
 
 					fsResult = sourceFile.ErrorCode | destinationFolder.ErrorCode;
 					fsProgress.ReportStatus(fsResult);
@@ -782,7 +782,7 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so
 				// Recycle bin also stores a file starting with $I for each item
 				string iFilePath = Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileName(source.Path).Replace("$R", "$I", StringComparison.Ordinal));
 
-				await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath)
+				await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)
 					.OnSuccess(iFile => iFile.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());
 			}
 
diff --git a/src/Files.App/Utils/Storage/Search/FolderSearch.cs b/src/Files.App/Utils/Storage/Search/FolderSearch.cs
@@ -336,7 +336,7 @@ await Task.Run(() =>
 					} while (hasNextFile);
 
 					Win32PInvoke.FindClose(hFile);
-				});
+				}, token);
 			}
 		}
 
diff --git a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs
@@ -86,8 +86,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 					await using (var inStream = await this.OpenStreamForReadAsync())
 					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
-						await inStream.CopyToAsync(outStream);
-						await outStream.FlushAsync();
+						await inStream.CopyToAsync(outStream, cancellationToken);
+						await outStream.FlushAsync(cancellationToken);
 					}
 				}
 				return destFile;
@@ -251,8 +251,8 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
 					await using (var inStream = await this.OpenStreamForReadAsync())
 					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
-						await inStream.CopyToAsync(outStream);
-						await outStream.FlushAsync();
+						await inStream.CopyToAsync(outStream, cancellationToken);
+						await outStream.FlushAsync(cancellationToken);
 					}
 					await DeleteAsync();
 				}
diff --git a/src/Files.App/Utils/Storage/StorageItems/StreamWithContentType.cs b/src/Files.App/Utils/Storage/StorageItems/StreamWithContentType.cs
@@ -117,7 +117,7 @@ public IAsyncOperation<bool> FlushAsync()
 
 			return AsyncInfo.Run<bool>(async (cancellationToken) =>
 			{
-				await stream.FlushAsync();
+				await stream.FlushAsync(cancellationToken);
 				return true;
 			});
 		}
diff --git a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs
@@ -78,8 +78,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 						await using (var inStream = await this.OpenStreamForReadAsync())
 						await using (var outStream = await destFile.OpenStreamForWriteAsync())
 						{
-							await inStream.CopyToAsync(outStream);
-							await outStream.FlushAsync();
+							await inStream.CopyToAsync(outStream, cancellationToken);
+							await outStream.FlushAsync(cancellationToken);
 						}
 						return destFile;
 					}
@@ -96,8 +96,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 							await using (var inStream = await this.OpenStreamForReadAsync())
 							await using (var outStream = new FileStream(hFile, FileAccess.Write))
 							{
-								await inStream.CopyToAsync(outStream);
-								await outStream.FlushAsync();
+								await inStream.CopyToAsync(outStream, cancellationToken);
+								await outStream.FlushAsync(cancellationToken);
 							}
 							return new NativeStorageFile(destination, desiredNewName, DateTime.Now);
 						}
@@ -143,8 +143,8 @@ public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)
 				await using var inStream = await this.OpenStreamForReadAsync();
 				await using var outStream = await fileToReplace.OpenStreamForWriteAsync();
 
-				await inStream.CopyToAsync(outStream);
-				await outStream.FlushAsync();
+				await inStream.CopyToAsync(outStream, cancellationToken);
+				await outStream.FlushAsync(cancellationToken);
 			});
 		}
 		public override IAsyncAction MoveAndReplaceAsync(IStorageFile fileToReplace)
@@ -154,8 +154,8 @@ public override IAsyncAction MoveAndReplaceAsync(IStorageFile fileToReplace)
 				await using var inStream = await this.OpenStreamForReadAsync();
 				await using var outStream = await fileToReplace.OpenStreamForWriteAsync();
 
-				await inStream.CopyToAsync(outStream);
-				await outStream.FlushAsync();
+				await inStream.CopyToAsync(outStream, cancellationToken);
+				await outStream.FlushAsync(cancellationToken);
 				// Move unsupported, copy but do not delete original
 			});
 		}
diff --git a/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/VirtualStorageFile.cs
@@ -128,8 +128,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 					await using (var inStream = await this.OpenStreamForReadAsync())
 					await using (var outStream = await destFile.OpenStreamForWriteAsync())
 					{
-						await inStream.CopyToAsync(outStream);
-						await outStream.FlushAsync();
+						await inStream.CopyToAsync(outStream, cancellationToken);
+						await outStream.FlushAsync(cancellationToken);
 					}
 					return destFile;
 				}
diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</TargetFramework>
+    <TargetFramework>$(WindowsTargetFramework)</TargetFramework>
     <TargetPlatformMinVersion>$(MinimalWindowsVersion)</TargetPlatformMinVersion>
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public BladeItem()`
`37`	`37`	`protected override void OnApplyTemplate()`
`38`	`38`	`{`
`39`	`39`	`_loaded = true;`
`40`		`- base.OnApplyTemplate();`
`41`	`40`
`42`	`41`	`_closeButton = GetTemplateChild("CloseButton") as Button;`
`43`	`42`	`_enlargeButton = GetTemplateChild("EnlargeButton") as Button;`
`@@ -66,10 +65,9 @@ private void OnExpanding(Expander sender, ExpanderExpandingEventArgs args)`
`66`	`65`	`{`
`67`	`66`	`Width = _normalModeWidth;`
`68`	`67`	`VisualStateManager.GoToState(this, "Expanded", true);`
`69`		`- var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("CommunityToolkit.WinUI.UI.Controls.Layout/Resources");`
`70`	`68`	`if (_enlargeButton != null)`
`71`	`69`	`{`
`72`		`- AutomationProperties.SetName(_enlargeButton, name);`
	`70`	`+ AutomationProperties.SetName(_enlargeButton, "Expand Blade Item");`
`73`	`71`	`}`
`74`	`72`	`}`
`75`	`73`	`}`
`@@ -80,11 +78,9 @@ private void OnCollapsed(Expander sender, ExpanderCollapsedEventArgs args)`
`80`	`78`	`if (_loaded)`
`81`	`79`	`{`
`82`	`80`	`Width = double.NaN;`
`83`		`- VisualStateManager.GoToState(this, "Collapsed", true);`
`84`		`- var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("CommunityToolkit.WinUI.UI.Controls.Layout/Resources");`
`85`	`81`	`if (_enlargeButton != null)`
`86`	`82`	`{`
`87`		`- AutomationProperties.SetName(_enlargeButton, name);`
	`83`	`+ AutomationProperties.SetName(_enlargeButton, "Collapse Blade Item");`
`88`	`84`	`}`
`89`	`85`	`}`
`90`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,7 @@ public GridSplitter()`
`161`	`161`	`{`
`162`	`162`	`DefaultStyleKey = typeof(GridSplitter);`
`163`	`163`	`Loaded += GridSplitter_Loaded;`
`164`		`- string automationName = CommunityToolkit.WinUI.StringExtensions.GetLocalized("WCT_GridSplitter_AutomationName", "CommunityToolkit.WinUI.UI.Controls.Layout/Resources");`
`165`		`- AutomationProperties.SetName(this, automationName);`
	`164`	`+ AutomationProperties.SetName(this, "Grid Splitter");`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public WidgetFileTagsContainerItem(string tagUid)`
`59`	`59`	`/// <inheritdoc/>`
`60`	`60`	`public async Task InitAsync(CancellationToken cancellationToken = default)`
`61`	`61`	`{`
`62`		`- await foreach (var item in FileTagsService.GetItemsForTagAsync(_tagUid))`
	`62`	`+ await foreach (var item in FileTagsService.GetItemsForTagAsync(_tagUid, cancellationToken))`
`63`	`63`	`{`
`64`	`64`	`var icon = await ImageService.GetIconAsync(item.Storable, default);`
`65`	`65`	`Tags.Add(new(item.Storable, icon));`