Merge branch 'main' into nav

Author: el-ev

Files.sln

@@ -626,4 +626,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0E62043C-A7A1-4982-9EC9-4CDB2939B776}
 	EndGlobalSection
-EndGlobal
+EndGlobal

builds/azure-pipelines-release.yml

@@ -121,7 +121,7 @@ jobs:
   - task: UseDotNet@2
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.0.303
       includePreviewVersions: false
 
   - task: CmdLine@2

src/Files.App (Package)/Package.appxmanifest

@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.6.17.0" />
+        Version="3.7.3.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>

src/Files.App.CsWin32/NativeMethods.json

@@ -4,7 +4,7 @@
 	"public": true,
 	"comInterop": {
 		"preserveSigMethods": [
-			"IEnumShellItems.Next"
+			"*"
 		]
 	}
 }

src/Files.App/Actions/FileSystem/OpenItemAction.cs

@@ -22,11 +22,9 @@ public RichGlyph Glyph
 		public HotKey HotKey
 			=> new(Keys.Enter);
 
-		private const int MaxOpenCount = 10;
 
 		public bool IsExecutable =>
 			context.HasSelection &&
-			context.SelectedItems.Count <= MaxOpenCount &&
 			!(context.ShellPage is ColumnShellPage &&
 			context.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder);
 

src/Files.App/Actions/Navigation/NavigateHomeAction.cs

@@ -0,0 +1,46 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Actions
+{
+	internal sealed class NavigateHomeAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext context;
+
+		public string Label
+			=> "Home".GetLocalizedResource();
+
+		public string Description
+			=> "NavigateHomeDescription".GetLocalizedResource();
+
+		public RichGlyph Glyph
+			=> new("\uE80F");
+
+		public bool IsExecutable
+			=> context.PageType is not ContentPageTypes.Home;
+
+		public NavigateHomeAction()
+		{
+			context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+			context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public Task ExecuteAsync(object? parameter = null)
+		{
+			context.ShellPage!.NavigateHome();
+
+			return Task.CompletedTask;
+		}
+
+		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			switch (e.PropertyName)
+			{
+				case nameof(IContentPageContext.PageType):
+					OnPropertyChanged(nameof(IsExecutable));
+					break;
+			}
+		}
+	}
+}

src/Files.App/Data/Commands/ActionCommand.cs

@@ -145,7 +145,8 @@ public Task ExecuteAsync(object? parameter = null)
 		{
 			if (IsExecutable)
 			{
-				SentrySdk.Metrics.Increment("actions", tags: new Dictionary<string, string> { { "command", Code.ToString() } });
+				// Re-enable when Metris feature is available again
+				// SentrySdk.Metrics.Increment("actions", tags: new Dictionary<string, string> { { "command", Code.ToString() } });
 				return Action.ExecuteAsync(parameter);
 			}
 

src/Files.App/Data/Commands/Manager/CommandCodes.cs

@@ -179,6 +179,7 @@ public enum CommandCodes
 		NavigateBack,
 		NavigateForward,
 		NavigateUp,
+		NavigateHome,
 
 		// Other
 		DuplicateCurrentTab,

src/Files.App/Data/Commands/Manager/CommandManager.cs

@@ -175,6 +175,7 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand NavigateBack => commands[CommandCodes.NavigateBack];
 		public IRichCommand NavigateForward => commands[CommandCodes.NavigateForward];
 		public IRichCommand NavigateUp => commands[CommandCodes.NavigateUp];
+		public IRichCommand NavigateHome => commands[CommandCodes.NavigateHome];
 		public IRichCommand DuplicateCurrentTab => commands[CommandCodes.DuplicateCurrentTab];
 		public IRichCommand DuplicateSelectedTab => commands[CommandCodes.DuplicateSelectedTab];
 		public IRichCommand CloseTabsToTheLeftCurrent => commands[CommandCodes.CloseTabsToTheLeftCurrent];
@@ -366,6 +367,7 @@ public IEnumerator<IRichCommand> GetEnumerator() =>
 			[CommandCodes.NavigateBack] = new NavigateBackAction(),
 			[CommandCodes.NavigateForward] = new NavigateForwardAction(),
 			[CommandCodes.NavigateUp] = new NavigateUpAction(),
+			[CommandCodes.NavigateHome] = new NavigateHomeAction(),
 			[CommandCodes.DuplicateCurrentTab] = new DuplicateCurrentTabAction(),
 			[CommandCodes.DuplicateSelectedTab] = new DuplicateSelectedTabAction(),
 			[CommandCodes.CloseTabsToTheLeftCurrent] = new CloseTabsToTheLeftCurrentAction(),

src/Files.App/Data/Commands/Manager/ICommandManager.cs

@@ -164,6 +164,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand NavigateBack { get; }
 		IRichCommand NavigateForward { get; }
 		IRichCommand NavigateUp { get; }
+		IRichCommand NavigateHome { get; }
 
 		IRichCommand DuplicateCurrentTab { get; }
 		IRichCommand DuplicateSelectedTab { get; }