Merge branch 'files-community:main' into main

mrashutoshnigam · web-flow · commit be62356c9477 · 2025-03-11T09:47:20.000+05:30
diff --git a/.github/workflows/cd-sideload-preview.yml b/.github/workflows/cd-sideload-preview.yml
@@ -88,6 +88,7 @@ jobs:
       shell: pwsh
       run: |
         msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -t:Build `
         -p:Platform=$env:PLATFORM `
         -p:Configuration=$env:CONFIGURATION `
         -v:quiet
diff --git a/.github/workflows/cd-sideload-stable.yml b/.github/workflows/cd-sideload-stable.yml
@@ -88,6 +88,7 @@ jobs:
       shell: pwsh
       run: |
         msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -t:Build `
         -p:Platform=$env:PLATFORM `
         -p:Configuration=$env:CONFIGURATION `
         -v:quiet
diff --git a/.github/workflows/cd-store-preview.yml b/.github/workflows/cd-store-preview.yml
@@ -85,6 +85,7 @@ jobs:
       shell: pwsh
       run: |
         msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -t:Build `
         -p:Platform=$env:PLATFORM `
         -p:Configuration=$env:CONFIGURATION `
         -v:quiet
diff --git a/.github/workflows/cd-store-stable.yml b/.github/workflows/cd-store-stable.yml
@@ -85,6 +85,7 @@ jobs:
       shell: pwsh
       run: |
         msbuild "$env:LAUNCHER_PROJECT_PATH" `
+        -t:Build `
         -p:Platform=$env:PLATFORM `
         -p:Configuration=$env:CONFIGURATION `
         -v:quiet
diff --git a/global.json b/global.json
@@ -3,4 +3,4 @@
     "version": "9.0.200",
     "rollForward": "latestMajor"
   }
-}
+}
diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest
@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.9.1.0" />
+        Version="3.9.2.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>
diff --git a/src/Files.App.CsWin32/Windows.Win32.ComPtr.cs b/src/Files.App.CsWin32/Windows.Win32.ComPtr.cs
@@ -12,7 +12,7 @@ namespace Windows.Win32
 	/// <summary>
 	/// Contains a COM pointer and a set of methods to work with the pointer safely.
 	/// </summary>
-	public unsafe struct ComPtr<T> : IDisposable where T : unmanaged
+	public unsafe struct ComPtr<T> : IDisposable where T : unmanaged, IComIID
 	{
 		private T* _ptr;
 
@@ -40,11 +40,10 @@ public ComPtr(T* ptr)
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public readonly ComPtr<U> As<U>() where U : unmanaged
+		public readonly ComPtr<U> As<U>() where U : unmanaged, IComIID
 		{
 			ComPtr<U> ptr = default;
-			Guid iid = typeof(U).GUID;
-			((IUnknown*)_ptr)->QueryInterface(&iid, (void**)ptr.GetAddressOf());
+			((IUnknown*)_ptr)->QueryInterface((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in U.Guid)), (void**)ptr.GetAddressOf());
 			return ptr;
 		}
 
diff --git a/src/Files.App/Actions/Content/Background/BaseSetAsAction.cs b/src/Files.App/Actions/Content/Background/BaseSetAsAction.cs
@@ -34,9 +34,9 @@ protected async void ShowErrorDialog(string message)
 		{
 			var errorDialog = new ContentDialog()
 			{
-				Title = "FailedToSetBackground".GetLocalizedResource(),
+				Title = Strings.FailedToSetBackground.GetLocalizedResource(),
 				Content = message,
-				PrimaryButtonText = "OK".GetLocalizedResource(),
+				PrimaryButtonText = Strings.OK.GetLocalizedResource(),
 			};
 
 			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
diff --git a/src/Files.App/Actions/Content/Background/SetAsAppBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsAppBackgroundAction.cs
@@ -8,10 +8,10 @@ internal sealed partial class SetAsAppBackgroundAction : BaseSetAsAction
 		private readonly IAppearanceSettingsService AppearanceSettingsService = Ioc.Default.GetRequiredService<IAppearanceSettingsService>();
 
 		public override string Label
-			=> "SetAsAppBackground".GetLocalizedResource();
+			=> Strings.SetAsAppBackground.GetLocalizedResource();
 
 		public override string Description
-			=> "SetAsAppBackgroundDescription".GetLocalizedResource();
+			=> Strings.SetAsAppBackgroundDescription.GetLocalizedResource();
 
 		public override RichGlyph Glyph
 			=> new("\uE91B");
diff --git a/src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs
@@ -10,10 +10,10 @@ internal sealed partial class SetAsLockscreenBackgroundAction : BaseSetAsAction
 		private readonly IWindowsWallpaperService WindowsWallpaperService = Ioc.Default.GetRequiredService<IWindowsWallpaperService>();
 
 		public override string Label
-			=> "SetAsLockscreen".GetLocalizedResource();
+			=> Strings.SetAsLockscreen.GetLocalizedResource();
 
 		public override string Description
-			=> "SetAsLockscreenBackgroundDescription".GetLocalizedResource();
+			=> Strings.SetAsLockscreenBackgroundDescription.GetLocalizedResource();
 
 		public override RichGlyph Glyph
 			=> new("\uEE3F");
diff --git a/src/Files.App/Actions/Content/Background/SetAsSlideshowBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsSlideshowBackgroundAction.cs
@@ -10,10 +10,10 @@ internal sealed partial class SetAsSlideshowBackgroundAction : BaseSetAsAction
 		private readonly IWindowsWallpaperService WindowsWallpaperService = Ioc.Default.GetRequiredService<IWindowsWallpaperService>();
 
 		public override string Label
-			=> "SetAsSlideshow".GetLocalizedResource();
+			=> Strings.SetAsSlideshow.GetLocalizedResource();
 
 		public override string Description
-			=> "SetAsSlideshowBackgroundDescription".GetLocalizedResource();
+			=> Strings.SetAsSlideshowBackgroundDescription.GetLocalizedResource();
 
 		public override RichGlyph Glyph
 			=> new("\uE91B");
diff --git a/src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs b/src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs
@@ -8,10 +8,10 @@ namespace Files.App.Actions
 	internal sealed partial class SetAsWallpaperBackgroundAction : BaseSetAsAction
 	{
 		public override string Label
-			=> "SetAsBackground".GetLocalizedResource();
+			=> Strings.SetAsBackground.GetLocalizedResource();
 
 		public override string Description
-			=> "SetAsWallpaperBackgroundDescription".GetLocalizedResource();
+			=> Strings.SetAsWallpaperBackgroundDescription.GetLocalizedResource();
 
 		public override RichGlyph Glyph
 			=> new("\uE91B");
diff --git a/src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs b/src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs
@@ -8,10 +8,10 @@ namespace Files.App.Actions
 	internal sealed partial class RotateLeftAction : BaseRotateAction
 	{
 		public override string Label
-			=> "RotateLeft".GetLocalizedResource();
+			=> Strings.RotateLeft.GetLocalizedResource();
 
 		public override string Description
-			=> "RotateLeftDescription".GetLocalizedResource();
+			=> Strings.RotateLeftDescription.GetLocalizedResource();
 
 		public override RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.ACW");
diff --git a/src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs b/src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs
@@ -8,10 +8,10 @@ namespace Files.App.Actions
 	internal sealed partial class RotateRightAction : BaseRotateAction
 	{
 		public override string Label
-			=> "RotateRight".GetLocalizedResource();
+			=> Strings.RotateRight.GetLocalizedResource();
 
 		public override string Description
-			=> "RotateRightDescription".GetLocalizedResource();
+			=> Strings.RotateRightDescription.GetLocalizedResource();
 
 		public override RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.CW");
diff --git a/src/Files.App/Dialogs/ReleaseNotesDialog.xaml.cs b/src/Files.App/Dialogs/ReleaseNotesDialog.xaml.cs
@@ -68,6 +68,7 @@ private ContentDialog SetContentDialogRoot(ContentDialog contentDialog)
 
 		private async void BlogPostWebView_CoreWebView2Initialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
 		{
+			BlogPostWebView.CoreWebView2.Profile.PreferredColorScheme = (CoreWebView2PreferredColorScheme)RootAppElement.RequestedTheme;
 			BlogPostWebView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
 			BlogPostWebView.CoreWebView2.Settings.AreDevToolsEnabled = false;
 			BlogPostWebView.CoreWebView2.Settings.AreBrowserAcceleratorKeysEnabled = false;
diff --git a/src/Files.App/MainWindow.xaml.cs b/src/Files.App/MainWindow.xaml.cs
@@ -6,7 +6,9 @@
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
+using System.IO;
 using System.Runtime.InteropServices;
+using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Storage;
 using IO = System.IO;
@@ -63,7 +65,8 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 				case ILaunchActivatedEventArgs launchArgs:
 					if (launchArgs.Arguments is not null &&
 						(CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files-dev.exe", StringComparison.OrdinalIgnoreCase)
-						|| CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files-dev", StringComparison.OrdinalIgnoreCase)))
+						|| CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files-dev", StringComparison.OrdinalIgnoreCase)
+						|| CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].Equals(Path.Join(Package.Current.InstalledLocation.Path, "Files.App", "Files.exe"), StringComparison.OrdinalIgnoreCase)))
 					{
 						// WINUI3: When launching from commandline the argument is not ICommandLineActivatedEventArgs (#10370)
 						var ppm = CommandLineParser.ParseUntrustedCommands(launchArgs.Arguments);
diff --git a/src/Files.App/Services/Windows/WindowsQuickAccessService.cs b/src/Files.App/Services/Windows/WindowsQuickAccessService.cs
@@ -26,7 +26,12 @@ public async Task<IEnumerable<ShellFileItem>> GetPinnedFoldersAsync()
 		private async Task PinToSidebarAsync(string[] folderPaths, bool doUpdateQuickAccessWidget)
 		{
 			foreach (string folderPath in folderPaths)
-				await ContextMenu.InvokeVerb("pintohome", [folderPath]);
+			{
+				// make sure that the item has not yet been pinned
+				// the verb 'pintohome' is for both adding and removing
+				if (!IsItemPinned(folderPath))
+					await ContextMenu.InvokeVerb("pintohome", folderPath);
+			}
 
 			await App.QuickAccessManager.Model.LoadAsync();
 			if (doUpdateQuickAccessWidget)
diff --git a/src/Files.App/Strings/hy-AM/Resources.resw b/src/Files.App/Strings/hy-AM/Resources.resw
diff --git a/src/Files.App/Strings/ja-JP/Resources.resw b/src/Files.App/Strings/ja-JP/Resources.resw
diff --git a/src/Files.App/Strings/vi/Resources.resw b/src/Files.App/Strings/vi/Resources.resw
diff --git a/src/Files.App/Strings/zh-Hans/Resources.resw b/src/Files.App/Strings/zh-Hans/Resources.resw
diff --git a/src/Files.App/Utils/CommandLine/CommandLineParser.cs b/src/Files.App/Utils/CommandLine/CommandLineParser.cs
diff --git a/src/Files.App/Utils/Global/QuickAccessManager.cs b/src/Files.App/Utils/Global/QuickAccessManager.cs
diff --git a/src/Files.App/Utils/Storage/Helpers/SyncRootHelpers.cs b/src/Files.App/Utils/Storage/Helpers/SyncRootHelpers.cs
diff --git a/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs b/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`"version": "9.0.200",`
`4`	`4`	`"rollForward": "latestMajor"`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Windows.Win32`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Contains a COM pointer and a set of methods to work with the pointer safely.`
`14`	`14`	`/// </summary>`
`15`		`- public unsafe struct ComPtr<T> : IDisposable where T : unmanaged`
	`15`	`+ public unsafe struct ComPtr<T> : IDisposable where T : unmanaged, IComIID`
`16`	`16`	`{`
`17`	`17`	`private T* _ptr;`
`18`	`18`
`@@ -40,11 +40,10 @@ public ComPtr(T* ptr)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`43`		`- public readonly ComPtr<U> As<U>() where U : unmanaged`
	`43`	`+ public readonly ComPtr<U> As<U>() where U : unmanaged, IComIID`
`44`	`44`	`{`
`45`	`45`	`ComPtr<U> ptr = default;`
`46`		`- Guid iid = typeof(U).GUID;`
`47`		`- ((IUnknown)_ptr)->QueryInterface(&iid, (void*)ptr.GetAddressOf());`
	`46`	`+ ((IUnknown)_ptr)->QueryInterface((Guid)Unsafe.AsPointer(ref Unsafe.AsRef(in U.Guid)), (void**)ptr.GetAddressOf());`
`48`	`47`	`return ptr;`
`49`	`48`	`}`
`50`	`49`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ protected async void ShowErrorDialog(string message)`
`34`	`34`	`{`
`35`	`35`	`var errorDialog = new ContentDialog()`
`36`	`36`	`{`
`37`		`- Title = "FailedToSetBackground".GetLocalizedResource(),`
	`37`	`+ Title = Strings.FailedToSetBackground.GetLocalizedResource(),`
`38`	`38`	`Content = message,`
`39`		`- PrimaryButtonText = "OK".GetLocalizedResource(),`
	`39`	`+ PrimaryButtonText = Strings.OK.GetLocalizedResource(),`
`40`	`40`	`};`
`41`	`41`
`42`	`42`	`if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))`