diff --git a/.github/actions/spell-check/allow/names.txt b/.github/actions/spell-check/allow/names.txt index 7b3543e06f..0ebacd1b41 100644 --- a/.github/actions/spell-check/allow/names.txt +++ b/.github/actions/spell-check/allow/names.txt @@ -116,6 +116,7 @@ talynone TBM tilovell Triet +waaverecords ycv Yuniardi yuyoyuppe @@ -140,6 +141,7 @@ onenote Quickime regedit roslyn +Spotify Vanara WEX windowwalker diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 40a6a085f5..1ff3718721 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -8,6 +8,7 @@ accctrl Acceleratorkeys ACCEPTFILES ACCESSDENIED +ACCESSTOKEN aclapi AClient AColumn @@ -743,6 +744,7 @@ Knownfolders KSPROPERTY Kybd languagesjson +lastbuildstate lastcodeanalysissucceeded Lastdevice LASTEXITCODE @@ -1273,6 +1275,7 @@ reparented reparenting reparse reportbug +reportfileaccesses requery requerying rescap @@ -1565,6 +1568,8 @@ timediff timeunion timeutil Titlecase +tkcontrols +tkconverters TKey TLayout tlb diff --git a/.gitignore b/.gitignore index 14c1e39737..f8390b9d56 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,6 @@ src/common/Telemetry/*.etl # Generated installer file for Monaco source files. /installer/PowerToysSetup/MonacoSRC.wxs + +# MSBuildCache +/MSBuildCacheLogs/ diff --git a/.pipelines/ci/caching.yml b/.pipelines/ci/caching.yml new file mode 100644 index 0000000000..b802c9efae --- /dev/null +++ b/.pipelines/ci/caching.yml @@ -0,0 +1,41 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/main/service-schema.json +trigger: + batch: true + branches: + include: + - main + - stable + paths: + exclude: + - doc/* + - temp/* + - tools/* + - '**.md' + +pr: + branches: + include: + - main + - stable + paths: + exclude: + - '**.md' + - doc + +# 0.0.yyMM.dd## +# 0.0.1904.0900 +name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr) + +variables: + EnablePipelineCache: true + +jobs: + - template: ./templates/build-powertoys-precheck.yml + - template: ./templates/build-powertoys-ci.yml + parameters: + platform: x64 + enableCaching: true + - template: ./templates/build-powertoys-ci.yml + parameters: + platform: arm64 + enableCaching: true \ No newline at end of file diff --git a/.pipelines/ci/templates/build-powertoys-ci.yml b/.pipelines/ci/templates/build-powertoys-ci.yml index c5f4882cd8..2d39da65b9 100644 --- a/.pipelines/ci/templates/build-powertoys-ci.yml +++ b/.pipelines/ci/templates/build-powertoys-ci.yml @@ -1,7 +1,16 @@ parameters: - configuration: 'Release' - platform: '' - additionalBuildArguments: '/p:RestorePackagesConfig=true -m' + - name: configuration + type: string + default: 'Release' + - name: platform + type: string + default: '/p:RestorePackagesConfig=true -m' + - name: additionalBuildArguments + type: string + default: '/p:RestorePackagesConfig=true -m' + - name: enableCaching + type: boolean + default: false jobs: - job: Build${{ parameters.platform }}${{ parameters.configuration }} @@ -26,6 +35,7 @@ jobs: - template: build-powertoys-steps.yml parameters: additionalBuildArguments: ${{ parameters.additionalBuildArguments }} + enableCaching: ${{ parameters.enableCaching }} # It appears that the Component Governance build task that gets automatically injected stopped working # when we renamed our main branch. diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index d151a39257..8152927111 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -1,5 +1,10 @@ parameters: - additionalBuildArguments: '' + - name: additionalBuildArguments + type: string + default: '' + - name: enableCaching + type: boolean + default: false steps: - checkout: self @@ -78,6 +83,13 @@ steps: - task: VisualStudioTestPlatformInstaller@1 displayName: Ensure VSTest Platform +- ${{ if eq(parameters.enableCaching, true) }}: + - task: NuGetToolInstaller@1 + displayName: Install NuGet + + - script: nuget restore packages.config -SolutionDirectory . + displayName: 'nuget restore packages.config' + - task: VSBuild@1 displayName: 'Build PowerToys.sln' inputs: @@ -85,8 +97,15 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} + ${{ if eq(parameters.enableCaching, true) }}: + msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -reportfileaccesses -p:MSBuildCacheEnabled=true -p:MSBuildCacheLogDirectory=$(Build.ArtifactStagingDirectory)\logs\MSBuildCache -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false + ${{ else }}: + msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false + msbuildArchitecture: x64 maximumCpuCount: true + ${{ if eq(parameters.enableCaching, true) }}: + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - task: VSBuild@1 displayName: 'Build BugReportTool.sln' @@ -95,7 +114,8 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} + msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\BugReportTool.binlog -ds:false + msbuildArchitecture: x64 maximumCpuCount: true - task: VSBuild@1 @@ -105,7 +125,8 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} + msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\WebcamReportTool.binlog -ds:false + msbuildArchitecture: x64 maximumCpuCount: true - task: VSBuild@1 @@ -115,7 +136,8 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} + msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\StylesReportTool.binlog -ds:false + msbuildArchitecture: x64 maximumCpuCount: true - task: PowerShell@2 @@ -131,7 +153,8 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} + msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller.binlog -ds:false + msbuildArchitecture: x64 maximumCpuCount: true - task: VSBuild@1 @@ -141,8 +164,9 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} + msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper.binlog -ds:false clean: false + msbuildArchitecture: x64 maximumCpuCount: true - task: PowerShell@2 @@ -159,7 +183,8 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true + msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller-PerUser.binlog -ds:false + msbuildArchitecture: x64 maximumCpuCount: true - task: VSBuild@1 @@ -169,8 +194,9 @@ steps: vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' - msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true + msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper-PerUser.binlog -ds:false clean: false + msbuildArchitecture: x64 maximumCpuCount: true # Check if deps.json files don't reference different dll versions. @@ -268,3 +294,8 @@ steps: filePath: '$(build.sourcesdirectory)\.pipelines\verifyNoticeMdAgainstNugetPackages.ps1' arguments: -path '$(build.sourcesdirectory)\' pwsh: true + +- publish: $(Build.ArtifactStagingDirectory)\logs + displayName: Publish Logs + artifact: '$(System.JobDisplayName) logs' + condition: always() diff --git a/Directory.Build.props b/Directory.Build.props index bc0da728c2..14a45385d4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -44,4 +44,46 @@ + + + + false + + + Microsoft.MSBuildCache.AzurePipelines + Microsoft.MSBuildCache.Local + + + + + 202310210737 + + + $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);packages\Microsoft.WindowsAppSDK.*\tools\net472\ApplicationInsights.config + + + $(MSBuildCacheIdenticalDuplicateOutputPatterns);** + + + $(MSBuildThisFileDirectory)packages.config + $(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile) + + + + $([System.IO.File]::ReadAllText("$(PackagesConfigFile)")) + $([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value) + $(MSBuildThisFileDirectory)packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion) + $(MSBuildThisFileDirectory)packages\Microsoft.MSBuildCache.SharedCompilation.$(MSBuildCachePackageVersion) + + + + + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 66a8733ce6..cba7762d5f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,3 +1,6 @@ + + + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 960eeb08a8..927f9a2886 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,15 +4,15 @@ - - - - - - - - - + + + + + + + + + @@ -24,7 +24,7 @@ - + @@ -33,15 +33,16 @@ + - + - + @@ -53,23 +54,27 @@ - - + + - + + - + + + + @@ -78,7 +83,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index 5e0be0d037..a43a1eb23c 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1297,14 +1297,15 @@ EXHIBIT A -Mozilla Public License. ## NuGet Packages used by PowerToys - Appium.WebDriver 4.4.5 -- CommunityToolkit.Mvvm 8.2.0 -- CommunityToolkit.WinUI.Animations 8.0.230907 -- CommunityToolkit.WinUI.Controls.Primitives 8.0.230907 -- CommunityToolkit.WinUI.Controls.Segmented 8.0.230907 -- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.230907 -- CommunityToolkit.WinUI.Controls.Sizers 8.0.230907 -- CommunityToolkit.WinUI.Converters 8.0.230907 -- CommunityToolkit.WinUI.Extensions 8.0.230907 +- CommunityToolkit.Mvvm 8.2.2 +- CommunityToolkit.WinUI.Animations 8.0.240109 +- CommunityToolkit.WinUI.Collections 8.0.240109 +- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109 +- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109 +- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109 +- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109 +- CommunityToolkit.WinUI.Converters 8.0.240109 +- CommunityToolkit.WinUI.Extensions 8.0.240109 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2 - ControlzEx 6.0.0 @@ -1314,7 +1315,7 @@ EXHIBIT A -Mozilla Public License. - Interop.Microsoft.Office.Interop.OneNote 1.1.0.2 - LazyCache 2.4.0 - Mages 2.0.1 -- Markdig.Signed 0.27.0 +- Markdig.Signed 0.34.0 - Microsoft.CodeAnalysis.NetAnalyzers 8.0.0 - Microsoft.Data.Sqlite 8.0.0 - Microsoft.Extensions.DependencyInjection 8.0.0 @@ -1323,13 +1324,14 @@ EXHIBIT A -Mozilla Public License. - Microsoft.Extensions.Logging 8.0.0 - Microsoft.Extensions.Logging.Abstractions 8.0.0 - Microsoft.Extensions.ObjectPool 8.0.0 -- Microsoft.NET.Test.Sdk 17.6.3 +- Microsoft.NET.Test.Sdk 17.8.0 - Microsoft.Toolkit.Uwp.Notifications 7.1.2 - Microsoft.Web.WebView2 1.0.2088.41 +- Microsoft.Win32.SystemEvents 8.0.0 - Microsoft.Windows.Compatibility 8.0.0 - Microsoft.Windows.CsWin32 0.2.46-beta - Microsoft.Windows.CsWinRT 2.0.4 -- Microsoft.Windows.SDK.BuildTools 10.0.22621.756 +- Microsoft.Windows.SDK.BuildTools 10.0.22621.2428 - Microsoft.Windows.SDK.Contracts 10.0.19041.1 - Microsoft.WindowsAppSDK 1.4.231115000 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9 @@ -1338,23 +1340,27 @@ EXHIBIT A -Mozilla Public License. - Moq 4.18.4 - MSTest.TestAdapter 3.1.1 - MSTest.TestFramework 3.1.1 -- NLog.Extensions.Logging 5.0.4 -- NLog.Schema 5.0.4 +- NLog.Extensions.Logging 5.3.8 +- NLog.Schema 5.2.8 - ScipBe.Common.Office.OneNote 3.0.1 - SharpCompress 0.33.0 - StreamJsonRpc 2.14.24 -- StyleCop.Analyzers 1.2.0-beta.507 +- StyleCop.Analyzers 1.2.0-beta.556 +- System.CodeDom 8.0.0 - System.CommandLine 2.0.0-beta4.22272.1 - System.ComponentModel.Composition 8.0.0 - System.Configuration.ConfigurationManager 8.0.0 - System.Data.OleDb 8.0.0 -- System.Drawing.Common 8.0.0 +- System.Diagnostics.EventLog 8.0.0 +- System.Diagnostics.PerformanceCounter 8.0.0 +- System.Drawing.Common 8.0.1 - System.IO.Abstractions 17.2.3 - System.IO.Abstractions.TestingHelpers 17.2.3 - System.Management 8.0.0 - System.Management.Automation 7.4.0 - System.Reactive 6.0.0-preview.9 - System.Runtime.Caching 8.0.0 +- System.Security.Cryptography.ProtectedData 8.0.0 - System.ServiceProcess.ServiceController 8.0.0 - System.Text.Encoding.CodePages 8.0.0 - UnicodeInformation 2.6.0 @@ -1363,5 +1369,4 @@ EXHIBIT A -Mozilla Public License. - Vanara.PInvoke.Shell32 3.4.11 - Vanara.PInvoke.User32 3.4.11 - WinUIEx 2.2.0 -- WPF-UI 3.0.0-preview.12 - +- WPF-UI 3.0.0-preview.13 diff --git a/README.md b/README.md index 110865b35c..4d8e8276d7 100644 --- a/README.md +++ b/README.md @@ -40,19 +40,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user. -[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F50 -[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F49 -[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysUserSetup-0.76.2-x64.exe -[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysUserSetup-0.76.2-arm64.exe -[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysSetup-0.76.2-x64.exe -[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysSetup-0.76.2-arm64.exe +[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F51 +[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F50 +[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysUserSetup-0.77.0-x64.exe +[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysUserSetup-0.77.0-arm64.exe +[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysSetup-0.77.0-x64.exe +[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysSetup-0.77.0-arm64.exe | Description | Filename | sha256 hash | |----------------|----------|-------------| -| Per user - x64 | [PowerToysUserSetup-0.76.2-x64.exe][ptUserX64] | 73D734FC34B3F9D7484081EC0F0B6ACD4789A55203A185904CC5C62ABD02AF16 | -| Per user - ARM64 | [PowerToysUserSetup-0.76.2-arm64.exe][ptUserArm64] | 5284CC5DA399DC37858A2FD260C30F20C484BA1B5616D0EB67CD90A8A286CB8B | -| Machine wide - x64 | [PowerToysSetup-0.76.2-x64.exe][ptMachineX64] | 72B87381C9E5C7447FB59D7CE478B3102C9CEE3C6EB3A6BC7EC7EC7D9EFAB2A0 | -| Machine wide - ARM64 | [PowerToysSetup-0.76.2-arm64.exe][ptMachineArm64] | F28C7DA377C25309775AB052B2B19A299C26C41582D05B95C3492A4A8C952BFE | +| Per user - x64 | [PowerToysUserSetup-0.77.0-x64.exe][ptUserX64] | 3485D3F45A3DE6ED7FA151A4CE9D6F941491C30E83AB51FD59B4ADCD20611F1A | +| Per user - ARM64 | [PowerToysUserSetup-0.77.0-arm64.exe][ptUserArm64] | 762DF383A01006A20C0BAB2D321667E855236EBA7108CDD475E4E2A8AB752E0E | +| Machine wide - x64 | [PowerToysSetup-0.77.0-x64.exe][ptMachineX64] | 1B6D4247313C289B07A3BF3531E215B3F9BEDBE9254919637F2AC502B4773C31 | +| Machine wide - ARM64 | [PowerToysSetup-0.77.0-arm64.exe][ptMachineArm64] | CF740B3AC0EB5C23E18B07ACC2D0C6EC5F4CE4B3A2EDC67C2C9FDF6EF78F0352 | This is our preferred method. @@ -98,154 +98,112 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/ Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on. -### 0.76 - November 2023 Update +### 0.77 - December 2023 Update In this release, we focused on new features, stability and improvements. **Highlights** - - Upgrade to .NET 8. Thanks [@snickler](https://github.com/snickler)! - - Keyboard Manager can now remap keys and shortcuts to send sequences of unicode text. - - Modernized the Keyboard Manager Editor UI. Thanks [@dillydylann](https://github.com/dillydylann)! - - Modernized the PowerToys Run, Quick Accent and Text Extractor UIs. Thanks [@niels9001](https://github.com/niels9001)! - - New File Explorer Add-ons: QOI image Preview Handler and Thumbnail Provider. Thanks [@pedrolamas](https://github.com/pedrolamas)! + - New utility: Command Not Found PowerShell 7.4 module - adds the ability to detect failed commands in PowerShell 7.4 and suggest a package to install using winget. Thanks [@carlos-zamora](https://github.com/carlos-zamora)! + - Keyboard manager does not register low level hook if there are no remappings anymore. + - Added support for QOI file type in Peek. Thanks [@pedrolamas](https://github.com/pedrolamas)! + - Added support for loading 3rd-party plugins with additional dependencies in PowerToys Run. Thanks [@coreyH](https://github.com/CoreyHayward)! ### General - - Updated the WebView 2 dependency to 1.0.2088.41. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Fixed unreadable color brushes used across WinUI3 applications for improved accessibility. Thanks [@niels9001](https://github.com/niels9001)! - - Flyouts used across WinUI3 applications are no longer constrained to the application's bounds. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! - - Upgraded the WPF-UI dependency to preview.9 and then preview.11. Thanks [@niels9001](https://github.com/niels9001) and [@pomianowski](https://github.com/pomianowski)! - - Upgraded to .NET 8. Thanks [@snickler](https://github.com/snickler)! - - Updated the WinAppSDK dependency to 1.4.3. -### Awake + - Bump WPF-UI package version to fix crashes related to theme changes. (This was a hotfix for 0.76) + - Fixed typo in version change notification. Thanks [@PesBandi](https://github.com/PesBandi)! + - Code improvements and fixed silenced warnings introduced by upgrade to .NET 8. + - Update copyright year for 2024. + - Added setting to disable warning notifications about detecting an application running as Administrator. - - Added localization to the tray icon context menu. +### AlwaysOnTop -### Crop And Lock + - Show notification when elevated app is in the foreground but AlwaysOnTop is running non-elevated. - - Fixed restoring windows that were reparented while maximized. +### Command Not Found + + - Added a new utility: A Command Not Found PowerShell 7.4 module. It adds the ability to detect failed commands in PowerShell 7.4 and suggest a package to install using winget. Thanks [@carlos-zamora](https://github.com/carlos-zamora)! ### Environment Variables - - Fixed crash caused by WinAppSDK version bump by replacing ListView elements with ItemsControl. + - Fixed issue causing Environment Variables window not to appear as a foreground window. ### FancyZones - - Reverted a change that caused some applications, like the Windows Calculator, to not snap correctly. (This was a hotfix for 0.75) - - FancyZones Editor will no longer apply a layout to the current monitor after editing it. - - Fixed and refactored the code that detected if a window can be snapped. Added tests to it with known application window styles to avoid regressions in the future. + - Fixed snapping specific apps (e.g. Facebook messenger). (This was a hotfix for 0.76) + - Fixed behavior of Move newly created windows to current active monitor setting to keep maximize state on moving. Thanks [@quyenvsp](https://github.com/quyenvsp)! + - Fixed issue causing FancyZones Editor layout window to be zoned. ### File Explorer add-ons - - Solved an issue incorrectly detecting encoding when previewing code files preview. - - Fixed the background color for Gcode preview handler on dark theme. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - New utilities: Preview Handler and Thumbnail Provider for QOI image files. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - GCode Thumbnails are now in the 32 bit ARGB format. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - Added the perceived type to SVG and QOI file thumbnails. Thanks [@pedrolamas](https://github.com/pedrolamas)! - -### GPO - - - Added the missing Environment Variables utility policy to the .admx and .adml files. (This was a hotfix for 0.75) - - Fixed some typos and text improvements in the .adml file. Thanks [@htcfreek](https://github.com/htcfreek)! + - Fixed WebView2 based previewers issue caused by the latest WebView update. (This was a hotfix for 0.76) ### Hosts File Editor - - Added a proper warning when the hosts file is read-only and a button to make it writable. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fixed issue causing settings not to be preserved on update. ### Image Resizer - - - Fixed a WPF-UI issue regarding the application's background brushes. Thanks [@niels9001](https://github.com/niels9001)! -### Installer - - - Included the Text Extractor and Awake localization files in the install process. + - Fixed crash caused by WpfUI ThemeWatcher. (This was a hotfix for 0.76) ### Keyboard Manager - - Modernized the UI with the Fluent design. Thanks [@dillydylann](https://github.com/dillydylann)! - - Added the feature to remap keys and shortcuts to arbitrary unicode text sequences. - -### Mouse Without Borders - - - Removed Thread.Suspend calls when exiting the utility. That call is deprecated, unneeded and was causing a silent crash. + - Do not register low level hook if there are no remappings. ### Peek - - Added the possibility to pause/resume videos with the space bar. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Fixed high CPU usage when idle before initializing the main window. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Implemented Ctrl+W as a shortcut to close Peek. Thanks [@Physalis2](https://github.com/Physalis2)! - - Solved an issue incorrectly detecting encoding when previewing code files. - - Fixed background issues when peeking into HTML files after the WebView 2 upgrade. + - Improved icon and title showing for previewed files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Added QOI file type support. Thanks [@pedrolamas](https://github.com/pedrolamas)! ### PowerToys Run - - Moved to WPF-UI and redesigned according to Fluent UX principles. Thanks [@niels9001](https://github.com/niels9001)! - - Fixed an issue causing 3rd party plugins to not have their custom settings correctly initialized with default values. (This was a hotfix for 0.75) Thanks [@waaverecords](https://github.com/waaverecords)! - - Fixed a crash in the VSCode plugin when the VSCode path had trailing backspaces. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Fixed a crash when trying to load invalid image icons. - - Fixed a crash in the Programs plugin when getting images for some .lnk files. - - Fixed a rare startup initialization error and removed cold start operations that were no longer needed. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Improved calculations for Windows File Time and Unix Epoch Time in the DateTime plugin. Thanks [@htcfreek](https://github.com/htcfreek)! - - Fixed a crash when trying to get the icon for a link that pointed to no file. - - Cleaned up code in the WindowWalker plugin improving the logic. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fixed results list UI element height for different maximum number of results value. (This was a hotfix for 0.76) + - Fixed icon extraction for .lnk files. (This was a hotfix for 0.76) + - Fixed search box UI glitch when FlowDirection is RightToLeft. (This was a hotfix for 0.76) + - Fixed theme setting. (This was a hotfix for 0.76) + - Fixed error reporting window UI issue. Thanks [@niels9001](https://github.com/niels9001)! + - UI improvements and ability to show/hide plugins overview panel. Thanks [@niels9001](https://github.com/niels9001)! + - Allow interaction with plugin hints. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Switch to WPF-UI theme manager. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fixed issue causing 3rd party plugin's dependencies dll not being loaded properly. Thanks [@coreyH](https://github.com/CoreyHayward)! + - Added configurable font sizes. Thanks [@niels9001](https://github.com/niels9001)! + - Changed the text color of plugin hints to improve the contrast when light theme is used. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fix scientific notation errors in Calculator plugin. Thanks [@viggyd](https://github.com/viggyd)! + - Add URI/URL features to Value generator plugin. Thanks [@htcfreek](https://github.com/htcfreek)! ### Quick Accent - - Moved from ModernWPF to WPF-UI. Thanks [@niels9001](https://github.com/niels9001)! - - Added support to the Finnish language character set. Thanks [@davidtlascelles](https://github.com/davidtlascelles)! - - Added currency symbols for Croatian, Gaeilge, Gàidhlig and Welsh. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added a missing Latin letter ꝡ. Thanks [@cubedhuang](https://github.com/cubedhuang)! - - Added fraction characters. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added support to the Danish language character set. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added the Kazakhstani Tenge character to the Currencies characters set. Thanks [@PesBandi](https://github.com/PesBandi)! - - Renamed Slovakian to Slovak, which is the correct term. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added the Greek language character set. Thanks [@mcbabo](https://github.com/mcbabo)! + - Moved Greek specific characters from All language set to Greek. Thanks [@PesBandi](https://github.com/PesBandi)! + - Add more mathematical symbols. Thanks [@kevinfu2](https://github.com/kevinfu2)! ### Settings - - When clicking a module's name on the Dashboard, it will navigate to that module's page. - - Fixed the clipping of information in the Backup and Restore section of the General Settings page. Thanks [@niels9001](https://github.com/niels9001)! - - Updated the File Explorer Add-ons fluent icon. Thanks [@niels9001](https://github.com/niels9001)! - - Added a warning when trying to set a shortcut that might conflict with "Alt Gr" key combinations. - - Added a direct link to the OOBE's "What's New page" from the main Settings window. Thanks [@iakrayna](https://github.com/iakrayna)! - - Changed mentions from Microsoft Docs to Microsoft Learn. - - Fixed the slow reaction to system theme changes. - -### Text Extractor - - - Move to WPF-UI, localization and light theme support. Thanks [@niels9001](https://github.com/niels9001)! - - Disabled by default on Windows 11, with a information box on Settings to prefer using the Windows Snipping Tool, which now supports OCR. + - Fixed exception occurring on theme change. + - Fix "What's new" icon. Thanks [@niels9001](https://github.com/niels9001)! + - Remove obsolete UI Font icon properties. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! + - OOBE UI improvements. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! + - XAML Binding improvements. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! + - Fixed crash caused by ThemeListener constructor exceptions. ### Documentation - - Fixed some typos in the README. Thanks [@Asymtode712](https://github.com/Asymtode712)! - - Reworked the gpo docs on learn.microsoft.com, adding .admx, registry and Intune information. Thanks [@htcfreek](https://github.com/htcfreek)! + - Improved docs for adding new languages to monaco. Thanks [@PesBandi](https://github.com/PesBandi)! + - Update README.md to directly state x64 & ARM processor in requirements. + - Added Scoop plugin to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@Quriz](https://github.com/Quriz)! ### Development - - Updated the check-spelling ci action to 0.22. Thanks [@jsoref](https://github.com/jsoref)! - - Refactored the modules data model used between the Settings Dashboard and Flyout. - - Fixed a flaky interop test that was causing automated CI to hang occasionally. - - Increased the WebView 2 loading timeout to reduce flakiness in those tests. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Added support for building with the Dev Drive CopyOnWrite feature, increasing build speed. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - Addressed the C# static analyzers suggestions. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Addressed the C++ static analyzers suggestions. - - PRs that only contain Markdown or text files changes no longer trigger the full CI. Thanks [@snickler](https://github.com/snickler)! - - Updated the Microsoft.Windows.CsWinRT to 2.0.4 to fix building with the official Visual Studio 17.8 release. - - Fixed new code quality issues caught by the official Visual Studio 17.8 release. - - Added a bot trigger to point contributors to the main new contribution issue on GitHub. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)! - - Removed unneeded entries from expect.txt. - - Turned off a new feature from Visual Studio that was adding the commit hash to the binary files Product Version. - - Refactored and reviewed the spellcheck entries into different files. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! - - Added Spectre mitigation and SHA256 hash creation for some DLLs. - - Reverted the release pipeline template to a previous release that's stable for shipping PowerToys. + - Adopted XamlStyler for PowerToys Run source code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Consolidate Microsoft.Windows.SDK.BuildTools across solution. + - Upgraded Boost's lib to v1.84. + - Upgraded HelixToolkit packages to the latest versions. + - Updated sdl baselines. -#### What is being planned for version 0.77 +#### What is being planned for version 0.78 -For [v0.77][github-next-release-work], we'll work on the items below: +For [v0.78][github-next-release-work], we'll work on the items below: - - New utility: Command Not Found - Language selection - Automated UI testing through WinAppDriver - Develop support for Desired State Configuration diff --git a/doc/thirdPartyRunPlugins.md b/doc/thirdPartyRunPlugins.md index bf85dd421c..1ac63c7f87 100644 --- a/doc/thirdPartyRunPlugins.md +++ b/doc/thirdPartyRunPlugins.md @@ -34,3 +34,4 @@ Contact the developers of a plugin directly for assistance with a specific plugi | [Visual Studio](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents | | [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet | | [Scoop](https://github.com/Quriz/PowerToysRunScoop) | [Quriz](https://github.com/Quriz) | Search and install packages from Scoop | +| [Spotify](https://github.com/waaverecords/PowerToys-Run-Spotify) | [waaverecords](https://github.com/waaverecords) | Search Spotify and control its player | \ No newline at end of file diff --git a/nuget.config b/nuget.config index 81243afb3c..0643a02af3 100644 --- a/nuget.config +++ b/nuget.config @@ -6,8 +6,5 @@ - - - - \ No newline at end of file + diff --git a/packages.config b/packages.config new file mode 100644 index 0000000000..c99cd91fd7 --- /dev/null +++ b/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/ActionRunner/actionRunner.vcxproj b/src/ActionRunner/actionRunner.vcxproj index ebe3fc8fc8..8809611842 100644 --- a/src/ActionRunner/actionRunner.vcxproj +++ b/src/ActionRunner/actionRunner.vcxproj @@ -62,7 +62,7 @@ - + @@ -70,6 +70,6 @@ - + \ No newline at end of file diff --git a/src/ActionRunner/packages.config b/src/ActionRunner/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/ActionRunner/packages.config +++ b/src/ActionRunner/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Update/PowerToys.Update.vcxproj b/src/Update/PowerToys.Update.vcxproj index e040374754..914732926c 100644 --- a/src/Update/PowerToys.Update.vcxproj +++ b/src/Update/PowerToys.Update.vcxproj @@ -68,7 +68,7 @@ - + @@ -76,6 +76,6 @@ - + \ No newline at end of file diff --git a/src/Update/packages.config b/src/Update/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/Update/packages.config +++ b/src/Update/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/common/COMUtils/COMUtils.vcxproj b/src/common/COMUtils/COMUtils.vcxproj index 6a49eb7860..f582df593b 100644 --- a/src/common/COMUtils/COMUtils.vcxproj +++ b/src/common/COMUtils/COMUtils.vcxproj @@ -36,12 +36,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/common/COMUtils/packages.config b/src/common/COMUtils/packages.config index 3d9798ef5e..6199e2345c 100644 --- a/src/common/COMUtils/packages.config +++ b/src/common/COMUtils/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/common/SettingsAPI/FileWatcher.cpp b/src/common/SettingsAPI/FileWatcher.cpp index 7a0c778cf6..dc25e15c7a 100644 --- a/src/common/SettingsAPI/FileWatcher.cpp +++ b/src/common/SettingsAPI/FileWatcher.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "FileWatcher.h" +#include std::optional FileWatcher::MyFileTime() { @@ -19,50 +20,47 @@ std::optional FileWatcher::MyFileTime() return result; } -void FileWatcher::Run() -{ - while (1) - { - auto lastWrite = MyFileTime(); - if (!m_lastWrite.has_value()) - { - m_lastWrite = lastWrite; - } - else if (lastWrite.has_value()) - { - if (m_lastWrite->dwHighDateTime != lastWrite->dwHighDateTime || - m_lastWrite->dwLowDateTime != lastWrite->dwLowDateTime) - { - m_lastWrite = lastWrite; - m_callback(); - } - } - - if (WaitForSingleObject(m_abortEvent, m_refreshPeriod) == WAIT_OBJECT_0) - { - return; - } - } -} - -FileWatcher::FileWatcher(const std::wstring& path, std::function callback, DWORD refreshPeriod) : - m_refreshPeriod(refreshPeriod), +FileWatcher::FileWatcher(const std::wstring& path, std::function callback) : m_path(path), m_callback(callback) { - m_abortEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr); - if (m_abortEvent) + std::filesystem::path fsPath(path); + m_file_name = fsPath.filename(); + std::transform(m_file_name.begin(), m_file_name.end(), m_file_name.begin(), ::towlower); + m_folder_change_reader = wil::make_folder_change_reader_nothrow( + fsPath.parent_path().c_str(), + false, + wil::FolderChangeEvents::LastWriteTime, + [this](wil::FolderChangeEvent, PCWSTR fileName) { + std::wstring lowerFileName(fileName); + std::transform(lowerFileName.begin(), lowerFileName.end(), lowerFileName.begin(), ::towlower); + + if (m_file_name.compare(fileName) == 0) + { + auto lastWrite = MyFileTime(); + if (!m_lastWrite.has_value()) + { + m_lastWrite = lastWrite; + } + else if (lastWrite.has_value()) + { + if (m_lastWrite->dwHighDateTime != lastWrite->dwHighDateTime || + m_lastWrite->dwLowDateTime != lastWrite->dwLowDateTime) + { + m_lastWrite = lastWrite; + m_callback(); + } + } + } + }); + + if (!m_folder_change_reader) { - m_thread = std::thread([this]() { Run(); }); + Logger::error(L"Failed to start folder change reader for path {}. {}", path, get_last_error_or_default(GetLastError())); } } FileWatcher::~FileWatcher() { - if (m_abortEvent) - { - SetEvent(m_abortEvent); - m_thread.join(); - CloseHandle(m_abortEvent); - } + m_folder_change_reader.reset(); } diff --git a/src/common/SettingsAPI/FileWatcher.h b/src/common/SettingsAPI/FileWatcher.h index 206c1cd747..073a33a0c8 100644 --- a/src/common/SettingsAPI/FileWatcher.h +++ b/src/common/SettingsAPI/FileWatcher.h @@ -11,16 +11,14 @@ class FileWatcher { - DWORD m_refreshPeriod; std::wstring m_path; + std::wstring m_file_name; std::optional m_lastWrite; std::function m_callback; - HANDLE m_abortEvent; - std::thread m_thread; - + wil::unique_folder_change_reader_nothrow m_folder_change_reader; + std::optional MyFileTime(); - void Run(); public: - FileWatcher(const std::wstring& path, std::function callback, DWORD refreshPeriod = 1000); + FileWatcher(const std::wstring& path, std::function callback); ~FileWatcher(); }; diff --git a/src/common/SettingsAPI/SettingsAPI.vcxproj b/src/common/SettingsAPI/SettingsAPI.vcxproj index 306b4a8c3b..c8a06a1a9e 100644 --- a/src/common/SettingsAPI/SettingsAPI.vcxproj +++ b/src/common/SettingsAPI/SettingsAPI.vcxproj @@ -47,10 +47,15 @@ {cc6e41ac-8174-4e8a-8d22-85dd7f4851df} + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + @@ -58,5 +63,6 @@ + \ No newline at end of file diff --git a/src/common/SettingsAPI/pch.h b/src/common/SettingsAPI/pch.h index 9526a2f072..86f6eff283 100644 --- a/src/common/SettingsAPI/pch.h +++ b/src/common/SettingsAPI/pch.h @@ -9,3 +9,5 @@ #include #include +#include +#include diff --git a/src/common/interop/PowerToys.Interop.vcxproj b/src/common/interop/PowerToys.Interop.vcxproj index 3f792f85ce..75382dabfb 100644 --- a/src/common/interop/PowerToys.Interop.vcxproj +++ b/src/common/interop/PowerToys.Interop.vcxproj @@ -136,12 +136,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/common/interop/PowerToys.Interop.vcxproj.filters b/src/common/interop/PowerToys.Interop.vcxproj.filters index b54ad522d3..cf0425666e 100644 --- a/src/common/interop/PowerToys.Interop.vcxproj.filters +++ b/src/common/interop/PowerToys.Interop.vcxproj.filters @@ -68,6 +68,9 @@ Resource Files + + + diff --git a/src/common/interop/packages.config b/src/common/interop/packages.config index 3d9798ef5e..6199e2345c 100644 --- a/src/common/interop/packages.config +++ b/src/common/interop/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/common/notifications/notifications.vcxproj b/src/common/notifications/notifications.vcxproj index ed998e2511..c0438616ad 100644 --- a/src/common/notifications/notifications.vcxproj +++ b/src/common/notifications/notifications.vcxproj @@ -44,7 +44,7 @@ - + @@ -52,6 +52,6 @@ - + \ No newline at end of file diff --git a/src/common/notifications/packages.config b/src/common/notifications/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/common/notifications/packages.config +++ b/src/common/notifications/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/common/updating/packages.config b/src/common/updating/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/common/updating/packages.config +++ b/src/common/updating/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj index 97089b03a1..dfd2817d83 100644 --- a/src/common/updating/updating.vcxproj +++ b/src/common/updating/updating.vcxproj @@ -58,7 +58,7 @@ - + @@ -66,6 +66,6 @@ - + \ No newline at end of file diff --git a/src/common/updating/updating.vcxproj.filters b/src/common/updating/updating.vcxproj.filters index 5952e2f3bd..4eb124fc0c 100644 --- a/src/common/updating/updating.vcxproj.filters +++ b/src/common/updating/updating.vcxproj.filters @@ -45,4 +45,7 @@ + + + \ No newline at end of file diff --git a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj index 04833d9567..fabdbc9c25 100644 --- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj +++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj @@ -155,8 +155,8 @@ - + @@ -164,7 +164,7 @@ - + \ No newline at end of file diff --git a/src/modules/CropAndLock/CropAndLock/packages.config b/src/modules/CropAndLock/CropAndLock/packages.config index 1a0b177ac1..fe9625b6da 100644 --- a/src/modules/CropAndLock/CropAndLock/packages.config +++ b/src/modules/CropAndLock/CropAndLock/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj b/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj index 7c26becd5e..6c44320941 100644 --- a/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj +++ b/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj @@ -102,8 +102,8 @@ - + @@ -112,7 +112,7 @@ - + \ No newline at end of file diff --git a/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config b/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config +++ b/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj index 4d544d3b65..2c7035035d 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj @@ -58,11 +58,6 @@ - - - https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json - - diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml index 7f22dac332..5be8dc688d 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml @@ -2,14 +2,14 @@ x:Class="EnvironmentVariables.Views.MainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" xmlns:converters="using:EnvironmentVariables.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:EnvironmentVariables.Models" - xmlns:toolkitConverters="using:CommunityToolkit.WinUI.Converters" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" x:Name="RootPage" mc:Ignorable="d"> @@ -22,12 +22,12 @@ - - + - - + + - + - + @@ -98,12 +98,12 @@ - - - + + @@ -194,17 +194,17 @@ - - + - + - + @@ -253,17 +253,17 @@ - - + - + - + - - + + - - + + - + - + - - - - - + - - + @@ -676,8 +676,8 @@ x:Uid="AddNewVariableValue" Margin="0,16,0,0" /> - - + + - - + + diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj index 6d5ada2cef..77c2b3bdd7 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj @@ -64,11 +64,6 @@ false - - - https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json - - diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml index 848974dce0..72519afe72 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml @@ -8,17 +8,17 @@ xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:interop="using:FileLocksmith.Interop" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:tkControls="using:CommunityToolkit.WinUI.Controls" - xmlns:tkConverters="using:CommunityToolkit.WinUI.Converters" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - - - + + 0 - - + + - - + + - - - + + + - - + + - - - + + + - + @@ -162,9 +162,9 @@ - - - + + + diff --git a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj index c4ee03077a..3e789295e5 100644 --- a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj +++ b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj @@ -22,6 +22,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml index 16a6ec5c61..700c9da144 100644 --- a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml +++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml @@ -2,7 +2,6 @@ x:Class="Hosts.Views.MainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:helpers="using:Hosts.Helpers" xmlns:i="using:Microsoft.Xaml.Interactivity" @@ -10,6 +9,7 @@ xmlns:local="using:Hosts.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Hosts.Models" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" x:Name="Page" Loaded="Page_Loaded" @@ -21,17 +21,17 @@ - - - - + + - - + @@ -144,21 +144,21 @@ - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config index abb0cf1bdb..285cc434ce 100644 --- a/src/modules/MeasureTool/MeasureToolCore/packages.config +++ b/src/modules/MeasureTool/MeasureToolCore/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj index 86100f4a8d..66b91f1443 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj +++ b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj @@ -22,6 +22,10 @@ + + + runtime + diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj index c9e3417ab3..276c653855 100644 --- a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj +++ b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj @@ -58,20 +58,20 @@ - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj.filters b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj.filters index 27d483b174..e3dbd34dc7 100644 --- a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj.filters +++ b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj.filters @@ -34,13 +34,13 @@ {8d479404-964b-4eb1-8fe8-554be3e68c9b} - - - + + + \ No newline at end of file diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/packages.config b/src/modules/MouseWithoutBorders/ModuleInterface/packages.config index 3d9798ef5e..6199e2345c 100644 --- a/src/modules/MouseWithoutBorders/ModuleInterface/packages.config +++ b/src/modules/MouseWithoutBorders/ModuleInterface/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.rc b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.rc deleted file mode 100644 index 5fa3c8b90d..0000000000 --- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.rc +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include "resource.h" -#include "../../../common/version/version.h" - -#define APSTUDIO_READONLY_SYMBOLS -#include "winres.h" -#undef APSTUDIO_READONLY_SYMBOLS - -1 VERSIONINFO -FILEVERSION FILE_VERSION -PRODUCTVERSION PRODUCT_VERSION -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset - BEGIN - VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", FILE_DESCRIPTION - VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", INTERNAL_NAME - VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", ORIGINAL_FILENAME - VALUE "ProductName", PRODUCT_NAME - VALUE "ProductVersion", PRODUCT_VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset - END -END diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj index c96fc19237..3ca65747da 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj @@ -144,12 +144,12 @@ - + - + - + @@ -174,7 +174,7 @@ {6955446d-23f7-4023-9bb3-8657f904af99} - + {1d5be09d-78c0-4fd7-af00-ae7c1af7c525} @@ -189,7 +189,7 @@ - + @@ -197,6 +197,6 @@ - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters index 87de9dbf11..878894a704 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters +++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters @@ -13,7 +13,7 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + {A74B5AAC-E913-410D-8941-D73346CF47AE} @@ -59,7 +59,7 @@ - + Resource Files @@ -115,13 +115,14 @@ Header Files - + Generated Files + + Header Files + - - Resource Files - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp b/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp index da335bb101..763a9770f7 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp +++ b/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp @@ -126,6 +126,11 @@ bool WindowBorder::Init(HINSTANCE hinstance) return false; } + if (!SetLayeredWindowAttributes(m_window, 0, 255, LWA_ALPHA)) + { + return false; + } + // set position of the border-window behind the tracking window // helps to prevent border overlapping (happens after turning borders off and on) SetWindowPos(m_trackingWindow diff --git a/src/modules/alwaysontop/AlwaysOnTop/packages.config b/src/modules/alwaysontop/AlwaysOnTop/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/packages.config +++ b/src/modules/alwaysontop/AlwaysOnTop/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/pch.h b/src/modules/alwaysontop/AlwaysOnTop/pch.h index 1a3b9fd1fd..848c90fea2 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/pch.h +++ b/src/modules/alwaysontop/AlwaysOnTop/pch.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj index 298bb2c8c6..ad8e3e138b 100644 --- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj @@ -68,7 +68,7 @@ - + @@ -77,6 +77,6 @@ - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj.filters b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj.filters index 5b442a35d8..66fe083d3a 100644 --- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj.filters +++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj.filters @@ -47,4 +47,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config +++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj index 491ab59160..6e4556e7f6 100644 --- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj @@ -67,7 +67,7 @@ - + @@ -75,6 +75,6 @@ - + \ No newline at end of file diff --git a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters index eeb4aece12..1109a2f73c 100644 --- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters @@ -47,4 +47,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/modules/awake/AwakeModuleInterface/packages.config b/src/modules/awake/AwakeModuleInterface/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/awake/AwakeModuleInterface/packages.config +++ b/src/modules/awake/AwakeModuleInterface/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj index 009be36014..8219d398c6 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -22,6 +22,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj index 21cd0a9cb4..643aad98cf 100644 --- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj +++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj @@ -161,7 +161,7 @@ - + @@ -169,6 +169,6 @@ - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj.filters b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj.filters index 3f34fdfd49..a099341ce2 100644 --- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj.filters +++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj.filters @@ -39,4 +39,7 @@ + + + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZones/packages.config b/src/modules/fancyzones/FancyZones/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/fancyzones/FancyZones/packages.config +++ b/src/modules/fancyzones/FancyZones/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj index f7fccae0e4..d2e5b1ca43 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj @@ -155,7 +155,7 @@ - + @@ -163,6 +163,6 @@ - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters index c955adacd6..c72ebd2892 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters @@ -296,4 +296,7 @@ Generated Files + + + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesLib/packages.config b/src/modules/fancyzones/FancyZonesLib/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/fancyzones/FancyZonesLib/packages.config +++ b/src/modules/fancyzones/FancyZonesLib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesLib/pch.h b/src/modules/fancyzones/FancyZonesLib/pch.h index db90d123e2..70a402b0fa 100644 --- a/src/modules/fancyzones/FancyZonesLib/pch.h +++ b/src/modules/fancyzones/FancyZonesLib/pch.h @@ -13,8 +13,9 @@ #include #include #include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj index a46103c5b7..12a82f47e2 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj +++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj @@ -70,7 +70,7 @@ - + @@ -79,6 +79,6 @@ - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj.filters b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj.filters index e27c0a5538..b49ea1cd1a 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj.filters +++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj.filters @@ -41,4 +41,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/packages.config b/src/modules/fancyzones/FancyZonesModuleInterface/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/packages.config +++ b/src/modules/fancyzones/FancyZonesModuleInterface/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj index c0da418a8f..160abae1fa 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj @@ -86,7 +86,7 @@ - + @@ -94,6 +94,6 @@ - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj.filters b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj.filters index 0732c34ad4..fc286dd63e 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj.filters +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj.filters @@ -91,4 +91,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config b/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj b/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj index 8d1972207f..750c3a8c6e 100644 --- a/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj +++ b/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj @@ -20,6 +20,10 @@ + + + runtime + diff --git a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj index d32b74bb50..c8d8268489 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj +++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj @@ -121,7 +121,7 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv - + @@ -129,6 +129,6 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv - + \ No newline at end of file diff --git a/src/modules/imageresizer/ImageResizerContextMenu/packages.config b/src/modules/imageresizer/ImageResizerContextMenu/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/packages.config +++ b/src/modules/imageresizer/ImageResizerContextMenu/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj index cbcfa6aed7..b0839981e6 100644 --- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj +++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj @@ -56,5 +56,9 @@ + + + runtime + diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 42a63f5d83..9984a9431e 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -77,7 +77,7 @@ - + @@ -85,6 +85,6 @@ - + \ No newline at end of file diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters index c6ceeb2f27..81c3649d1e 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters @@ -41,4 +41,7 @@ Generated Files + + + \ No newline at end of file diff --git a/src/modules/launcher/Microsoft.Launcher/packages.config b/src/modules/launcher/Microsoft.Launcher/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/launcher/Microsoft.Launcher/packages.config +++ b/src/modules/launcher/Microsoft.Launcher/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj index 9d81ee857e..99c7afcafc 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj @@ -45,6 +45,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj index 52a1b4b1e0..1f686fab7e 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj @@ -41,6 +41,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj index fde3e7f4ab..80fb46deea 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj @@ -36,6 +36,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj index f5740c38dd..fb6c164ad4 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj @@ -37,6 +37,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj index 384b278b2d..9f003281f3 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj @@ -54,6 +54,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index bf3b3cb1ee..43e1920f46 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj @@ -30,6 +30,26 @@ + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj index c334a5876b..4507376b06 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj @@ -45,7 +45,18 @@ false - + + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj index b8218ad90f..7e16361c9c 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj @@ -40,6 +40,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj index cff4db6b21..dc10119fe0 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj @@ -37,6 +37,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj index cbb35f51c2..5077812e5c 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj @@ -43,6 +43,17 @@ + + + + runtime + + + + runtime + + + True diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj index 62b691a493..cb639ef60e 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj @@ -45,6 +45,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj index 31ba17e106..d1d5af5918 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj @@ -52,6 +52,33 @@ + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj index 06c24f5007..9a882257ff 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj @@ -53,6 +53,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj index f56985e9ff..057a41460d 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj @@ -49,6 +49,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj index 6a95fe6800..b59ea0d6f7 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj @@ -34,6 +34,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj index 1e22a25ae2..7b9bde7411 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj @@ -34,6 +34,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj index 26b17adf3c..56843e6d81 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj @@ -33,6 +33,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj index e6b18cf4a9..a6b86ea8d9 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj @@ -33,6 +33,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj index b463d5d77e..bf0bde3415 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj @@ -42,6 +42,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj index 3728ab8e30..7bd545a21e 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj @@ -33,6 +33,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml index 89255fc6bb..43f7d9ac27 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml @@ -72,6 +72,7 @@ x:Name="pluginsHintsList" Grid.Row="1" Margin="16,0,0,0" + Padding="0,0,32,0" ItemContainerStyle="{StaticResource PluginsListViewItemStyle}" ItemsSource="{Binding Plugins}" PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp" @@ -79,6 +80,14 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" SelectedItem="{Binding SelectedPlugin, Mode=TwoWay}" SelectionMode="Single"> + + + + + diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 56d463e9f3..90c91ea27d 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -81,6 +81,9 @@ + + runtime + @@ -88,6 +91,10 @@ + + + runtime + diff --git a/src/modules/launcher/PowerLauncher/ResultList.xaml b/src/modules/launcher/PowerLauncher/ResultList.xaml index fb040144be..0c8f69b21e 100644 --- a/src/modules/launcher/PowerLauncher/ResultList.xaml +++ b/src/modules/launcher/PowerLauncher/ResultList.xaml @@ -45,7 +45,7 @@ diff --git a/src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs b/src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs deleted file mode 100644 index f02353beb8..0000000000 --- a/src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation -// The Microsoft Corporation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Wox.Plugin; - -namespace Wox.Infrastructure.UserSettings -{ - public class CustomPluginHotkey : BaseModel - { - public string Hotkey { get; set; } - - public string ActionKeyword { get; set; } - } -} diff --git a/src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs b/src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs deleted file mode 100644 index 3e2071ca34..0000000000 --- a/src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation -// The Microsoft Corporation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace Wox.Infrastructure.UserSettings -{ - public class HttpProxy - { - public bool Enabled { get; set; } - - public string Server { get; set; } - - public int Port { get; set; } - - public string UserName { get; set; } - - public string Password { get; set; } - } -} diff --git a/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs b/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs index cb993dc4fe..0478e63f09 100644 --- a/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs +++ b/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs @@ -2,9 +2,6 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.ObjectModel; -using System.Drawing; using System.Text.Json.Serialization; using ManagedCommon; @@ -177,35 +174,16 @@ namespace Wox.Infrastructure.UserSettings } } - public string Language { get; set; } = "en"; - public Theme Theme { get; set; } = Theme.System; public StartupPosition StartupPosition { get; set; } = StartupPosition.Cursor; - public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name; - - public string QueryBoxFontStyle { get; set; } - - public string QueryBoxFontWeight { get; set; } - public bool PTRunNonDelayedSearchInParallel { get; set; } = true; public string PTRunStartNewSearchAction { get; set; } public bool PTRSearchQueryFastResultsWithDelay { get; set; } - // public bool PTRSearchQueryFastResultsWithPartialDelay { get; set; } - public string QueryBoxFontStretch { get; set; } - - public string ResultFont { get; set; } = FontFamily.GenericSansSerif.Name; - - public string ResultFontStyle { get; set; } - - public string ResultFontWeight { get; set; } - - public string ResultFontStretch { get; set; } - /// /// Gets or sets a value indicating whether when false Alphabet static service will always return empty results /// @@ -213,38 +191,6 @@ namespace Wox.Infrastructure.UserSettings internal StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular; - [JsonIgnore] - public string QuerySearchPrecisionString - { - get - { - return QuerySearchPrecision.ToString(); - } - - set - { - try - { - var precisionScore = (StringMatcher.SearchPrecisionScore)Enum - .Parse(typeof(StringMatcher.SearchPrecisionScore), value); - - QuerySearchPrecision = precisionScore; - StringMatcher.Instance.UserSettingSearchPrecision = precisionScore; - } - catch (ArgumentException e) - { - Wox.Plugin.Logger.Log.Exception("Failed to load QuerySearchPrecisionString value from Settings file", e, GetType()); - - QuerySearchPrecision = StringMatcher.SearchPrecisionScore.Regular; - StringMatcher.Instance.UserSettingSearchPrecision = StringMatcher.SearchPrecisionScore.Regular; - - throw; - } - } - } - - public bool AutoUpdates { get; set; } - public double WindowLeft { get; set; } public double WindowTop { get; set; } @@ -283,34 +229,6 @@ namespace Wox.Infrastructure.UserSettings } } - public ObservableCollection CustomPluginHotkeys { get; } = new ObservableCollection(); - - public bool DontPromptUpdateMsg { get; set; } - - public bool EnableUpdateLog { get; set; } - - public bool StartWoxOnSystemStartup { get; set; } = true; - - public bool HideOnStartup { get; set; } - - private bool _hideNotifyIcon; - - public bool HideNotifyIcon - { - get - { - return _hideNotifyIcon; - } - - set - { - _hideNotifyIcon = value; - OnPropertyChanged(); - } - } - - public bool LeaveCmdOpen { get; set; } - public bool HideWhenDeactivated { get; set; } = true; public bool ClearInputOnLaunch { get; set; } @@ -349,8 +267,6 @@ namespace Wox.Infrastructure.UserSettings public bool GenerateThumbnailsFromFiles { get; set; } = true; - public HttpProxy Proxy { get; set; } = new HttpProxy(); - [JsonConverter(typeof(JsonStringEnumConverter))] public LastQueryMode LastQueryMode { get; set; } = LastQueryMode.Selected; } diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index f145197420..ec105cc0b7 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -15,6 +15,13 @@ ..\..\..\..\$(Platform)\$(Configuration)\WoxInfrastructure + + win-x64 + + + win-arm64 + + true DEBUG;TRACE @@ -43,7 +50,17 @@ - + + + runtime + + + + runtime + + + runtime + \ No newline at end of file diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index d8feef2270..03204ca6cd 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -51,6 +51,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index eb518a2301..c46792ea1d 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -54,6 +54,30 @@ + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + diff --git a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml index 7332884799..06cd72c547 100644 --- a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml +++ b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml @@ -67,7 +67,7 @@ x:Name="LaunchAppButton" x:Uid="LaunchAppButton" VerticalAlignment="Center" - Command="{x:Bind LaunchDefaultAppButtonAsyncCommand, Mode=OneWay}" + Command="{x:Bind LaunchDefaultAppButtonCommand, Mode=OneWay}" ToolTipService.ToolTip="{x:Bind OpenWithAppToolTip, Mode=OneWay}" Visibility="{x:Bind IsLaunchDefaultAppButtonVisible(DefaultAppName), Mode=OneWay}"> diff --git a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml.cs b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml.cs index f24aedaf75..09b3967307 100644 --- a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml.cs +++ b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using ManagedCommon; @@ -131,7 +132,7 @@ namespace Peek.UI.Views } [RelayCommand] - private async void LaunchDefaultAppButtonAsync() + private async Task LaunchDefaultAppButtonAsync() { if (Item is not FileItem fileItem) { diff --git a/src/modules/peek/peek/peek.vcxproj b/src/modules/peek/peek/peek.vcxproj index e46a75e7b4..95fa2bf1e5 100644 --- a/src/modules/peek/peek/peek.vcxproj +++ b/src/modules/peek/peek/peek.vcxproj @@ -61,7 +61,7 @@ - + @@ -72,6 +72,6 @@ - + \ No newline at end of file diff --git a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj index 07cf770d98..0e9ef9a69c 100644 --- a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj +++ b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj @@ -68,7 +68,7 @@ - + @@ -76,6 +76,6 @@ - + \ No newline at end of file diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj index 4d6e0312e1..7627a74612 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj +++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj @@ -114,7 +114,7 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv - + @@ -122,6 +122,6 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv - + \ No newline at end of file diff --git a/src/modules/powerrename/PowerRenameContextMenu/packages.config b/src/modules/powerrename/PowerRenameContextMenu/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/packages.config +++ b/src/modules/powerrename/PowerRenameContextMenu/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index 0365d61573..287570edfc 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,6 +1,6 @@  - + @@ -203,11 +203,11 @@ - - + + @@ -215,13 +215,13 @@ - - - + + + diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config index 487da7086e..8820eb03ad 100644 --- a/src/modules/powerrename/PowerRenameUILib/packages.config +++ b/src/modules/powerrename/PowerRenameUILib/packages.config @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj index 4139712653..9b2e7d8b11 100644 --- a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj @@ -107,7 +107,7 @@ - + @@ -115,6 +115,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config b/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config +++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj index 3fb16ae3ff..fc45a56d67 100644 --- a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj @@ -106,15 +106,15 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config b/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config +++ b/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj b/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj index 2167c7cecf..ac1ae6fac5 100644 --- a/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj @@ -107,7 +107,7 @@ - + @@ -115,6 +115,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config b/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config +++ b/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj index f2593fbae8..337a8c4b53 100644 --- a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj @@ -106,15 +106,15 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/modules/previewpane/StlThumbnailProviderCpp/packages.config b/src/modules/previewpane/StlThumbnailProviderCpp/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/previewpane/StlThumbnailProviderCpp/packages.config +++ b/src/modules/previewpane/StlThumbnailProviderCpp/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj index 6367a0fdf6..7eff3bdf67 100644 --- a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj @@ -106,15 +106,15 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config b/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config +++ b/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/packages.config b/src/modules/previewpane/powerpreview/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/previewpane/powerpreview/packages.config +++ b/src/modules/previewpane/powerpreview/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index c10ac68760..67572b3a69 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -92,7 +92,7 @@ - + @@ -100,6 +100,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters index e3ac2e9375..39a7f345da 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters @@ -62,4 +62,7 @@ Generated Files + + + \ No newline at end of file diff --git a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj index 75bf34606e..911f2fe419 100644 --- a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj +++ b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj @@ -120,7 +120,7 @@ - + @@ -128,6 +128,6 @@ - + \ No newline at end of file diff --git a/src/modules/registrypreview/RegistryPreviewExt/packages.config b/src/modules/registrypreview/RegistryPreviewExt/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/registrypreview/RegistryPreviewExt/packages.config +++ b/src/modules/registrypreview/RegistryPreviewExt/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj index 9c0cae5d7b..5c38551b43 100644 --- a/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj +++ b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj @@ -54,11 +54,6 @@ $(OutDir) false - - - - https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json - diff --git a/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml index f13cb718ac..3bce0037d6 100644 --- a/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml +++ b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml @@ -2,10 +2,10 @@ x:Class="RegistryPreview.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:sizers="using:CommunityToolkit.WinUI.Controls" + xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" xmlns:winuiex="using:WinUIEx" MinWidth="480" @@ -237,7 +237,7 @@ Grid.Row="3" Grid.Column="2" Style="{StaticResource GridCardStyle}"> - - - + - + - - - + + - - - + + - - - + @@ -172,7 +172,7 @@ - + @@ -188,4 +188,7 @@ + + + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters b/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters index 4712799e4f..fea3b28290 100644 --- a/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters +++ b/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters @@ -69,4 +69,10 @@ Assets\VCM + + + + + + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceModule/packages.config b/src/modules/videoconference/VideoConferenceModule/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/videoconference/VideoConferenceModule/packages.config +++ b/src/modules/videoconference/VideoConferenceModule/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceModule/pch.h b/src/modules/videoconference/VideoConferenceModule/pch.h index 8e268511bc..3f4849aa44 100644 --- a/src/modules/videoconference/VideoConferenceModule/pch.h +++ b/src/modules/videoconference/VideoConferenceModule/pch.h @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj index a277958148..fd8525072f 100644 --- a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj +++ b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj @@ -146,12 +146,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilterx86.sln b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilterx86.sln index e61fcf0bd6..e4f5a92176 100644 --- a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilterx86.sln +++ b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilterx86.sln @@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoConferenceProxyFilter" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoConferenceShared", "..\VideoConferenceShared\VideoConferenceShared.vcxproj", "{459E0768-7EBD-4C41-BBA1-6DB3B3815E0A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\..\..\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -31,6 +33,14 @@ Global {459E0768-7EBD-4C41-BBA1-6DB3B3815E0A}.Release|Win32.Build.0 = Release|Win32 {459E0768-7EBD-4C41-BBA1-6DB3B3815E0A}.Release|x64.ActiveCfg = Release|x64 {459E0768-7EBD-4C41-BBA1-6DB3B3815E0A}.Release|x64.Build.0 = Release|x64 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|Win32.Build.0 = Debug|Win32 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.ActiveCfg = Debug|x64 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.Build.0 = Debug|x64 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|Win32.ActiveCfg = Release|Win32 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|Win32.Build.0 = Release|Win32 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|x64.ActiveCfg = Release|x64 + {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/packages.config b/src/modules/videoconference/VideoConferenceProxyFilter/packages.config index 3d9798ef5e..6199e2345c 100644 --- a/src/modules/videoconference/VideoConferenceProxyFilter/packages.config +++ b/src/modules/videoconference/VideoConferenceProxyFilter/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj index d59249a4b4..d720b314df 100644 --- a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj +++ b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj @@ -135,7 +135,7 @@ - + @@ -143,6 +143,6 @@ - + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceShared/packages.config b/src/modules/videoconference/VideoConferenceShared/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/modules/videoconference/VideoConferenceShared/packages.config +++ b/src/modules/videoconference/VideoConferenceShared/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/runner/packages.config b/src/runner/packages.config index e11b462529..2c654a3e7d 100644 --- a/src/runner/packages.config +++ b/src/runner/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj index 3671cc3d56..d3f1272bc4 100644 --- a/src/runner/runner.vcxproj +++ b/src/runner/runner.vcxproj @@ -127,7 +127,7 @@ - + @@ -135,6 +135,6 @@ - + \ No newline at end of file diff --git a/src/runner/runner.vcxproj.filters b/src/runner/runner.vcxproj.filters index e8fad83d26..a91782fd24 100644 --- a/src/runner/runner.vcxproj.filters +++ b/src/runner/runner.vcxproj.filters @@ -123,4 +123,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj index 17b5681ffc..54a6d6db0d 100644 --- a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj +++ b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj @@ -27,11 +27,6 @@ ..\..\..\x64\Release\tests\SettingsTest\ - - - https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json - - @@ -39,6 +34,14 @@ + + + runtime + + + + runtime + diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index 90a9709dfb..a657ea827e 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -61,11 +61,6 @@ false - - - https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json - - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml index 326d3915b2..6e65f31069 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml @@ -3,7 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters"> + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"> @@ -17,27 +17,27 @@ - - - - - - + + 6,16,16,16 diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml index 7571434778..c077042d96 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml @@ -3,7 +3,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="300" d:DesignWidth="400" diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml index 207887ecdf..4622609b95 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml @@ -5,15 +5,15 @@ x:Class="Microsoft.PowerToys.Settings.UI.Controls.ColorFormatEditor" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:CommunityToolkit="using:CommunityToolkit.WinUI.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls" mc:Ignorable="d"> - + @@ -36,7 +36,7 @@ - + @@ -60,7 +60,7 @@ - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml index cd4d0b6ac3..10a1e01236 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml @@ -3,7 +3,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="300" d:DesignWidth="400" diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml index e9b3a6a55f..7cf88ac0f6 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml @@ -4,11 +4,11 @@ + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"> - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml index 469a8be795..00192a215a 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml @@ -1,11 +1,11 @@  + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"> 16 12 - - - - - + + + - + - + @@ -78,7 +78,7 @@ - - - - - - - - @@ -394,7 +394,7 @@ - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml index 0df3a73a58..7d61d944da 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml @@ -3,21 +3,21 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:controls1="using:CommunityToolkit.WinUI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - + - - - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml index 5fb3ddeb22..7c7cf18e0c 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml @@ -2,23 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + - - - + + + - + - - + + - - - - + + + - - + + - - + + - - + + - - - - - + + + + + - - - + + + - @@ -87,9 +87,9 @@ - - - + + - - + + - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + - - - - - - - - - + + + + + + + + + - - - + + - + @@ -196,40 +196,40 @@ - + - - + + - - - - + + + + - - + + - - + + - - - - + + + + - + - - - + + - - - - + + + + - + - - - - + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml index ca62c8589a..41a1921809 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml @@ -2,24 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.FileLocksmithPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - + - + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml index b6832d837e..2a5fb16385 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.GeneralPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + + - - - + + + @@ -33,7 +33,7 @@ FontWeight="SemiBold" NavigateUri="https://github.com/microsoft/PowerToys/releases/" /> - + - + - - + - + - - + - + - + - - + @@ -322,10 +322,10 @@ Text="{x:Bind ViewModel.LastSettingsBackupDate, Mode=OneWay}" TextWrapping="WrapWholeWords" /> - - - - + + + + - - - + + + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml index 3b8284d334..f99c21dd46 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml @@ -2,68 +2,68 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.HostsPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - + + - - + - - + - - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml index e57857e78f..ad4a3b868b 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml @@ -2,12 +2,12 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.ImageResizerPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" x:Name="RootPage" @@ -21,15 +21,15 @@ FalseValue="1" TrueValue="0" /> - - + + - - + - - + + - + - + - - + + @@ -188,25 +188,25 @@ - + - + - + - + - + - + @@ -216,11 +216,11 @@ - - + + - - + + - + - + - - + + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml index 19ca095034..f4ac4d7448 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml @@ -3,27 +3,27 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Lib="using:Microsoft.PowerToys.Settings.UI.Library" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - + - + - + - - + + - - + - - + + - - + - + - - + - + - - + - + - - + - + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml index 44fa437f92..65ab8bc363 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml @@ -2,34 +2,34 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MeasureToolPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - - + + + + + @@ -37,14 +37,14 @@ - + - + - - + + - + - + - + - + - + - + --> - + - + - - - - + + + + - - - - - - - - + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml index 9ab3612f11..0228c9f2d4 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml @@ -2,39 +2,39 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseUtilsPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + - - + + - - + - + - - - + + - - + - - - + + + - - - + + + - - - + + - - - - - - - - + + + + + + + + - - + + - - + + - - - + + + - - - + + - - - - + + + + - - + - + - - - - + + + - - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - - - + + + + - - + - + - - - - + + - + - + - - + + - - + - + - - - - + + + - - - + + + - - - - - - + + + + + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml index eafcb80448..493a94f0d0 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml @@ -2,11 +2,11 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseWithoutBordersPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> @@ -17,11 +17,11 @@ FalseValue="2" TrueValue="4" /> - - + + - - + @@ -29,22 +29,22 @@ x:Uid="ToggleSwitch" IsEnabled="{x:Bind ViewModel.CanBeEnabled, Mode=OneWay}" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" /> - + - - - + + - - + + - - + + - - - - + + + @@ -166,7 +166,7 @@ - + + - - - - + + + + - + - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + - + - - + - + - - + - + - - + - + - + - - - - - - + + + + + + - - - - - - + + + + + - + - - + + - - - - - - - - - + + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml index fbabda26c7..2573cfcd29 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PastePlainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - + + + + - + - + - - - - + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml index e4d98693f5..eca6e43f7d 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml @@ -2,23 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PeekPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - - - - + + + + + + + - - + + - - + + - - + - - + + - - - + + - - - - + + + + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml index 2c19fae660..87f0b7b625 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerAccentPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + - - + - - + + - - + + - - + + @@ -78,11 +78,11 @@ - - + + - - + + @@ -94,20 +94,20 @@ - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml index 825ecfb41c..ec56a0bbbc 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml @@ -3,26 +3,26 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ViewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + - - - - - - + + + + + + - - - - + + + + - - + - - + + - - + + - - - + + + - @@ -120,20 +120,20 @@ Minimum="1" SpinButtonPlacementMode="Compact" Value="{x:Bind ViewModel.MaximumNumberOfResults, Mode=TwoWay}" /> - - + + - - - + + + - - - + + - - - - - - + + + + + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + - - + + - + - - - + - - + - - + - - + - - - - + - + - - - - + - + - - - - + - + - - + @@ -594,24 +594,24 @@ - - - + + + - + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml index f5f09f14d3..f5f4387eaf 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerOcrPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - - + + + + + - - + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml index cd865c0a83..97aa896cfb 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml @@ -2,31 +2,31 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerPreviewPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - + - - - + + - - - - - + + + + + - - - + + + - - + - - - + + - - - + + - - + + - - - + + + - - + - - + - - + - + - + - - + - - + - - + - - - - - - - + + + + + + - - + - + - + - - - - - - - - + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml index 3af561bb30..bcb784c1e6 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml @@ -2,84 +2,84 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - - + + - - - + + + - + - - + + - - + + - - - + + + - + - - - - + + + + - - + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml index 02bc3b1c83..d9374e94b0 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml @@ -2,24 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.RegistryPreviewPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + - + - - + + - + - - - - + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml index 9075931860..a0decd0bd5 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml @@ -2,45 +2,45 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.ShortcutGuidePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - + - - - + + - @@ -51,9 +51,9 @@ SmallChange="50" SpinButtonPlacementMode="Compact" Value="{x:Bind ViewModel.PressTime, Mode=TwoWay}" /> - + - @@ -64,7 +64,7 @@ SmallChange="50" SpinButtonPlacementMode="Compact" Value="{x:Bind ViewModel.DelayTime, Mode=TwoWay}" /> - + - + - - - + + + - + - + - + - - + + - - + - - + + - - - - + + + + - - - - - + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml index c34dac09ba..69fc869690 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml @@ -2,27 +2,27 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.VideoConferencePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - - - + + - - + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - + + - + - + - - + + - - + @@ -98,8 +98,8 @@ IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" ItemsSource="{x:Bind ViewModel.CameraNames, Mode=OneTime}" SelectedIndex="{x:Bind ViewModel.SelectedCameraIndex, Mode=TwoWay}" /> - - + +