Bump FluentFTP from 36.1.0 to 39.3.0 dependencies (#9744)

gave92 · web-flow · commit 34e1974b7f0a · 2022-08-17T10:13:05.000-04:00
* Make zip dict concurrent (478794293u)

* Update FluentFTP to 39.3.0
diff --git a/src/Files.Sdk.Storage/Files - Backup.Sdk.Storage.csproj b/src/Files.Sdk.Storage/Files - Backup.Sdk.Storage.csproj
diff --git a/src/Files.Uwp.Storage/Files.Uwp.Storage.csproj b/src/Files.Uwp.Storage/Files.Uwp.Storage.csproj
@@ -128,7 +128,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentFTP">
-      <Version>37.1.0</Version>
+      <Version>39.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
diff --git a/src/Files.Uwp.Storage/FtpStorage/FtpFileSystemService.cs b/src/Files.Uwp.Storage/FtpStorage/FtpFileSystemService.cs
@@ -50,7 +50,7 @@ public async Task<ILocatableFolder> GetFolderFromPathAsync(string path, Cancella
 
             var ftpPath = FtpHelpers.GetFtpPath(path);
             var item = await ftpClient.GetObjectInfoAsync(ftpPath, token: cancellationToken);
-            if (item is null || item.Type != FtpFileSystemObjectType.Directory)
+            if (item is null || item.Type != FtpObjectType.Directory)
                 throw new DirectoryNotFoundException("Directory was not found from path.");
 
             return new FtpStorageFolder(ftpPath, item.Name);
@@ -63,7 +63,7 @@ public async Task<ILocatableFile> GetFileFromPathAsync(string path, Cancellation
 
             var ftpPath = FtpHelpers.GetFtpPath(path);
             var item = await ftpClient.GetObjectInfoAsync(ftpPath, token: cancellationToken);
-            if (item is null || item.Type != FtpFileSystemObjectType.File)
+            if (item is null || item.Type != FtpObjectType.File)
                 throw new FileNotFoundException("File was not found from path.");
 
             return new FtpStorageFile(ftpPath, item.Name);
diff --git a/src/Files.Uwp.Storage/FtpStorage/FtpStorageFolder.cs b/src/Files.Uwp.Storage/FtpStorage/FtpStorageFolder.cs
@@ -32,7 +32,7 @@ public async Task<IFile> GetFileAsync(string fileName, CancellationToken cancell
             var path = FtpHelpers.GetFtpPath(PathHelpers.Combine(Path, fileName));
             var item = await ftpClient.GetObjectInfoAsync(path, token: cancellationToken);
 
-            if (item is null || item.Type != FtpFileSystemObjectType.File)
+            if (item is null || item.Type != FtpObjectType.File)
                 throw new FileNotFoundException();
             
             return new FtpStorageFile(path, item.Name);
@@ -48,7 +48,7 @@ public async Task<IFolder> GetFolderAsync(string folderName, CancellationToken c
             var item = await ftpClient.GetObjectInfoAsync(path, token: cancellationToken);
 
 
-            if (item is null || item.Type != FtpFileSystemObjectType.Directory)
+            if (item is null || item.Type != FtpObjectType.Directory)
                 throw new DirectoryNotFoundException();
 
             return new FtpStorageFolder(path, item.Name);
@@ -64,26 +64,26 @@ public async IAsyncEnumerable<IStorable> GetItemsAsync(StorableKind kind = Stora
             {
                 foreach (var item in await ftpClient.GetListingAsync(Path, cancellationToken))
                 {
-                    if (item.Type == FtpFileSystemObjectType.File)
+                    if (item.Type == FtpObjectType.File)
                         yield return new FtpStorageFile(item.FullName, item.Name);
                 }
             }
             else if (kind == StorableKind.Folders)
             {
                 foreach (var item in await ftpClient.GetListingAsync(Path, cancellationToken))
                 {
-                    if (item.Type == FtpFileSystemObjectType.Directory)
+                    if (item.Type == FtpObjectType.Directory)
                         yield return new FtpStorageFolder(item.FullName, item.Name);
                 }
             }
             else
             {
                 foreach (var item in await ftpClient.GetListingAsync(Path, cancellationToken))
                 {
-                    if (item.Type == FtpFileSystemObjectType.File)
+                    if (item.Type == FtpObjectType.File)
                         yield return new FtpStorageFile(item.FullName, item.Name);
 
-                    if (item.Type == FtpFileSystemObjectType.Directory)
+                    if (item.Type == FtpObjectType.Directory)
                         yield return new FtpStorageFolder(item.FullName, item.Name);
                 }
             }
@@ -156,7 +156,7 @@ public async Task<IFile> CreateFileAsync(string desiredName, CreationCollisionOp
 
             using var stream = new MemoryStream();
             var replaceExisting = collisionOption == CreationCollisionOption.ReplaceExisting;
-            var result = await ftpClient.UploadAsync(stream, newPath, replaceExisting ? FtpRemoteExists.Overwrite : FtpRemoteExists.Skip, token: cancellationToken);
+            var result = await ftpClient.UploadStreamAsync(stream, newPath, replaceExisting ? FtpRemoteExists.Overwrite : FtpRemoteExists.Skip, token: cancellationToken);
 
             if (result == FtpStatus.Success)
             {
diff --git a/src/Files.Uwp/Files.Uwp.csproj b/src/Files.Uwp/Files.Uwp.csproj
@@ -1550,7 +1550,7 @@
       <Version>8.0.0</Version>
     </PackageReference>
     <PackageReference Include="FluentFTP">
-      <Version>36.1.0</Version>
+      <Version>39.3.0</Version>
     </PackageReference>
     <PackageReference Include="ini-parser-netstandard">
       <Version>2.5.2</Version>
diff --git a/src/Files.Uwp/Filesystem/ListedItem.cs b/src/Files.Uwp/Filesystem/ListedItem.cs
@@ -473,7 +473,7 @@ public class FtpItem : ListedItem
     {
         public FtpItem(FtpListItem item, string folder) : base(null)
         {
-            var isFile = item.Type == FtpFileSystemObjectType.File;
+            var isFile = item.Type == FtpObjectType.File;
             ItemDateCreatedReal = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;
             ItemDateModifiedReal = item.RawModified < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawModified;
             ItemNameRaw = item.Name;
diff --git a/src/Files.Uwp/Filesystem/StorageItems/FtpStorageFile.cs b/src/Files.Uwp/Filesystem/StorageItems/FtpStorageFile.cs
@@ -102,13 +102,13 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac
 
                 if (accessMode is FileAccessMode.Read)
                 {
-                    var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);
+                    var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);
                     return new NonSeekableRandomAccessStreamForRead(inStream, (ulong)inStream.Length)
                     {
                         DisposeCallback = ftpClient.Dispose
                     };
                 }
-                return new NonSeekableRandomAccessStreamForWrite(await ftpClient.OpenWriteAsync(FtpPath, cancellationToken))
+                return new NonSeekableRandomAccessStreamForWrite(await ftpClient.OpenWriteAsync(FtpPath, token: cancellationToken))
                 {
                     DisposeCallback = ftpClient.Dispose
                 };
@@ -126,7 +126,7 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn
                     return null;
                 }
 
-                var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);
+                var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);
                 var nsStream = new NonSeekableRandomAccessStreamForRead(inStream, (ulong)inStream.Length) { DisposeCallback = ftpClient.Dispose };
                 return new StreamWithContentType(nsStream);
             });
@@ -141,7 +141,7 @@ public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
                     return null;
                 }
 
-                var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);
+                var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);
                 return new InputStreamWithDisposeCallback(inStream) { DisposeCallback = () => ftpClient.Dispose() };
             });
         }
@@ -167,14 +167,14 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
 
                 if (destFolder is ICreateFileWithStream cwsf)
                 {
-                    using var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);
+                    using var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);
                     return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
                 }
                 else
                 {
                     BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
                     using var stream = await file.OpenStreamForWriteAsync();
-                    return await ftpClient.DownloadAsync(stream, FtpPath, token: cancellationToken) ? file : null;
+                    return await ftpClient.DownloadStreamAsync(stream, FtpPath, token: cancellationToken) ? file : null;
                 }
             });
         }
@@ -250,7 +250,7 @@ private async void FtpDataStreamingHandler(StreamedFileDataRequest request)
 
                 using (var outStream = request.AsStreamForWrite())
                 {
-                    await ftpClient.DownloadAsync(outStream, FtpPath);
+                    await ftpClient.DownloadStreamAsync(outStream, FtpPath);
                     await outStream.FlushAsync();
                 }
                 request.Dispose();
diff --git a/src/Files.Uwp/Filesystem/StorageItems/FtpStorageFolder.cs b/src/Files.Uwp/Filesystem/StorageItems/FtpStorageFolder.cs
@@ -93,11 +93,11 @@ public override IAsyncOperation<IStorageItem> GetItemAsync(string name)
                 var item = await ftpClient.GetObjectInfoAsync(FtpHelpers.GetFtpPath(PathNormalization.Combine(Path, name)));
                 if (item is not null)
                 {
-                    if (item.Type is FtpFileSystemObjectType.File)
+                    if (item.Type is FtpObjectType.File)
                     {
                         return new FtpStorageFile(Path, item);
                     }
-                    if (item.Type is FtpFileSystemObjectType.Directory)
+                    if (item.Type is FtpObjectType.Directory)
                     {
                         return new FtpStorageFolder(Path, item);
                     }
@@ -133,11 +133,11 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()
                 var list = await ftpClient.GetListingAsync(FtpPath);
                 foreach (var item in list)
                 {
-                    if (item.Type is FtpFileSystemObjectType.File)
+                    if (item.Type is FtpObjectType.File)
                     {
                         items.Add(new FtpStorageFile(Path, item));
                     }
-                    else if (item.Type is FtpFileSystemObjectType.Directory)
+                    else if (item.Type is FtpObjectType.Directory)
                     {
                         items.Add(new FtpStorageFolder(Path, item));
                     }
@@ -186,7 +186,7 @@ public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredN
                 string remotePath = $"{FtpPath}/{desiredName}";
                 var ftpRemoteExists = options is CreationCollisionOption.ReplaceExisting ? FtpRemoteExists.Overwrite : FtpRemoteExists.Skip;
 
-                var result = await ftpClient.UploadAsync(stream, remotePath, ftpRemoteExists);
+                var result = await ftpClient.UploadStreamAsync(stream, remotePath, ftpRemoteExists);
                 if (result is FtpStatus.Success)
                 {
                     return new FtpStorageFile(new StorageFileWithPath(null, $"{Path}/{desiredName}"));
diff --git a/src/Files.Uwp/Filesystem/StorageItems/ZipStorageFolder.cs b/src/Files.Uwp/Filesystem/StorageItems/ZipStorageFolder.cs
@@ -5,6 +5,7 @@
 using SevenZip;
 using System;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -72,7 +73,7 @@ public static bool IsZipPath(string path, bool includeRoot = true)
             return (marker == path.Length && includeRoot) || (marker < path.Length && path[marker] is '\\');
         }
 
-        private static Dictionary<string, Task<bool>> defaultAppDict = new Dictionary<string, Task<bool>>();
+        private static ConcurrentDictionary<string, Task<bool>> defaultAppDict = new();
         public static async Task<bool> CheckDefaultZipApp(string filePath)
         {
             Func<Task<bool>> queryFileAssoc = async () =>
@@ -81,11 +82,11 @@ public static async Task<bool> CheckDefaultZipApp(string filePath)
                 if (assoc != null)
                 {
                     return assoc == Package.Current.Id.FamilyName
-                        || assoc.Equals(System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "explorer.exe"), StringComparison.OrdinalIgnoreCase);
+                        || assoc.Equals(IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "explorer.exe"), StringComparison.OrdinalIgnoreCase);
                 }
                 return true;
             };
-            var ext = System.IO.Path.GetExtension(filePath)?.ToLowerInvariant();
+            var ext = IO.Path.GetExtension(filePath)?.ToLowerInvariant();
             return await defaultAppDict.GetAsync(ext, queryFileAssoc);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task<IFile> GetFileAsync(string fileName, CancellationToken cancell`
`32`	`32`	`var path = FtpHelpers.GetFtpPath(PathHelpers.Combine(Path, fileName));`
`33`	`33`	`var item = await ftpClient.GetObjectInfoAsync(path, token: cancellationToken);`
`34`	`34`
`35`		`- if (item is null \|\| item.Type != FtpFileSystemObjectType.File)`
	`35`	`+ if (item is null \|\| item.Type != FtpObjectType.File)`
`36`	`36`	`throw new FileNotFoundException();`
`37`	`37`
`38`	`38`	`return new FtpStorageFile(path, item.Name);`
`@@ -48,7 +48,7 @@ public async Task<IFolder> GetFolderAsync(string folderName, CancellationToken c`
`48`	`48`	`var item = await ftpClient.GetObjectInfoAsync(path, token: cancellationToken);`
`49`	`49`
`50`	`50`
`51`		`- if (item is null \|\| item.Type != FtpFileSystemObjectType.Directory)`
	`51`	`+ if (item is null \|\| item.Type != FtpObjectType.Directory)`
`52`	`52`	`throw new DirectoryNotFoundException();`
`53`	`53`
`54`	`54`	`return new FtpStorageFolder(path, item.Name);`
`@@ -64,26 +64,26 @@ public async IAsyncEnumerable<IStorable> GetItemsAsync(StorableKind kind = Stora`
`64`	`64`	`{`
`65`	`65`	`foreach (var item in await ftpClient.GetListingAsync(Path, cancellationToken))`
`66`	`66`	`{`
`67`		`- if (item.Type == FtpFileSystemObjectType.File)`
	`67`	`+ if (item.Type == FtpObjectType.File)`
`68`	`68`	`yield return new FtpStorageFile(item.FullName, item.Name);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`else if (kind == StorableKind.Folders)`
`72`	`72`	`{`
`73`	`73`	`foreach (var item in await ftpClient.GetListingAsync(Path, cancellationToken))`
`74`	`74`	`{`
`75`		`- if (item.Type == FtpFileSystemObjectType.Directory)`
	`75`	`+ if (item.Type == FtpObjectType.Directory)`
`76`	`76`	`yield return new FtpStorageFolder(item.FullName, item.Name);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`else`
`80`	`80`	`{`
`81`	`81`	`foreach (var item in await ftpClient.GetListingAsync(Path, cancellationToken))`
`82`	`82`	`{`
`83`		`- if (item.Type == FtpFileSystemObjectType.File)`
	`83`	`+ if (item.Type == FtpObjectType.File)`
`84`	`84`	`yield return new FtpStorageFile(item.FullName, item.Name);`
`85`	`85`
`86`		`- if (item.Type == FtpFileSystemObjectType.Directory)`
	`86`	`+ if (item.Type == FtpObjectType.Directory)`
`87`	`87`	`yield return new FtpStorageFolder(item.FullName, item.Name);`
`88`	`88`	`}`
`89`	`89`	`}`
`@@ -156,7 +156,7 @@ public async Task<IFile> CreateFileAsync(string desiredName, CreationCollisionOp`
`156`	`156`
`157`	`157`	`using var stream = new MemoryStream();`
`158`	`158`	`var replaceExisting = collisionOption == CreationCollisionOption.ReplaceExisting;`
`159`		`- var result = await ftpClient.UploadAsync(stream, newPath, replaceExisting ? FtpRemoteExists.Overwrite : FtpRemoteExists.Skip, token: cancellationToken);`
	`159`	`+ var result = await ftpClient.UploadStreamAsync(stream, newPath, replaceExisting ? FtpRemoteExists.Overwrite : FtpRemoteExists.Skip, token: cancellationToken);`
`160`	`160`
`161`	`161`	`if (result == FtpStatus.Success)`
`162`	`162`	`{`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ public class FtpItem : ListedItem`
`473`	`473`	`{`
`474`	`474`	`public FtpItem(FtpListItem item, string folder) : base(null)`
`475`	`475`	`{`
`476`		`- var isFile = item.Type == FtpFileSystemObjectType.File;`
	`476`	`+ var isFile = item.Type == FtpObjectType.File;`
`477`	`477`	`ItemDateCreatedReal = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;`
`478`	`478`	`ItemDateModifiedReal = item.RawModified < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawModified;`
`479`	`479`	`ItemNameRaw = item.Name;`
Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,13 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac`
`102`	`102`
`103`	`103`	`if (accessMode is FileAccessMode.Read)`
`104`	`104`	`{`
`105`		`- var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);`
	`105`	`+ var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);`
`106`	`106`	`return new NonSeekableRandomAccessStreamForRead(inStream, (ulong)inStream.Length)`
`107`	`107`	`{`
`108`	`108`	`DisposeCallback = ftpClient.Dispose`
`109`	`109`	`};`
`110`	`110`	`}`
`111`		`- return new NonSeekableRandomAccessStreamForWrite(await ftpClient.OpenWriteAsync(FtpPath, cancellationToken))`
	`111`	`+ return new NonSeekableRandomAccessStreamForWrite(await ftpClient.OpenWriteAsync(FtpPath, token: cancellationToken))`
`112`	`112`	`{`
`113`	`113`	`DisposeCallback = ftpClient.Dispose`
`114`	`114`	`};`
`@@ -126,7 +126,7 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn`
`126`	`126`	`return null;`
`127`	`127`	`}`
`128`	`128`
`129`		`- var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);`
	`129`	`+ var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);`
`130`	`130`	`var nsStream = new NonSeekableRandomAccessStreamForRead(inStream, (ulong)inStream.Length) { DisposeCallback = ftpClient.Dispose };`
`131`	`131`	`return new StreamWithContentType(nsStream);`
`132`	`132`	`});`
`@@ -141,7 +141,7 @@ public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()`
`141`	`141`	`return null;`
`142`	`142`	`}`
`143`	`143`
`144`		`- var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);`
	`144`	`+ var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);`
`145`	`145`	`return new InputStreamWithDisposeCallback(inStream) { DisposeCallback = () => ftpClient.Dispose() };`
`146`	`146`	`});`
`147`	`147`	`}`
`@@ -167,14 +167,14 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin`
`167`	`167`
`168`	`168`	`if (destFolder is ICreateFileWithStream cwsf)`
`169`	`169`	`{`
`170`		`- using var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);`
	`170`	`+ using var inStream = await ftpClient.OpenReadAsync(FtpPath, token: cancellationToken);`
`171`	`171`	`return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());`
`172`	`172`	`}`
`173`	`173`	`else`
`174`	`174`	`{`
`175`	`175`	`BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());`
`176`	`176`	`using var stream = await file.OpenStreamForWriteAsync();`
`177`		`- return await ftpClient.DownloadAsync(stream, FtpPath, token: cancellationToken) ? file : null;`
	`177`	`+ return await ftpClient.DownloadStreamAsync(stream, FtpPath, token: cancellationToken) ? file : null;`
`178`	`178`	`}`
`179`	`179`	`});`
`180`	`180`	`}`
`@@ -250,7 +250,7 @@ private async void FtpDataStreamingHandler(StreamedFileDataRequest request)`
`250`	`250`
`251`	`251`	`using (var outStream = request.AsStreamForWrite())`
`252`	`252`	`{`
`253`		`- await ftpClient.DownloadAsync(outStream, FtpPath);`
	`253`	`+ await ftpClient.DownloadStreamAsync(outStream, FtpPath);`
`254`	`254`	`await outStream.FlushAsync();`
`255`	`255`	`}`
`256`	`256`	`request.Dispose();`
Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,11 @@ public override IAsyncOperation<IStorageItem> GetItemAsync(string name)`
`93`	`93`	`var item = await ftpClient.GetObjectInfoAsync(FtpHelpers.GetFtpPath(PathNormalization.Combine(Path, name)));`
`94`	`94`	`if (item is not null)`
`95`	`95`	`{`
`96`		`- if (item.Type is FtpFileSystemObjectType.File)`
	`96`	`+ if (item.Type is FtpObjectType.File)`
`97`	`97`	`{`
`98`	`98`	`return new FtpStorageFile(Path, item);`
`99`	`99`	`}`
`100`		`- if (item.Type is FtpFileSystemObjectType.Directory)`
	`100`	`+ if (item.Type is FtpObjectType.Directory)`
`101`	`101`	`{`
`102`	`102`	`return new FtpStorageFolder(Path, item);`
`103`	`103`	`}`
`@@ -133,11 +133,11 @@ public override IAsyncOperation<IReadOnlyList<IStorageItem>> GetItemsAsync()`
`133`	`133`	`var list = await ftpClient.GetListingAsync(FtpPath);`
`134`	`134`	`foreach (var item in list)`
`135`	`135`	`{`
`136`		`- if (item.Type is FtpFileSystemObjectType.File)`
	`136`	`+ if (item.Type is FtpObjectType.File)`
`137`	`137`	`{`
`138`	`138`	`items.Add(new FtpStorageFile(Path, item));`
`139`	`139`	`}`
`140`		`- else if (item.Type is FtpFileSystemObjectType.Directory)`
	`140`	`+ else if (item.Type is FtpObjectType.Directory)`
`141`	`141`	`{`
`142`	`142`	`items.Add(new FtpStorageFolder(Path, item));`
`143`	`143`	`}`
`@@ -186,7 +186,7 @@ public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredN`
`186`	`186`	`string remotePath = $"{FtpPath}/{desiredName}";`
`187`	`187`	`var ftpRemoteExists = options is CreationCollisionOption.ReplaceExisting ? FtpRemoteExists.Overwrite : FtpRemoteExists.Skip;`
`188`	`188`
`189`		`- var result = await ftpClient.UploadAsync(stream, remotePath, ftpRemoteExists);`
	`189`	`+ var result = await ftpClient.UploadStreamAsync(stream, remotePath, ftpRemoteExists);`
`190`	`190`	`if (result is FtpStatus.Success)`
`191`	`191`	`{`
`192`	`192`	`return new FtpStorageFile(new StorageFileWithPath(null, $"{Path}/{desiredName}"));`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using SevenZip;`
`6`	`6`	`using System;`
`7`	`7`	`using System.Collections.Generic;`
	`8`	`+using System.Collections.Concurrent;`
`8`	`9`	`using System.IO;`
`9`	`10`	`using System.Linq;`
`10`	`11`	`using System.Runtime.InteropServices.WindowsRuntime;`
`@@ -72,7 +73,7 @@ public static bool IsZipPath(string path, bool includeRoot = true)`
`72`	`73`	`return (marker == path.Length && includeRoot) \|\| (marker < path.Length && path[marker] is '\\');`
`73`	`74`	`}`
`74`	`75`
`75`		`- private static Dictionary<string, Task<bool>> defaultAppDict = new Dictionary<string, Task<bool>>();`
	`76`	`+ private static ConcurrentDictionary<string, Task<bool>> defaultAppDict = new();`
`76`	`77`	`public static async Task<bool> CheckDefaultZipApp(string filePath)`
`77`	`78`	`{`
`78`	`79`	`Func<Task<bool>> queryFileAssoc = async () =>`
`@@ -81,11 +82,11 @@ public static async Task<bool> CheckDefaultZipApp(string filePath)`
`81`	`82`	`if (assoc != null)`
`82`	`83`	`{`
`83`	`84`	`return assoc == Package.Current.Id.FamilyName`
`84`		`- \|\| assoc.Equals(System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "explorer.exe"), StringComparison.OrdinalIgnoreCase);`
	`85`	`+ \|\| assoc.Equals(IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "explorer.exe"), StringComparison.OrdinalIgnoreCase);`
`85`	`86`	`}`
`86`	`87`	`return true;`
`87`	`88`	`};`
`88`		`- var ext = System.IO.Path.GetExtension(filePath)?.ToLowerInvariant();`
	`89`	`+ var ext = IO.Path.GetExtension(filePath)?.ToLowerInvariant();`
`89`	`90`	`return await defaultAppDict.GetAsync(ext, queryFileAssoc);`
`90`	`91`	`}`
`91`	`92`