Feature: Added support for displaying all network folders on the sidebar

src/Files.App/Data/Contracts/INetworkDrivesService.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage.LocatableStorage;
-
 namespace Files.App.Data.Contracts
 {
 	public interface INetworkDrivesService
@@ -16,7 +14,7 @@ public interface INetworkDrivesService
 		/// Enumerates network storage drives.
 		/// </summary>
 		/// <returns>A collection of network storage devices</returns>
-		IAsyncEnumerable<ILocatableFolder> GetDrivesAsync();
+		Task<IEnumerable<ILocatableFolder>> GetDrivesAsync();
 
 		/// <summary>
 		/// Updates network storage drives to up-to-date.

src/Files.App/Data/Items/DriveItem.cs

@@ -118,14 +118,9 @@ public DriveType Type
 			get => type; set
 			{
 				type = value;
-				if (value == DriveType.Network)
-				{
-					ToolTip = "Network".GetLocalizedResource();
-				}
-				else if (value == DriveType.CloudDrive)
-				{
+
+				if (value is DriveType.Network or DriveType.CloudDrive)
 					ToolTip = Text;
-				}
 			}
 		}
 

src/Files.App/Services/NetworkDrivesService.cs

@@ -5,14 +5,15 @@
 using System.Text;
 using Vanara.InteropServices;
 using Vanara.PInvoke;
-using Vanara.Windows.Shell;
 using static Vanara.PInvoke.AdvApi32;
 using static Vanara.PInvoke.Mpr;
 
 namespace Files.App.Services
 {
 	public sealed class NetworkDrivesService : ObservableObject, INetworkDrivesService
 	{
+		private readonly static string guid = "::{f02c1a0d-be21-4350-88b0-7367fc96ef3c}";
+
 		private ObservableCollection<ILocatableFolder> _Drives;
 		/// <inheritdoc/>
 		public ObservableCollection<ILocatableFolder> Drives
@@ -49,40 +50,16 @@ public NetworkDrivesService()
 		}
 
 		/// <inheritdoc/>
-		public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
+		public async Task<IEnumerable<ILocatableFolder>> GetDrivesAsync()
 		{
-			var networkLocations = await Win32Helper.StartSTATask(() =>
-			{
-				var locations = new List<ShellLinkItem>();
-				using (var netHood = new ShellFolder(Shell32.KNOWNFOLDERID.FOLDERID_NetHood))
-				{
-					foreach (var item in netHood)
-					{
-						if (item is ShellLink link)
-						{
-							locations.Add(ShellFolderExtensions.GetShellLinkItem(link));
-						}
-						else
-						{
-							var linkPath = (string?)item?.Properties["System.Link.TargetParsingPath"];
-							if (linkPath is not null)
-							{
-								var linkItem = ShellFolderExtensions.GetShellFileItem(item);
-								locations.Add(new(linkItem) { TargetPath = linkPath });
-							}
-						}
-					}
-				}
-
-				return locations;
-			});
+			var result = await Win32Helper.GetShellFolderAsync(guid, false, true, 0, int.MaxValue);
 
-			foreach (var item in networkLocations ?? Enumerable.Empty<ShellLinkItem>())
+			return result.Enumerate.Where(item => item.IsFolder).Select(item =>
 			{
 				var networkItem = new DriveItem()
 				{
-					Text = SystemIO.Path.GetFileNameWithoutExtension(item.FileName),
-					Path = item.TargetPath,
+					Text = item.FileName,
+					Path = item.FilePath,
 					DeviceID = item.FilePath,
 					Type = DriveType.Network,
 					ItemType = NavigationControlItemType.Drive,
@@ -95,8 +72,9 @@ public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
 					ShowShellItems = true,
 					ShowProperties = true,
 				};
-				yield return networkItem;
-			}
+
+				return networkItem;
+			});
 		}
 
 		/// <inheritdoc/>
@@ -107,7 +85,7 @@ public async Task UpdateDrivesAsync()
 				_Drives.Single(x => x is DriveItem o && o.DeviceID == "network-folder")
 			};
 
-			await foreach (ILocatableFolder item in GetDrivesAsync())
+			foreach (ILocatableFolder item in await GetDrivesAsync())
 				unsortedDrives.Add(item);
 
 			var orderedDrives =