Skip to content

Commit 1b1d65e

Browse files
stefansjfwdonlaciSeraphimaZykovadonlacimantaionut
authored
Merge upstream PT microsoft#7 (microsoft#330)
* [Workspaces] implement the move feature (microsoft#35480) * [Workspaces] Add move functionality * spell checker * [Workspaces] Modify Arranger to move apps without launch * moved ipc helper * removed callback * use LauncherStatus in WindowArranger * wait for launching next app * launch in a separate thread and protect by mutexes * update app version in advance * changed canceling launch * increased waiting time * Fix optional parameter load from json * changed arranger waiting time * additional waiting time for Outlook * added app id * ensure ids before launch * set id in editor * minor updates * [Workspaces] Move: Get the nearest window when moving a window * [Workspaces] convert optional boolean to enum to avoid json problems * Handle case when the new Application Property "moveIfExists" does not exist * Re-implementing app-window pairing for moving feature. * spell checker * XAML formatting * Fixing bug: IPC message not arriving * spell checker * Removing app-level-setting for move app. Also fixed compiler errors due styling. * Updating editor window layout * Re-implementing window positioning UI elements * XAML formatting * Code review findings * Code cleanup * Code cleanup * Code cleanup * code cleanup * Code cleanup * Code cleanup * fix Move attribute after launch and snapshot * Extend WindowArranger with PWA functionality to detect different PWA apps. PwaHelper moved to the common library * fix repeat counter in the editor * Code optimization * code cleanup, optimization * fix double-processing window --------- Co-authored-by: Seraphima <[email protected]> Co-authored-by: donlaci <[email protected]> * [KeyboardManager]Fix mapping shift to numpad (microsoft#35890) * Keyboard Manger fix numpad as shift Fixed shift not being released if a numpad key as shift. * Added comments * Fix typo * Fix the numpad unlocked key not working if the locked version is overridden by shift * Fix spelling check. * Revert the VK_CLEAR change. --------- Co-authored-by: Jaime Bernardo <[email protected]> * [Analyzers] Update .editorconfig with rules to relax IDE errors (microsoft#36095) * [Analyzers] Remove duplicate pascal case style from .editorconfig * [Analyzers] Configured severity for individual IDE and CA rules showing as errors in VS Set severity for IDE0005, IDE0008, IDE0016, IDE0018, IDE0019, IDE0021, IDE0022, IDE0023, IDE0025, IDE0027, IDE0028, IDE0029, IDE0031, IDE0032, IDE0034, IDE0036, IDE0039, IDE0042, IDE0044, IDE0045, IDE0046, IDE0047, IDE0057, IDE0051, IDE0052, IDE0054, IDE0055, IDE0056, IDE0057, IDE0059, IDE0060, IDE0061, IDE0063, IDE0071, IDE0073, IDE0074, IDE0075, IDE0077, IDE0078, IDE0083, IDE0090, IDE0100, IDE0130, IDE160, IDE180, IDE0200, IDE0240, IDE0250, IDE0251, IDE0260, IDE0270, IDE0290, IDE0300, IDE0301, IDE0305, IDE1005, IDE1006, CA1859, CA2022, CA2263 * [Analyzers] Fix mismatched analyzer descriptions * [Analyzers] Fix misspelling * Update .editorconfig Made the following style rules `silent` instead of `suggestion`: - Use explicit type instead of 'var' - Use expression body for ... - Use block-scoped namespace * [Analyzers] Set IDE0290 to silent * [Analyzers] Remove IDE1006 configuration from .editorconfig in favor of making exclusions for the few entries * [Analyzers][Indexer] Add IDE1006 suppressions * [Analyzers][Peek] Add IDE1006 suppression * [Analyzers][MWB] Add IDE1006 suppression. * [Analyzers][Plugins] Add IDE1006 suppression * [Analyzers][ImageResizer] Suppress IDE0073 to retain original copyright * [Analyzers] Remove IDE0073 severity change in .editorconfig --------- Co-authored-by: Ani <[email protected]> * [Workspaces] PWA follow-up (microsoft#36217) * [PTRun][Calculator]Allow scientific notation with lowercase 'e' (microsoft#36187) * [Workspaces] Add encoder parameter to bitmap.save() (microsoft#36228) * [Workspaces] Add encoder parameter to bitmap.save() * 1 more call fixed * Move repeated code to the csharp library * [Workspaces] Implement store of app window's size and position (microsoft#36086) * [Workspaces] Implement store of app window's size and position * Modifying the default values to -1. The program will use the original default values for the first run. * [ScreenRuler]Add setting to show the measurement in an extra unit (microsoft#35887) * display ruler: supporting millimeter and other units * Measurement Tool: UI Setting for an extra unit * Update images * spelling * spelling * suit code style * Fix for code review * remove weird file * rename field * [Deps]Update MSTest from 3.5.0 to 3.6.3 (microsoft#36115) * Update MSTest from 3.5.0 to 3.6.3 * Use STA attributes that are now part of MSTest * Adding Jerry to community.md (microsoft#36232) Update COMMUNITY.md * [Workspaces] Arranger: smart timer (microsoft#36096) * [Workspaces] Add move functionality * spell checker * [Workspaces] Modify Arranger to move apps without launch * moved ipc helper * removed callback * use LauncherStatus in WindowArranger * wait for launching next app * launch in a separate thread and protect by mutexes * update app version in advance * changed canceling launch * increased waiting time * Fix optional parameter load from json * changed arranger waiting time * additional waiting time for Outlook * added app id * ensure ids before launch * set id in editor * minor updates * [Workspaces] Move: Get the nearest window when moving a window * [Workspaces] convert optional boolean to enum to avoid json problems * Handle case when the new Application Property "moveIfExists" does not exist * Re-implementing app-window pairing for moving feature. * spell checker * XAML formatting * Fixing bug: IPC message not arriving * spell checker * Removing app-level-setting for move app. Also fixed compiler errors due styling. * Updating editor window layout * Re-implementing window positioning UI elements * XAML formatting * Code review findings * Code cleanup * Code cleanup * Code cleanup * code cleanup * Code cleanup * Code cleanup * [Workspaces] Arranger: Reset wait timer after each successful arrange action * fix merge error --------- Co-authored-by: Seraphima <[email protected]> Co-authored-by: donlaci <[email protected]> * Upgrade to check-spelling v0.0.24 (microsoft#36235) This upgrades to [v0.0.24](https://github.com/check-spelling/check-spelling/releases/tag/v0.0.24). A number of GitHub APIs are being turned off shortly, so you need to upgrade or various uncertain outcomes will occur. There's a new accessibility forbidden pattern: > Do not use `(click) here` links > For more information, see: > * https://www.w3.org/QA/Tips/noClickHere > * https://webaim.org/techniques/hypertext/link_text > * https://granicus.com/blog/why-click-here-links-are-bad/ > * https://heyoka.medium.com/dont-use-click-here-f32f445d1021 ```pl (?i)(?:>|\[)(?:(?:click |)here|link|(?:read |)more)(?:</|\]\() ``` There are some minor bugs that I'm aware of and which I've fixed since this release, but I don't expect to make another release this month. I've added a pair of patterns for includes and pragmas. My argument is that the **compiler** will _generally_ tell you if you've misspelled an include and the **linker** will _generally_ tell you if you misspell a lib. - There's a caveat here: If your include case-insensitively matches the referenced file (but doesn't properly match it), then unless you either use a case-sensitive file system (as opposed to case-preserving) or beg clang to warn, you won't notice when you make this specific mistake -- this matters in that a couple of Windows headers (e.g. Unknwn.h) have particular case and repositories don't tend to consistently/properly write them. * Adjust to community.md, shifting jerry's github user name (microsoft#36242) Update COMMUNITY.md * [AOT compatible] Resolve AOT Build Error in Peek.UI (microsoft#36194) * add partial for aot support * add Microsoft.NET.ILLink.Tasks to packages.props * format * Revert "format" This reverts commit 742d5e2. * add Microsoft.NET.ILLink.Tasks to notice.md * add auto reference * update script to remove the 'Auto-reference line' --------- Co-authored-by: Jaime Bernardo <[email protected]> * Awake Updates - `TILLSON_11272024` (microsoft#36049) * Update with bug fixes for tray icon and support for parent process * Process information enum * Update the docs * Fix spelling * Make sure that PID is used in PT config flow * Logic for checks based on microsoft#34148 * Update with link to PR * Fixes microsoft#34717 * Small cleanup * Proper task segmentation in a function * Cleanup the code * Fix synchronization context issue * Update planning doc * Test disabling caching to see if that manages to pass CI * Cleanup to make sure that we're logging things properly. * Update ci.yml * Disable cache to pass CI * Retry logic * Cleanup * Code cleanup * Fixes microsoft#35848 * Update notes and codename * After third attempt, log error instead of throwing exception * More cleanup to avoid double execution * Add expected word * Safeguards for bad values for timed keep-awake * More updates to make sure I am using uint * Update error message * Update packages * Fix notice and revert CsWinRT upgrade * Codename update * Update expect.txt * Update the struct * Ensuring we're properly awaiting tray initialization * Update to make sure tray reflects the bound process * Cleanup, proper JSON serialization for logs. * Not needed. * Add command validation logic * Moving the initialization logic earlier * Make sure we show the display state in the tooltip * Update tray string * Update src/modules/awake/Awake/Core/Manager.cs Co-authored-by: Jaime Bernardo <[email protected]> * Update src/modules/awake/Awake/Core/Manager.cs Co-authored-by: Jaime Bernardo <[email protected]> * Update src/modules/awake/Awake/Core/Manager.cs Co-authored-by: Jaime Bernardo <[email protected]> * Update src/modules/awake/Awake/Core/Manager.cs Co-authored-by: Jaime Bernardo <[email protected]> * Update logic for icon resets * Update doc * Simplify function for setting mode shell icon * Issues should be properly linked * Minor cleanup * Update timed behavior --------- Co-authored-by: Jaime Bernardo <[email protected]> Co-authored-by: Clint Rutkas <[email protected]> * [Workspaces] detecting right app version (microsoft#36100) * [Workspaces] Add move functionality * spell checker * [Workspaces] Modify Arranger to move apps without launch * moved ipc helper * removed callback * use LauncherStatus in WindowArranger * wait for launching next app * launch in a separate thread and protect by mutexes * update app version in advance * changed canceling launch * increased waiting time * Fix optional parameter load from json * changed arranger waiting time * additional waiting time for Outlook * added app id * ensure ids before launch * set id in editor * minor updates * [Workspaces] Move: Get the nearest window when moving a window * [Workspaces] convert optional boolean to enum to avoid json problems * Handle case when the new Application Property "moveIfExists" does not exist * Re-implementing app-window pairing for moving feature. * spell checker * XAML formatting * Fixing bug: IPC message not arriving * spell checker * Removing app-level-setting for move app. Also fixed compiler errors due styling. * Updating editor window layout * Re-implementing window positioning UI elements * XAML formatting * Code review findings * Code cleanup * Code cleanup * Code cleanup * code cleanup * Code cleanup * Code cleanup * [Workspaces] fix detection of specific version of apps --------- Co-authored-by: Seraphima <[email protected]> Co-authored-by: donlaci <[email protected]> * Move the XamlStyler config to src/ (microsoft#36202) my never ending goal to minimize files in the root dir * [AdvancedPaste]Add Semantic Kernel opt-in to allow chaining of paste actions (microsoft#35902) * [AdvancedPaste] Semantic Kernel support * Changed log-line with potentially sensitive info * Spellcheck issues * Various improvements for Semantic Kernel * Spellcheck issue * Refactored Clipboard routines * Added integration tests for KernelService * Extra telemetry for AdvancedPaste * Added 'Hotkey' suffix to AdvancedPaste_Settings telemetry event * Added IsSavedQuery * Added KernelQueryCache * Refactoring * Added KernelQueryCache to BugReportTool delete list * Added opt-n for Semantic Kernel * Fixed bug with KernelQueryCache * Ability to view last AI chat message on error * Improved kernel query cache * Used System.IO.Abstractions and improved tests * Fixed under-count of token usage * Used Semantic Kernel icon * Cleanup * Add missing EndProject line * Fix dependency version conflicts * Fix NOTICE.md * Correct place of SemanticKernel in NOTICE.md * Unlinked CustomPreview toggle from AI * Added Microsoft.Bcl.AsyncInterfaces dependency to AdvancedPaste * Fixed NOTICE.md order * Moved Custom Preview to behaviour section * Made Image to Text raise error on empty output * Added AIServiceBatchIntegrationTests * Updated AIServiceBatchIntegrationTests * Added prompt moderation * Moved GPO Infobar to better location * [Launcher]Port from WPF-UI to .NET 9 WPF (microsoft#36215) * Initial implementation * Fix fluent style * Fix no endline * Update expect.txt * Fix formatting * Fix light theme looking bad on Windows 10 * fix formatting * test change * Now really fixed W10 * Add a comment * Fix typos * Fix spellcheck errors * Fix spellcheck pattern for websites * Change patterns for spellcheck in the right file * Fix XAML styling * Fix contrast colors on W11 * Fix formatting * Removed emty line * Fix formatting * Added comment to fluentHC file * fix comment * Fix Windows10 again. Adress feedback. * W11 fix chaning from high contrast to normal not having correct background * W10 Fix high contrast not working after switching from light/dark moed * Address feedback * Fix formatting * Second W11 fix chaning from high contrast to normal not having correct background * [UX]Updating New+ and Settings icons (microsoft#36290) * Updated icons * Updating more icons and icos * [Settings][Dashboard] Accessibility fixes (microsoft#36280) * make narrator announce buttons/toggles * add toggles module name * [ci]Sign OpenAI dll that's not signed (microsoft#36299) * Update CODEOWNERS to include gordon, jerry and kayla (microsoft#36308) * Update CODEOWNERS * Update names.txt * Making the powertoys-code-owners team code owners (microsoft#36310) * Update CODEOWNERS * Update names.txt * Update CODEOWNERS * [FZEditor]Fix Create new layout dialog radio buttons IsChecked values (microsoft#36320) * 0.87 changelog (microsoft#36335) * 0.87 changelog * Fix spellcheck * Update README.md Co-authored-by: Heiko <[email protected]> --------- Co-authored-by: Heiko <[email protected]> * [PTRun]Fix WPF transparent border issue on Windows 10 (microsoft#36392) * Added border on W10 * Added a comment --------- Co-authored-by: Davide Giacometti <[email protected]> * [PTRun]Fix .NET 9 crash in OneNote (microsoft#36417) * Fix crash in OneNote Run * added better comment * [AdvancedPaste]Fix NullReferenceException on Dispose (microsoft#36428) [AdvancedPaste] Fixed NullReferenceException on Dispose * [Fuzz] Add fuzz testing for AdvancedPaste and new pipeline for onboarding OneFuzz (microsoft#36329) * add fuzz * install .net8 * add spelling check * refine the pipeline * add readme and update the test code * fix spelling error * change to weekly run * Add New CI Pipeline for Latest WindowsAppSDK (microsoft#36282) This PR introduces the following changes to the CI pipeline and version management: Pipeline Enhancements: 1. Added a new script UpdateVersions.ps1 to automate the update of Microsoft.WindowsAppSDK versions across various project files. 2. Introduced a new pipeline configuration ci-using-the-latest-winappsdk.yml to build using the latest Microsoft.WindowsAppSDK. 3. Updated existing pipeline configurations to support the new useLatestWinAppSDK parameter. Pipeline Configuration Updates: 1. Updated job-build-project.yml to handle the useLatestWinAppSDK parameter and adjust the RestoreAdditionalProjectSourcesArg accordingly. 2. Added a new template steps-update-winappsdk-and-restore-nuget.yml for updating and restoring NuGet packages with the latest Microsoft.WindowsAppSDK. 3. Added WinAPPSDK version selection, the pipeline can be manually triggered to use the specified version. --------- Signed-off-by: Shawn Yuan <[email protected]> Co-authored-by: Clint Rutkas <[email protected]> * [AOT compatible] Make HostsUILib become AOT compatible (microsoft#36136) * Remove AOT configuration * Refer to AOT compatibility props --------- Co-authored-by: Yu Leng (from Dev Box) <[email protected]> * [AOT compatible] Clean up some AOT build issue in FilePreviewCommon and MarkdownPreviewHandler (microsoft#36207) * Use AppContext.BaseDirectory to replace assembly.GetExeAseembly.Location. Fix json serilizer aot issue. * clean up some AOT build issue * Update src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs Co-authored-by: Jeremy Sinclair <[email protected]> * Update src/common/FilePreviewCommon/Formatters/JsonFormatter.cs Co-authored-by: Jeremy Sinclair <[email protected]> --------- Co-authored-by: Yu Leng (from Dev Box) <[email protected]> Co-authored-by: Jeremy Sinclair <[email protected]> * Add new pipeline using the latest webview2 from Edge Canary (microsoft#36317) * using the latest webview2 for testing --------- Signed-off-by: Shawn Yuan <[email protected]> Co-authored-by: Clint Rutkas <[email protected]> * [Bug fix] Making the OpenAI key configuration page scrollable. (microsoft#36359) * Fixed microsoft#34470 --------- Signed-off-by: Shawn Yuan <[email protected]> * [Bug fix] Add a format validation step before format conversion. (microsoft#36404) This PR aims to fix the bug microsoft#35225 by introducing a new method IsJson to determine if a given text is in JSON format. The IsJson method is then utilized in the ToJsonFromXmlOrCsvAsync method to optimize the processing logic. If the text is already in JSON format, it is returned directly without further conversion from XML or CSV. Co-authored-by: Heiko <[email protected]> --------- Signed-off-by: Shawn Yuan <[email protected]> Co-authored-by: Heiko <[email protected]> * Add more STCA team members (microsoft#36438) * Add more STCA team members * Include more spelling check errors * Remove non-alpha in dictionary * Add Zhaopeng Wang * Fix spell checking error * Remove "prerelease: true" (microsoft#36484) * Remove "prerelease: true" The Microsoft.WinGet.DSC module is GA so prerelease: true is no longer needed. * Update expect.txt fixing spellcheck warning --------- Co-authored-by: Clint Rutkas <[email protected]> * [Docs]Update README for 0.87.1 release (microsoft#36534) * [CI] Enhance build Pipeline Reliability with Retry Logic and Improved Error Messaging (microsoft#36529) * update pipeline with retry * remove tests * Add team member (microsoft#36590) * [New+]Don't override New actions from Explorer on Windows 10 (microsoft#36467) * [New+]Don't override New actions from Explorer * Update src/modules/NewPlus/NewShellExtensionContextMenu.win10/shell_context_menu_win10.cpp * Update src/modules/NewPlus/NewShellExtensionContextMenu.win10/shell_context_menu_win10.cpp * Add pattern for learn.microsoft links * Also only Query for context menu * [PTRun][Calculator]Handle hexadecimal numbers to not return divide by 0 error (microsoft#36390) * add '0x' handling for divide by 0 scenarios * fix comment on division by 0 check --------- Co-authored-by: Connor Plante <[email protected]> * [TextExtractor]Minor UI/Accessibility fixes in the overlay UI (microsoft#36356) minor UI and accessibility fixes * [PTRun][Calculator]Update mages to v3.0.0 and support for `randi(n)` (microsoft#36560) * update to mages 3.0.0 * allow randi() in calculator plugin * fix tests and input validation * fix spell check * [QuickAccent]Added ć for Slovenian (microsoft#36336) (microsoft#36338) * Fix snapping Workspaces Editor to Fancy Zones (microsoft#36463) * Remove Workspaces Editor from Fancy Zone's excluded app list * removed unused string --------- Co-authored-by: Seraphima <[email protected]> * [PTRun]Fix drag on .NET 9 WPF (microsoft#36635) * [CQ]Continued to move stuff out of root - Solution.props (microsoft#36244) * [QuickAccent]Add Proto-Indo-European (microsoft#36408) * Add ḱ to PowerAccent for Proto-Indo-European * Fix Spelling Check * Add more letters to PIE * Order PIE after PI --------- Co-authored-by: Hao Liu (from Dev Box) <[email protected]> Co-authored-by: Jaime Bernardo <[email protected]> * [PTRun]Add context buttons for VSCodeWorkspaces plugin (microsoft#36517) * [Settings][QuickAccent]Change 'character set' to plural form (microsoft#36565) * [PTRun][Calculator]Fix unit tests on non-english systems (microsoft#36569) * fix tests * update comment * [PTRun][Calc]Improve handling of non-base 10 numbers (microsoft#36700) * [Settings][PTRun]Show plugin version and website (microsoft#36580) * [Monaco]Add support for .resx and .resw preview support. (microsoft#36499) Added support for .resx and .resw preview support. These files are XML based files so I added the file extensions as part of the registerAdditionalLanguage("xmlExt"...) function. * [Settings] Add Workspaces' workspaces.json file to backup/restore list (microsoft#36714) * [Localization] Fix loc pipeline to send downloaded localized files to TDBuild upon retry after failure (microsoft#36766) * [AdvancedPaste]Fixed issues with Screen Reader integration (microsoft#36778) * Remove Advent calendar from README (microsoft#36777) * Remove Advent calendar from README * Update hero image * Delete doc/images/overview/PT_holiday_hero_image.png * [AdvancedPaste]Add all BitmapDecoder supported image filetypes to ImageToText (microsoft#35600) Adds support to ImageToText for all image filetypes supported by BitmapDecoder. * [AOT]Clean up some AOT build issues in PowerAccent.Core (microsoft#36264) * init * Use AotCompatibility instead * Replace typeof(Lanaguge) with GetValues<Language> * Create new folder to place source generation context file. --------- Co-authored-by: Yu Leng (from Dev Box) <[email protected]> * [WinUI3]Fix Windows 10 title bar borders (microsoft#36429) * Fix borders for windows in the Settings UI * Fix HOSTS window * Fix Advanced Paste * Fix Environment Variables * Fix File Locksmith * Fix Peek, with a caveat * Fix Registry Preview * Remove unused imports * Clean up imports in OobeShellPage * Move OSVersionHelper from Common.UI up into ManagedCommon * [QuickAccent]Fix unstable language loading (microsoft#36721) * [Peek]Bring into foreground if previously minimized (microsoft#36506) Added Activate() to bring Peek.UI window into focus upon Toggle. This allows the UI to be presented even if it was previously minimized. * Update Run docs README (microsoft#36857) * Update Run docs README * Remove System dupe * [Monaco]Make minimap toggleable (microsoft#33742) * [Monaco]Fix Json format preview setting (microsoft#36867) * [KBM]Added option for exact match shortcut (microsoft#36000) * Added option for exact match shortcut * Fix spell-check * [Deps][Security]Update .NET Packages from 9.0.0 to 9.0.1 (microsoft#36879) * [Deps] Update NuGet packages to version 9.0.1 Updated several NuGet packages from version 9.0.0 to 9.0.1, including: - Microsoft.Data.Sqlite - Microsoft.Bcl.AsyncInterfaces - Microsoft.Extensions.DependencyInjection - Microsoft.Extensions.Logging - Microsoft.Extensions.Logging.Abstractions - Microsoft.Extensions.Hosting - Microsoft.Extensions.Hosting.WindowsServices - Microsoft.Win32.SystemEvents - Microsoft.Windows.Compatibility - System.CodeDom - System.ComponentModel.Composition - System.Configuration.ConfigurationManager - System.Data.OleDb - System.Diagnostics.EventLog - System.Diagnostics.PerformanceCounter - System.Drawing.Common - System.Management - System.Runtime.Caching - System.ServiceProcess.ServiceController - System.Text.Encoding.CodePages - System.Text.Json * [Deps] Update NOTICE.md * Fix bad merge * [check-spelling] Update metadata Update for https://github.com/zadjii-msft/PowerToys/actions/runs/12790673218/attempts/1 Accepted in zadjii-msft#330 (comment) Signed-off-by: check-spelling-bot <[email protected]> on-behalf-of: @check-spelling <[email protected]> --------- Signed-off-by: Shawn Yuan <[email protected]> Signed-off-by: check-spelling-bot <[email protected]> Co-authored-by: Laszlo Nemeth <[email protected]> Co-authored-by: Seraphima <[email protected]> Co-authored-by: donlaci <[email protected]> Co-authored-by: Ionuț Manța <[email protected]> Co-authored-by: Jaime Bernardo <[email protected]> Co-authored-by: Jeremy Sinclair <[email protected]> Co-authored-by: Ani <[email protected]> Co-authored-by: PesBandi <[email protected]> Co-authored-by: Wenjian Chern <[email protected]> Co-authored-by: Youssef Victor <[email protected]> Co-authored-by: Clint Rutkas <[email protected]> Co-authored-by: Josh Soref <[email protected]> Co-authored-by: leileizhang <[email protected]> Co-authored-by: Den Delimarsky 🔐 <[email protected]> Co-authored-by: Niels Laute <[email protected]> Co-authored-by: Davide Giacometti <[email protected]> Co-authored-by: Heiko <[email protected]> Co-authored-by: Shuai Yuan <[email protected]> Co-authored-by: moooyo <[email protected]> Co-authored-by: Yu Leng (from Dev Box) <[email protected]> Co-authored-by: Jerry Xu <[email protected]> Co-authored-by: Demitrius Nelon <[email protected]> Co-authored-by: Kai Tao <[email protected]> Co-authored-by: Connor Plante <[email protected]> Co-authored-by: Connor Plante <[email protected]> Co-authored-by: Domen Soklič <[email protected]> Co-authored-by: Hao Liu <[email protected]> Co-authored-by: Hao Liu (from Dev Box) <[email protected]> Co-authored-by: immi <[email protected]> Co-authored-by: Asif Islam <[email protected]> Co-authored-by: Kayla Cinnamon <[email protected]> Co-authored-by: Dave Rayment <[email protected]> Co-authored-by: Neil McAlister <[email protected]> Co-authored-by: Stefan Markovic <[email protected]>
1 parent d970a68 commit 1b1d65e

File tree

73 files changed

+543
-228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+543
-228
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ EXSEL
9797
HOLDENTER
9898
HOLDESC
9999
HOLDSPACE
100+
HOLDBACKSPACE
100101
KBDLLHOOKSTRUCT
101102
keyevent
102103
LAlt

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

-2
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,6 @@ iid
661661
Iindex
662662
Ijwhost
663663
IKs
664-
iljxck
665664
IMAGEHLP
666665
IMAGERESIZERCONTEXTMENU
667666
IMAGERESIZEREXT
@@ -756,7 +755,6 @@ lastcodeanalysissucceeded
756755
Lastdevice
757756
LASTEXITCODE
758757
LAYOUTRTL
759-
lcb
760758
LCIDTo
761759
Lclean
762760
Ldone

‎.pipelines/loc/loc.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ steps:
3232
TDBuildServiceConnection: $(TouchdownServiceConnection)
3333
authType: SubjectNameIssuer
3434
resourceFilePath: |
35-
**\Resources.resx
36-
**\Resource.resx
37-
**\Resources.resw
35+
src\**\Resources.resx
36+
src\**\Resource.resx
37+
src\**\Resources.resw
3838
outputDirectoryRoot: LocOutput
3939
appendRelativeDir: true
4040
pseudoSetting: Included

‎Directory.Packages.props

+21-21
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@
3333
<PackageVersion Include="MessagePack" Version="2.5.187" />
3434
<PackageVersion Include="Microsoft.CmdPal.Extensions.SDK" Version="0.0.1" />
3535
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
36-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0" />
36+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
3737
<!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
38-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
38+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
3939
<PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
40-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
41-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
42-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
43-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
44-
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
40+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
41+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
42+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
43+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
44+
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.1" />
4545
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
4646
<PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
4747
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
4848
<!-- 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. -->
49-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.0" />
50-
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
49+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.1" />
50+
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.1" />
5151
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
5252
<!-- 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. -->
5353
<!--
@@ -73,26 +73,26 @@
7373
<PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
7474
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
7575
<!-- 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. -->
76-
<PackageVersion Include="System.CodeDom" Version="9.0.0" />
76+
<PackageVersion Include="System.CodeDom" Version="9.0.1" />
7777
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
78-
<PackageVersion Include="System.ComponentModel.Composition" Version="9.0.0" />
79-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
80-
<PackageVersion Include="System.Data.OleDb" Version="9.0.0" />
78+
<PackageVersion Include="System.ComponentModel.Composition" Version="9.0.1" />
79+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
80+
<PackageVersion Include="System.Data.OleDb" Version="9.0.1" />
8181
<!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
8282
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
8383
<!-- 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. -->
84-
<PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.0" />
84+
<PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.1" />
8585
<!-- 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. -->
86-
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
87-
<PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
86+
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.1" />
87+
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
8888
<PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
8989
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
90-
<PackageVersion Include="System.Management" Version="9.0.0" />
90+
<PackageVersion Include="System.Management" Version="9.0.1" />
9191
<PackageVersion Include="System.Reactive" Version="6.0.1" />
92-
<PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
93-
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.0" />
94-
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.0" />
95-
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
92+
<PackageVersion Include="System.Runtime.Caching" Version="9.0.1" />
93+
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.1" />
94+
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.1" />
95+
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
9696
<PackageVersion Include="UnicodeInformation" Version="2.6.0" />
9797
<PackageVersion Include="UnitsNet" Version="5.56.0" />
9898
<PackageVersion Include="UTF.Unknown" Version="2.5.1" />

‎NOTICE.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -1324,21 +1324,21 @@ EXHIBIT A -Mozilla Public License.
13241324
- Mages 3.0.0
13251325
- Markdig.Signed 0.34.0
13261326
- MessagePack 2.5.187
1327-
- Microsoft.Bcl.AsyncInterfaces 9.0.0
1327+
- Microsoft.Bcl.AsyncInterfaces 9.0.1
13281328
- Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
1329-
- Microsoft.Data.Sqlite 9.0.0
1329+
- Microsoft.Data.Sqlite 9.0.1
13301330
- Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
1331-
- Microsoft.Extensions.DependencyInjection 9.0.0
1332-
- Microsoft.Extensions.Hosting 9.0.0
1333-
- Microsoft.Extensions.Hosting.WindowsServices 9.0.0
1334-
- Microsoft.Extensions.Logging 9.0.0
1335-
- Microsoft.Extensions.Logging.Abstractions 9.0.0
1331+
- Microsoft.Extensions.DependencyInjection 9.0.1
1332+
- Microsoft.Extensions.Hosting 9.0.1
1333+
- Microsoft.Extensions.Hosting.WindowsServices 9.0.1
1334+
- Microsoft.Extensions.Logging 9.0.1
1335+
- Microsoft.Extensions.Logging.Abstractions 9.0.1
13361336
- Microsoft.NET.ILLink.Tasks (A)
13371337
- Microsoft.SemanticKernel 1.15.0
13381338
- Microsoft.Toolkit.Uwp.Notifications 7.1.2
13391339
- Microsoft.Web.WebView2 1.0.2903.40
1340-
- Microsoft.Win32.SystemEvents 9.0.0
1341-
- Microsoft.Windows.Compatibility 9.0.0
1340+
- Microsoft.Win32.SystemEvents 9.0.1
1341+
- Microsoft.Windows.Compatibility 9.0.1
13421342
- Microsoft.Windows.CsWin32 0.2.46-beta
13431343
- Microsoft.Windows.CsWinRT 2.1.5
13441344
- Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
@@ -1356,25 +1356,25 @@ EXHIBIT A -Mozilla Public License.
13561356
- SharpCompress 0.37.2
13571357
- StreamJsonRpc 2.19.27
13581358
- StyleCop.Analyzers 1.2.0-beta.556
1359-
- System.CodeDom 9.0.0
1359+
- System.CodeDom 9.0.1
13601360
- System.CommandLine 2.0.0-beta4.22272.1
1361-
- System.ComponentModel.Composition 9.0.0
1362-
- System.Configuration.ConfigurationManager 9.0.0
1363-
- System.Data.OleDb 9.0.0
1361+
- System.ComponentModel.Composition 9.0.1
1362+
- System.Configuration.ConfigurationManager 9.0.1
1363+
- System.Data.OleDb 9.0.1
13641364
- System.Data.SqlClient 4.8.6
1365-
- System.Diagnostics.EventLog 9.0.0
1366-
- System.Diagnostics.PerformanceCounter 9.0.0
1367-
- System.Drawing.Common 9.0.0
1365+
- System.Diagnostics.EventLog 9.0.1
1366+
- System.Diagnostics.PerformanceCounter 9.0.1
1367+
- System.Drawing.Common 9.0.1
13681368
- System.IO.Abstractions 21.0.29
13691369
- System.IO.Abstractions.TestingHelpers 21.0.29
1370-
- System.Management 9.0.0
1370+
- System.Management 9.0.1
13711371
- System.Net.Http 4.3.4
13721372
- System.Private.Uri 4.3.2
13731373
- System.Reactive 6.0.1
1374-
- System.Runtime.Caching 9.0.0
1375-
- System.ServiceProcess.ServiceController 9.0.0
1376-
- System.Text.Encoding.CodePages 9.0.0
1377-
- System.Text.Json 9.0.0
1374+
- System.Runtime.Caching 9.0.1
1375+
- System.ServiceProcess.ServiceController 9.0.1
1376+
- System.Text.Encoding.CodePages 9.0.1
1377+
- System.Text.Json 9.0.1
13781378
- System.Text.RegularExpressions 4.3.1
13791379
- UnicodeInformation 2.6.0
13801380
- UnitsNet 5.56.0

‎README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Microsoft PowerToys
22

3-
![Hero image for Microsoft PowerToys](doc/images/overview/PT_holiday_hero_image.png)
3+
![Hero image for Microsoft PowerToys](doc/images/overview/PT_hero_image.png)
44

55
[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)
66

@@ -20,12 +20,6 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
2020
| [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
2121
| [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
2222

23-
## 🎁⭐ PowerToys Advent calendar ⭐🎁
24-
25-
We will be highlighting a cool utility each day for 24 days in December! To follow along, check out these threads:
26-
- https://bsky.app/profile/kaylacinnamon.bsky.social/post/3lcb7iljxck2o
27-
- https://x.com/cinnamon_msft/status/1863284610773246257
28-
2923
## Installing and running Microsoft PowerToys
3024

3125
### Requirements

‎doc/devdocs/modules/launcher/readme.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
# Table of Contents
22
1. [Architecture](/doc/devdocs/modules/launcher/architecture.md)
33
2. [Debugging](/doc/devdocs/modules/launcher/debugging.md)
4-
3. [Project Structure](/doc/devdocs/modules/launcher/project_structure.md)
5-
4. [Telemetry](/doc/devdocs/modules/launcher/telemetry.md)
6-
5. Plugins
4+
3. [New Plugin Checklist](/doc/devdocs/modules/launcher/new-plugin-checklist.md)
5+
4. [Project Structure](/doc/devdocs/modules/launcher/project_structure.md)
6+
5. [Telemetry](/doc/devdocs/modules/launcher/telemetry.md)
7+
6. Plugins
78
- [Overview](/doc/devdocs/modules/launcher/plugins/overview.md)
89
- [Calculator](/doc/devdocs/modules/launcher/plugins/calculator.md)
910
- [Folder](/doc/devdocs/modules/launcher/plugins/folder.md)
11+
- [History](/doc/devdocs/modules/launcher/plugins/history.md)
1012
- [Indexer](/doc/devdocs/modules/launcher/plugins/indexer.md)
1113
- [OneNote](/doc/devdocs/modules/launcher/plugins/onenote.md)
1214
- [Program](/doc/devdocs/modules/launcher/plugins/program.md)
1315
- [Registry](/doc/devdocs/modules/launcher/plugins/registry.md)
1416
- [Shell](/doc/devdocs/modules/launcher/plugins/shell.md)
1517
- [Time and Date](/doc/devdocs/modules/launcher/plugins/timedate.md)
16-
- [Windows System Commands](/doc/devdocs/modules/launcher/plugins/system.md)
18+
- [Unit Converter](/doc/devdocs/modules/launcher/plugins/community.unitconverter.md)
1719
- [Uri](/doc/devdocs/modules/launcher/plugins/uri.md)
18-
- [Window Walker](/doc/devdocs/modules/launcher/plugins/windowwalker.md)
20+
- [Value Generator](/doc/devdocs/modules/launcher/plugins/community.valuegenerator.md)
1921
- [Web Search](/doc/devdocs/modules/launcher/plugins/WebSearch.md)
22+
- [Windows Settings](/doc/devdocs/modules/launcher/plugins/windowssettings.md)
23+
- [Windows System Commands](/doc/devdocs/modules/launcher/plugins/system.md)
24+
- [Window Walker](/doc/devdocs/modules/launcher/plugins/windowwalker.md)

‎doc/images/overview/PT_holiday_hero_image.png

-503 KB
Binary file not shown.

‎src/Monaco/index.html

+32-19
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99
// `theme` can be "vs" for light theme or "vs-dark" for dark theme
1010
// `lang` is the language of the file
1111
// `wrap` if the editor is wrapping or not
12+
// `minimap` if the minimap is shown
13+
// `contextMenu` whether to use the Monaco context menu. The built-in context menu
14+
// doesn't work in Peek, so we set this to false and create a custom one
1215

1316
var theme = ("[[PT_THEME]]" == "dark") ? "vs-dark" : "vs";
17+
var wrap = [[PT_WRAP]];
18+
var minimap = [[PT_MINIMAP]];
19+
var stickyScroll = [[PT_STICKY_SCROLL]];
20+
var fontSize = [[PT_FONT_SIZE]];
21+
1422
var lang = "[[PT_LANG]]";
15-
var wrap = ([[PT_WRAP]] == 1) ? true : false;
16-
1723
var base64code = "[[PT_CODE]]";
18-
19-
var stickyScroll = ([[PT_STICKY_SCROLL]] == 1) ? true : false;
20-
21-
var fontSize = [[PT_FONT_SIZE]];
22-
var contextMenu = ([[PT_CONTEXTMENU]] == 1) ? true : false;
24+
var contextMenu = [[PT_CONTEXTMENU]];
2325

2426
var editor;
2527

@@ -29,12 +31,13 @@
2931
}).join(''));
3032

3133
function runToggleTextWrapCommand() {
32-
if (wrap) {
33-
editor.updateOptions({ wordWrap: 'off' })
34-
} else {
35-
editor.updateOptions({ wordWrap: 'on' })
36-
}
3734
wrap = !wrap;
35+
editor.updateOptions({ wordWrap: wrap ? 'on' : 'off' });
36+
}
37+
38+
function runToggleMinimap() {
39+
minimap = !minimap;
40+
editor.updateOptions({minimap: {enabled: minimap}});
3841
}
3942

4043
function runCopyCommand() {
@@ -99,8 +102,8 @@
99102
language: lang, // Sets language of the code
100103
readOnly: true, // Sets to readonly
101104
theme: 'theme', // Sets editor theme
102-
minimap: { enabled: false }, // Disables minimap
103-
lineNumbersMinChars: '3', // Width of the line numbers
105+
minimap: { enabled: minimap }, // Controls if minimap is shown
106+
lineNumbersMinChars: 3, // Width of the line numbers
104107
contextmenu: contextMenu,
105108
scrollbar: {
106109
// Deactivate shadows
@@ -135,10 +138,20 @@
135138
contextMenuOrder: 100,
136139

137140
// Method that will be executed when the action is triggered.
138-
// @param editor The editor instance is passed in as a convenience
139-
run: function (ed) {
140-
runToggleTextWrapCommand();
141-
}
141+
run: runToggleTextWrapCommand
142+
});
143+
144+
editor.addAction({
145+
id: 'toggle-minimap',
146+
147+
label: 'Toggle minimap',
148+
149+
contextMenuGroupId: 'cutcopypaste',
150+
151+
contextMenuOrder: 100,
152+
153+
// Method that will be executed when the action is triggered.
154+
run: runToggleMinimap
142155
});
143156

144157
onContextMenu();
@@ -166,4 +179,4 @@
166179
}
167180
</script>
168181
</body>
169-
</html>
182+
</html>

‎src/common/FilePreviewCommon/Formatters/FilePreviewJsonSerializerContext.cs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
99

10-
[JsonSourceGenerationOptions(WriteIndented = true)]
1110
[JsonSerializable(typeof(JsonDocument))]
1211
internal sealed partial class FilePreviewJsonSerializerContext : JsonSerializerContext
1312
{

‎src/common/FilePreviewCommon/Formatters/JsonFormatter.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ public class JsonFormatter : IFormatter
1414

1515
private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
1616
{
17+
WriteIndented = true,
1718
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
1819
};
1920

21+
private static readonly FilePreviewJsonSerializerContext _filePreviewJsonSerializerContext = new(_serializerOptions);
22+
2023
/// <inheritdoc/>
2124
public string Format(string value)
2225
{
@@ -27,8 +30,7 @@ public string Format(string value)
2730

2831
using (var jDocument = JsonDocument.Parse(value, new JsonDocumentOptions { CommentHandling = JsonCommentHandling.Skip }))
2932
{
30-
FilePreviewJsonSerializerContext context = new(_serializerOptions);
31-
return JsonSerializer.Serialize(jDocument, context.JsonDocument);
33+
return JsonSerializer.Serialize(jDocument, _filePreviewJsonSerializerContext.JsonDocument);
3234
}
3335
}
3436
}

‎src/common/ManagedCommon/NativeMethods.cs

+12
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ internal static class NativeMethods
4242
[DllImport("user32.dll")]
4343
internal static extern uint SendInput(uint nInputs, INPUT[] pInputs, int cbSize);
4444

45+
[DllImport("dwmapi")]
46+
internal static extern IntPtr DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMarInset);
47+
4548
[StructLayout(LayoutKind.Sequential)]
4649
public struct INPUT
4750
{
@@ -100,5 +103,14 @@ internal enum INPUTTYPE : uint
100103
INPUT_KEYBOARD = 1,
101104
INPUT_HARDWARE = 2,
102105
}
106+
107+
[StructLayout(LayoutKind.Sequential)]
108+
internal struct MARGINS
109+
{
110+
public int cxLeftWidth;
111+
public int cxRightWidth;
112+
public int cyTopHeight;
113+
public int cyBottomHeight;
114+
}
103115
}
104116
}

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44

55
using System;
66

7-
namespace Common.UI
7+
namespace ManagedCommon
88
{
99
public static class OSVersionHelper
1010
{
11+
public static bool IsWindows10()
12+
{
13+
return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Minor < 22000;
14+
}
15+
1116
public static bool IsWindows11()
1217
{
1318
return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;

0 commit comments

Comments
 (0)