Merge branch 'main' into include-primitives

Lamparter · web-flow · commit 161f92e6f980 · 2025-02-16T08:29:57.000Z
Signed-off-by: Lamparter &lt;71598437+Lamparter@users.noreply.github.com&gt;
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,10 +5,11 @@
     <TargetWindowsVersion>10.0.22621.0</TargetWindowsVersion>
     <MinimalWindowsVersion>10.0.19041.0</MinimalWindowsVersion>
     <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)\.editorconfig" />
     <None Include="$(MSBuildThisFileDirectory)\Directory.Build.props" />
     <None Include="$(MSBuildThisFileDirectory)\Directory.Packages.props" />
   </ItemGroup>
-</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/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.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/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
`@@ -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));`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ await DialogDisplayHelper.ShowDialogAsync(`
`166`	`166`	`{`
`167`	`167`	`// CopyFileFromApp only works on file not directories`
`168`	`168`	`var fsSourceFolder = await source.ToStorageItemResult();`
`169`		`- var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));`
	`169`	`+ var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);`
`170`	`170`	`var fsResult = (FilesystemResult)(fsSourceFolder.ErrorCode \| fsDestinationFolder.ErrorCode);`
`171`	`171`
`172`	`172`	`if (fsResult)`
`@@ -219,7 +219,7 @@ await DialogDisplayHelper.ShowDialogAsync(`
`219`	`219`	`{`
`220`	`220`	`Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());`
`221`	`221`
`222`		`- FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));`
	`222`	`+ FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);`
`223`	`223`	`var sourceResult = await source.ToStorageItemResult();`
`224`	`224`	`fsResult = sourceResult.ErrorCode \| destinationResult.ErrorCode;`
`225`	`225`
`@@ -373,7 +373,7 @@ await DialogDisplayHelper.ShowDialogAsync(`
`373`	`373`	`Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());`
`374`	`374`
`375`	`375`	`var fsSourceFolder = await source.ToStorageItemResult();`
`376`		`- var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));`
	`376`	`+ var fsDestinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);`
`377`	`377`	`fsResult = fsSourceFolder.ErrorCode \| fsDestinationFolder.ErrorCode;`
`378`	`378`
`379`	`379`	`if (fsResult)`
`@@ -432,7 +432,7 @@ await DialogDisplayHelper.ShowDialogAsync(`
`432`	`432`	`{`
`433`	`433`	`Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());`
`434`	`434`
`435`		`- FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));`
	`435`	`+ FilesystemResult<BaseStorageFolder> destinationResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);`
`436`	`436`	`var sourceResult = await source.ToStorageItemResult();`
`437`	`437`	`fsResult = sourceResult.ErrorCode \| destinationResult.ErrorCode;`
`438`	`438`
`@@ -512,12 +512,12 @@ public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IPro`
`512`	`512`	`{`
`513`	`513`	`if (source.ItemType == FilesystemItemType.File)`
`514`	`514`	`{`
`515`		`- fsResult = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path)`
	`515`	`+ fsResult = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken)`
`516`	`516`	`.OnSuccess((t) => t.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());`
`517`	`517`	`}`
`518`	`518`	`else if (source.ItemType == FilesystemItemType.Directory)`
`519`	`519`	`{`
`520`		`- fsResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path)`
	`520`	`+ fsResult = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken)`
`521`	`521`	`.OnSuccess((t) => t.DeleteAsync(permanently ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default).AsTask());`
`522`	`522`	`}`
`523`	`523`	`}`
`@@ -539,7 +539,7 @@ public async Task<IStorageHistory> DeleteAsync(IStorageItemWithPath source, IPro`
`539`	`539`	`// Recycle bin also stores a file starting with $I for each item`
`540`	`540`	`string iFilePath = Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileName(source.Path).Replace("$R", "$I", StringComparison.Ordinal));`
`541`	`541`
`542`		`- await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath)`
	`542`	`+ await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)`
`543`	`543`	`.OnSuccess(iFile => iFile.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());`
`544`	`544`	`}`
`545`	`545`	`fsProgress.ReportStatus(fsResult);`
`@@ -738,8 +738,8 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so`
`738`	`738`	`{`
`739`	`739`	`if (source.ItemType == FilesystemItemType.Directory)`
`740`	`740`	`{`
`741`		`- FilesystemResult<BaseStorageFolder> sourceFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path);`
`742`		`- FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));`
	`741`	`+ FilesystemResult<BaseStorageFolder> sourceFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(source.Path, cancellationToken);`
	`742`	`+ FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);`
`743`	`743`
`744`	`744`	`fsResult = sourceFolder.ErrorCode \| destinationFolder.ErrorCode;`
`745`	`745`	`fsProgress.ReportStatus(fsResult);`
`@@ -759,8 +759,8 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so`
`759`	`759`	`}`
`760`	`760`	`else`
`761`	`761`	`{`
`762`		`- FilesystemResult<BaseStorageFile> sourceFile = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path);`
`763`		`- FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination));`
	`762`	`+ FilesystemResult<BaseStorageFile> sourceFile = await _associatedInstance.ShellViewModel.GetFileFromPathAsync(source.Path, cancellationToken);`
	`763`	`+ FilesystemResult<BaseStorageFolder> destinationFolder = await _associatedInstance.ShellViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(destination), cancellationToken);`
`764`	`764`
`765`	`765`	`fsResult = sourceFile.ErrorCode \| destinationFolder.ErrorCode;`
`766`	`766`	`fsProgress.ReportStatus(fsResult);`
`@@ -782,7 +782,7 @@ public async Task<IStorageHistory> RestoreFromTrashAsync(IStorageItemWithPath so`
`782`	`782`	`// Recycle bin also stores a file starting with $I for each item`
`783`	`783`	`string iFilePath = Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileName(source.Path).Replace("$R", "$I", StringComparison.Ordinal));`
`784`	`784`
`785`		`- await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath)`
	`785`	`+ await _associatedInstance.ShellViewModel.GetFileFromPathAsync(iFilePath, cancellationToken)`
`786`	`786`	`.OnSuccess(iFile => iFile.DeleteAsync(StorageDeleteOption.PermanentDelete).AsTask());`
`787`	`787`	`}`
`788`	`788`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ await Task.Run(() =>`
`336`	`336`	`} while (hasNextFile);`
`337`	`337`
`338`	`338`	`Win32PInvoke.FindClose(hFile);`
`339`		`- });`
	`339`	`+ }, token);`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`