Merge upstream PT #7

.github/actions/spell-check/allow/code.txt

@@ -97,6 +97,7 @@ EXSEL
 HOLDENTER
 HOLDESC
 HOLDSPACE
+HOLDBACKSPACE
 KBDLLHOOKSTRUCT
 keyevent
 LAlt

.github/actions/spell-check/expect.txt

@@ -661,7 +661,6 @@ iid
 Iindex
 Ijwhost
 IKs
-iljxck
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
@@ -756,7 +755,6 @@ lastcodeanalysissucceeded
 Lastdevice
 LASTEXITCODE
 LAYOUTRTL
-lcb
 LCIDTo
 Lclean
 Ldone

.pipelines/loc/loc.yml

@@ -32,9 +32,9 @@ steps:
     TDBuildServiceConnection: $(TouchdownServiceConnection)
     authType: SubjectNameIssuer
     resourceFilePath: |
-     **\Resources.resx
-     **\Resource.resx
-     **\Resources.resw
+     src\**\Resources.resx
+     src\**\Resource.resx
+     src\**\Resources.resw
     outputDirectoryRoot: LocOutput
     appendRelativeDir: true
     pseudoSetting: Included

Directory.Packages.props

@@ -33,21 +33,21 @@
     <PackageVersion Include="MessagePack" Version="2.5.187" />
     <PackageVersion Include="Microsoft.CmdPal.Extensions.SDK" Version="0.0.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.1" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.1" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.1" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -73,26 +73,26 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.0" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.0" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.1" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.1" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.0" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.1" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.1" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
     <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
-    <PackageVersion Include="System.Management" Version="9.0.0" />
+    <PackageVersion Include="System.Management" Version="9.0.1" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.1" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.1" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.1" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />

NOTICE.md

@@ -1324,21 +1324,21 @@ EXHIBIT A -Mozilla Public License.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 2.5.187
-- Microsoft.Bcl.AsyncInterfaces 9.0.0
+- Microsoft.Bcl.AsyncInterfaces 9.0.1
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.0
+- Microsoft.Data.Sqlite 9.0.1
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
-- Microsoft.Extensions.DependencyInjection 9.0.0
-- Microsoft.Extensions.Hosting 9.0.0
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.0
-- Microsoft.Extensions.Logging 9.0.0
-- Microsoft.Extensions.Logging.Abstractions 9.0.0
+- Microsoft.Extensions.DependencyInjection 9.0.1
+- Microsoft.Extensions.Hosting 9.0.1
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.1
+- Microsoft.Extensions.Logging 9.0.1
+- Microsoft.Extensions.Logging.Abstractions 9.0.1
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.0
-- Microsoft.Windows.Compatibility 9.0.0
+- Microsoft.Win32.SystemEvents 9.0.1
+- Microsoft.Windows.Compatibility 9.0.1
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.1.5
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
@@ -1356,25 +1356,25 @@ EXHIBIT A -Mozilla Public License.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.0
+- System.CodeDom 9.0.1
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.0
-- System.Configuration.ConfigurationManager 9.0.0
-- System.Data.OleDb 9.0.0
+- System.ComponentModel.Composition 9.0.1
+- System.Configuration.ConfigurationManager 9.0.1
+- System.Data.OleDb 9.0.1
 - System.Data.SqlClient 4.8.6
-- System.Diagnostics.EventLog 9.0.0
-- System.Diagnostics.PerformanceCounter 9.0.0
-- System.Drawing.Common 9.0.0
+- System.Diagnostics.EventLog 9.0.1
+- System.Diagnostics.PerformanceCounter 9.0.1
+- System.Drawing.Common 9.0.1
 - System.IO.Abstractions 21.0.29
 - System.IO.Abstractions.TestingHelpers 21.0.29
-- System.Management 9.0.0
+- System.Management 9.0.1
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.0
-- System.ServiceProcess.ServiceController 9.0.0
-- System.Text.Encoding.CodePages 9.0.0
-- System.Text.Json 9.0.0
+- System.Runtime.Caching 9.0.1
+- System.ServiceProcess.ServiceController 9.0.1
+- System.Text.Encoding.CodePages 9.0.1
+- System.Text.Json 9.0.1
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

README.md

@@ -1,6 +1,6 @@
 # Microsoft PowerToys
 
-![Hero image for Microsoft PowerToys](doc/images/overview/PT_holiday_hero_image.png)
+![Hero image for Microsoft PowerToys](doc/images/overview/PT_hero_image.png)
 
 [How to use PowerToys][usingPowerToys-docs-link] | [Downloads & Release notes][github-release-link] | [Contributing to PowerToys](#contributing) | [What's Happening](#whats-happening) | [Roadmap](#powertoys-roadmap)
 
@@ -20,12 +20,6 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
 | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
 
-## 🎁⭐ PowerToys Advent calendar ⭐🎁
-
-We will be highlighting a cool utility each day for 24 days in December! To follow along, check out these threads:
-- https://bsky.app/profile/kaylacinnamon.bsky.social/post/3lcb7iljxck2o
-- https://x.com/cinnamon_msft/status/1863284610773246257
-
 ## Installing and running Microsoft PowerToys
 
 ### Requirements

doc/devdocs/modules/launcher/readme.md

@@ -1,19 +1,24 @@
 # Table of Contents
 1. [Architecture](/doc/devdocs/modules/launcher/architecture.md)
 2. [Debugging](/doc/devdocs/modules/launcher/debugging.md)
-3. [Project Structure](/doc/devdocs/modules/launcher/project_structure.md)
-4. [Telemetry](/doc/devdocs/modules/launcher/telemetry.md)
-5. Plugins
+3. [New Plugin Checklist](/doc/devdocs/modules/launcher/new-plugin-checklist.md)
+4. [Project Structure](/doc/devdocs/modules/launcher/project_structure.md)
+5. [Telemetry](/doc/devdocs/modules/launcher/telemetry.md)
+6. Plugins
     - [Overview](/doc/devdocs/modules/launcher/plugins/overview.md)
     - [Calculator](/doc/devdocs/modules/launcher/plugins/calculator.md)
     - [Folder](/doc/devdocs/modules/launcher/plugins/folder.md)
+    - [History](/doc/devdocs/modules/launcher/plugins/history.md)
     - [Indexer](/doc/devdocs/modules/launcher/plugins/indexer.md)
     - [OneNote](/doc/devdocs/modules/launcher/plugins/onenote.md)
     - [Program](/doc/devdocs/modules/launcher/plugins/program.md)
     - [Registry](/doc/devdocs/modules/launcher/plugins/registry.md)
     - [Shell](/doc/devdocs/modules/launcher/plugins/shell.md)
     - [Time and Date](/doc/devdocs/modules/launcher/plugins/timedate.md)
-    - [Windows System Commands](/doc/devdocs/modules/launcher/plugins/system.md)
+    - [Unit Converter](/doc/devdocs/modules/launcher/plugins/community.unitconverter.md)
     - [Uri](/doc/devdocs/modules/launcher/plugins/uri.md)
-    - [Window Walker](/doc/devdocs/modules/launcher/plugins/windowwalker.md)
+    - [Value Generator](/doc/devdocs/modules/launcher/plugins/community.valuegenerator.md)
     - [Web Search](/doc/devdocs/modules/launcher/plugins/WebSearch.md)
+    - [Windows Settings](/doc/devdocs/modules/launcher/plugins/windowssettings.md)
+    - [Windows System Commands](/doc/devdocs/modules/launcher/plugins/system.md)
+    - [Window Walker](/doc/devdocs/modules/launcher/plugins/windowwalker.md)

src/Monaco/index.html

@@ -9,17 +9,19 @@
         // `theme` can be "vs" for light theme or "vs-dark" for dark theme
         // `lang` is the language of the file
         // `wrap` if the editor is wrapping or not
+        // `minimap` if the minimap is shown
+        // `contextMenu` whether to use the Monaco context menu. The built-in context menu
+        //               doesn't work in Peek, so we set this to false and create a custom one
 
         var theme = ("[[PT_THEME]]" == "dark") ? "vs-dark" : "vs";
+        var wrap = [[PT_WRAP]];
+        var minimap = [[PT_MINIMAP]];
+        var stickyScroll = [[PT_STICKY_SCROLL]];
+        var fontSize = [[PT_FONT_SIZE]];
+
         var lang = "[[PT_LANG]]";
-        var wrap = ([[PT_WRAP]] == 1) ? true : false;
-
         var base64code = "[[PT_CODE]]";
-
-        var stickyScroll = ([[PT_STICKY_SCROLL]] == 1) ? true : false;
-
-        var fontSize = [[PT_FONT_SIZE]];
-        var contextMenu = ([[PT_CONTEXTMENU]] == 1) ? true : false;
+        var contextMenu = [[PT_CONTEXTMENU]];
 
         var editor;
 
@@ -29,12 +31,13 @@
         }).join(''));
 
         function runToggleTextWrapCommand() {
-            if (wrap) {
-                editor.updateOptions({ wordWrap: 'off' })
-            } else {
-                editor.updateOptions({ wordWrap: 'on' })
-            }
             wrap = !wrap;
+            editor.updateOptions({ wordWrap: wrap ? 'on' : 'off' });
+        }
+
+        function runToggleMinimap() {
+            minimap = !minimap;
+            editor.updateOptions({minimap: {enabled: minimap}});
         }
 
         function runCopyCommand() {
@@ -99,8 +102,8 @@
                 language: lang, // Sets language of the code
                 readOnly: true, // Sets to readonly
                 theme: 'theme', // Sets editor theme
-                minimap: { enabled: false }, // Disables minimap
-                lineNumbersMinChars: '3', // Width of the line numbers
+                minimap: { enabled: minimap }, // Controls if minimap is shown
+                lineNumbersMinChars: 3, // Width of the line numbers
                 contextmenu: contextMenu,
                 scrollbar: {
                     // Deactivate shadows
@@ -135,10 +138,20 @@
                 contextMenuOrder: 100,
 
                 // Method that will be executed when the action is triggered.
-                // @param editor The editor instance is passed in as a convenience
-                run: function (ed) {
-                    runToggleTextWrapCommand();
-                }
+                run: runToggleTextWrapCommand
+            });
+
+            editor.addAction({
+                id: 'toggle-minimap',
+
+                label: 'Toggle minimap',
+
+                contextMenuGroupId: 'cutcopypaste',
+
+                contextMenuOrder: 100,
+
+                // Method that will be executed when the action is triggered.
+                run: runToggleMinimap
             });
 
             onContextMenu();
@@ -166,4 +179,4 @@
         }
     </script>
 </body>
-</html>
+</html>

src/common/FilePreviewCommon/Formatters/FilePreviewJsonSerializerContext.cs

@@ -7,7 +7,6 @@
 
 namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
 
-[JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(JsonDocument))]
 internal sealed partial class FilePreviewJsonSerializerContext : JsonSerializerContext
 {

src/common/FilePreviewCommon/Formatters/JsonFormatter.cs

@@ -14,9 +14,12 @@ public class JsonFormatter : IFormatter
 
         private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
         {
+            WriteIndented = true,
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
         };
 
+        private static readonly FilePreviewJsonSerializerContext _filePreviewJsonSerializerContext = new(_serializerOptions);
+
         /// <inheritdoc/>
         public string Format(string value)
         {
@@ -27,8 +30,7 @@ public string Format(string value)
 
             using (var jDocument = JsonDocument.Parse(value, new JsonDocumentOptions { CommentHandling = JsonCommentHandling.Skip }))
             {
-                FilePreviewJsonSerializerContext context = new(_serializerOptions);
-                return JsonSerializer.Serialize(jDocument, context.JsonDocument);
+                return JsonSerializer.Serialize(jDocument, _filePreviewJsonSerializerContext.JsonDocument);
             }
         }
     }

src/common/ManagedCommon/NativeMethods.cs

@@ -42,6 +42,9 @@ internal static class NativeMethods
         [DllImport("user32.dll")]
         internal static extern uint SendInput(uint nInputs, INPUT[] pInputs, int cbSize);
 
+        [DllImport("dwmapi")]
+        internal static extern IntPtr DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMarInset);
+
         [StructLayout(LayoutKind.Sequential)]
         public struct INPUT
         {
@@ -100,5 +103,14 @@ internal enum INPUTTYPE : uint
             INPUT_KEYBOARD = 1,
             INPUT_HARDWARE = 2,
         }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct MARGINS
+        {
+            public int cxLeftWidth;
+            public int cxRightWidth;
+            public int cyTopHeight;
+            public int cyBottomHeight;
+        }
     }
 }

src/common/Common.UI/OSVersionHelper.cs → src/common/ManagedCommon/OSVersionHelper.cs

@@ -4,10 +4,15 @@
 
 using System;
 
-namespace Common.UI
+namespace ManagedCommon
 {
     public static class OSVersionHelper
     {
+        public static bool IsWindows10()
+        {
+            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Minor < 22000;
+        }
+
         public static bool IsWindows11()
         {
             return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;