diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index baaa94f5ed..c2bed289bf 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1965,6 +1965,7 @@ vabdq validmodulename valuegenerator VARTYPE +vbcscompiler vcamp VCENTER vcgtq diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 1aeb799a65..0ec8d1dd31 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -200,7 +200,7 @@ jobs: - template: steps-ensure-dotnet-version.yml parameters: sdk: true - version: '9.0' + version: '10.0' - ${{ if eq(parameters.runTests, true) }}: - task: VisualStudioTestPlatformInstaller@1 @@ -418,7 +418,7 @@ jobs: /p:VCRTForwarders-IncludeDebugCRT=false /p:PowerToysRoot=$(Build.SourcesDirectory) /p:PublishProfile=InstallationPublishProfile.pubxml - /p:TargetFramework=net9.0-windows10.0.26100.0 + /p:TargetFramework=net10.0-windows10.0.26100.0 /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog $(RestoreAdditionalProjectSourcesArg) platform: $(BuildPlatform) diff --git a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml index b327b8004f..511af33773 100644 --- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml +++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml @@ -1,7 +1,7 @@ parameters: - name: version type: string - default: "9.0" + default: "10.0" - name: sdk type: boolean default: false diff --git a/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 b/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 index 0e0fdbabf7..82ae0c4e38 100644 --- a/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 +++ b/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 @@ -22,7 +22,7 @@ $totalList = $projFiles | ForEach-Object -Parallel { #Workaround for preventing exit code from dotnet process from reflecting exit code in PowerShell $procInfo = New-Object System.Diagnostics.ProcessStartInfo -Property @{ FileName = "dotnet.exe"; - Arguments = "list $csproj package"; + Arguments = "list $csproj package --no-restore"; RedirectStandardOutput = $true; RedirectStandardError = $true; } diff --git a/Directory.Build.props b/Directory.Build.props index aa2d3fc600..8745c1c311 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -171,6 +171,12 @@ $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**; + + + $(MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns); + \**\dotnet\dotnet.exe; + \**\vbcscompiler.exe; + - - + + + - + - - - - - - - + + + + + + + @@ -65,9 +66,9 @@ - + - + - - + - - - + + + - + - + - + - + - + - - - - + + + + diff --git a/auto-cherry-pick.ps1 b/auto-cherry-pick.ps1 new file mode 100644 index 0000000000..6c6c62b2cf --- /dev/null +++ b/auto-cherry-pick.ps1 @@ -0,0 +1,54 @@ +# Auto-resolve cherry-pick conflicts +param([int]$MaxAttempts = 100) + +$attempts = 0 +while ($attempts -lt $MaxAttempts) { + $attempts++ + + # Check if cherry-pick is in progress + $status = git status --porcelain + if (-not $status) { + Write-Host "Cherry-pick complete!" -ForegroundColor Green + break + } + + # Get conflicted files + $conflicts = git diff --name-only --diff-filter=U + + if ($conflicts) { + Write-Host "Attempt $attempts`: Resolving conflicts..." -ForegroundColor Yellow + + foreach ($file in $conflicts) { + Write-Host " Resolving: $file" + git checkout --ours $file 2>$null + } + + # Handle deleted files + git status --short | Where-Object { $_ -match '^DU' } | ForEach-Object { + $file = ($_ -split '\s+', 2)[1] + Write-Host " Removing deleted: $file" + git rm $file 2>$null + } + + git add . 2>$null + } + + # Try to continue + $result = git cherry-pick --continue 2>&1 + + if ($LASTEXITCODE -eq 0) { + Write-Host " Continued successfully" -ForegroundColor Green + } + elseif ($result -match 'empty') { + Write-Host " Skipping empty commit" -ForegroundColor Cyan + git cherry-pick --skip 2>&1 | Out-Null + } + else { + Write-Host " Error: $result" -ForegroundColor Red + Start-Sleep -Seconds 1 + } +} + +if ($attempts -ge $MaxAttempts) { + Write-Host "Max attempts reached. Check status manually." -ForegroundColor Red +} diff --git a/doc/devdocs/modules/launcher/new-plugin-checklist.md b/doc/devdocs/modules/launcher/new-plugin-checklist.md index 924354aa6f..45e605f562 100644 --- a/doc/devdocs/modules/launcher/new-plugin-checklist.md +++ b/doc/devdocs/modules/launcher/new-plugin-checklist.md @@ -3,9 +3,9 @@ - [ ] The plugin is a project under `modules\launcher\Plugins` - [ ] Microsoft plugin project name pattern: `Microsoft.PowerToys.Run.Plugin.{PluginName}` - [ ] Community plugin project name pattern: `Community.PowerToys.Run.Plugin.{PluginName}` -- [ ] The plugin target framework should be `net9.0-windows10.0.22621.0` +- [ ] The plugin target framework should be `net10.0-windows10.0.22621.0` - [ ] If the plugin uses any 3rd party dependencies the project file should import `DynamicPlugin.props` -- [ ] 3rd party dependencies must be compatible with .NET 9 +- [ ] 3rd party dependencies must be compatible with .NET 10 - [ ] The plugin has to contain a `plugin.json` file of the following format in its root folder: ```json diff --git a/installer/PowerToysSetupVNext/publish.cmd b/installer/PowerToysSetupVNext/publish.cmd index f61668cffe..c345bb35ec 100644 --- a/installer/PowerToysSetupVNext/publish.cmd +++ b/installer/PowerToysSetupVNext/publish.cmd @@ -8,10 +8,10 @@ SET VCToolsVersion=!VCToolsVersion! SET ClearDevCommandPromptEnvVars=false rem In case of Release we should not use Debug CRT in VCRT forwarders -msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0 +msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0 -msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0 +msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0 -msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0 +msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0 -msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0 \ No newline at end of file +msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0 \ No newline at end of file diff --git a/src/ActionRunner/actionRunner.vcxproj b/src/ActionRunner/actionRunner.vcxproj index 553939cc80..1da2cd63a1 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 d3882436a5..ee53a74931 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/Common.Dotnet.CsWinRT.props b/src/Common.Dotnet.CsWinRT.props index c3c713c214..5cfb3d5aba 100644 --- a/src/Common.Dotnet.CsWinRT.props +++ b/src/Common.Dotnet.CsWinRT.props @@ -4,7 +4,7 @@ - net9.0 + net10.0 10.0.26100.68-preview $(CoreTargetFramework)-windows10.0.26100.0 10.0.19041.0 diff --git a/src/Update/PowerToys.Update.vcxproj b/src/Update/PowerToys.Update.vcxproj index 45ec0b1d65..ff1a9cb402 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 d3882436a5..ee53a74931 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 43a9e9f8d0..0ff04b7a76 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/Common.UI.Controls/Common.UI.Controls.csproj b/src/common/Common.UI.Controls/Common.UI.Controls.csproj index 2def369fd9..9a5f5b44eb 100644 --- a/src/common/Common.UI.Controls/Common.UI.Controls.csproj +++ b/src/common/Common.UI.Controls/Common.UI.Controls.csproj @@ -4,7 +4,7 @@ Library - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 Microsoft.PowerToys.Common.UI.Controls PowerToys.Common.UI.Controls true diff --git a/src/common/FilePreviewCommon/FilePreviewCommon.csproj b/src/common/FilePreviewCommon/FilePreviewCommon.csproj index b968ba5ab4..310c217353 100644 --- a/src/common/FilePreviewCommon/FilePreviewCommon.csproj +++ b/src/common/FilePreviewCommon/FilePreviewCommon.csproj @@ -14,7 +14,6 @@ - diff --git a/src/common/SettingsAPI/SettingsAPI.vcxproj b/src/common/SettingsAPI/SettingsAPI.vcxproj index 34300796de..f6e4635c42 100644 --- a/src/common/SettingsAPI/SettingsAPI.vcxproj +++ b/src/common/SettingsAPI/SettingsAPI.vcxproj @@ -55,7 +55,7 @@ - + @@ -63,6 +63,6 @@ - + \ No newline at end of file diff --git a/src/common/Telemetry/EtwTrace/EtwTrace.vcxproj b/src/common/Telemetry/EtwTrace/EtwTrace.vcxproj index 4c2a4e48e6..1be6d5e0bc 100644 --- a/src/common/Telemetry/EtwTrace/EtwTrace.vcxproj +++ b/src/common/Telemetry/EtwTrace/EtwTrace.vcxproj @@ -38,7 +38,7 @@ - + @@ -46,6 +46,6 @@ - + \ No newline at end of file diff --git a/src/common/Telemetry/EtwTrace/packages.config b/src/common/Telemetry/EtwTrace/packages.config index d3882436a5..ee53a74931 100644 --- a/src/common/Telemetry/EtwTrace/packages.config +++ b/src/common/Telemetry/EtwTrace/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/common/UITestAutomation/UITestAutomation.csproj b/src/common/UITestAutomation/UITestAutomation.csproj index 59310e79c0..df8aa91043 100644 --- a/src/common/UITestAutomation/UITestAutomation.csproj +++ b/src/common/UITestAutomation/UITestAutomation.csproj @@ -8,7 +8,7 @@ enable true true - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 true false @@ -18,7 +18,6 @@ - diff --git a/src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj b/src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj index 04bf0c1ca0..a1c03373de 100644 --- a/src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj +++ b/src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj @@ -27,7 +27,7 @@ - ..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\deps\spdlog\include;..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + ..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\deps\spdlog\include;..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) stdcpp23 SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_HEADER_ONLY;%(PreprocessorDefinitions) diff --git a/src/common/interop/PowerToys.Interop.vcxproj b/src/common/interop/PowerToys.Interop.vcxproj index 0c0727afa2..938b9cc21a 100644 --- a/src/common/interop/PowerToys.Interop.vcxproj +++ b/src/common/interop/PowerToys.Interop.vcxproj @@ -172,14 +172,14 @@ - + 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}. - + diff --git a/src/common/interop/packages.config b/src/common/interop/packages.config index d3882436a5..ee53a74931 100644 --- a/src/common/interop/packages.config +++ b/src/common/interop/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/common/notifications/notifications.vcxproj b/src/common/notifications/notifications.vcxproj index bb124ab4ba..a94b648ae4 100644 --- a/src/common/notifications/notifications.vcxproj +++ b/src/common/notifications/notifications.vcxproj @@ -46,7 +46,7 @@ - + @@ -54,6 +54,6 @@ - + \ No newline at end of file diff --git a/src/common/notifications/packages.config b/src/common/notifications/packages.config index d3882436a5..ee53a74931 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 d3882436a5..ee53a74931 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 6582b15d22..616c648eb6 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/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj index 090f3c75a7..12f38cd617 100644 --- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj +++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj @@ -74,8 +74,6 @@ - - diff --git a/src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj b/src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj index 6848b5f1a6..7476afa84d 100644 --- a/src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj +++ b/src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj @@ -20,9 +20,6 @@ - - - diff --git a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj index e931d3bb85..05b0c9d051 100644 --- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj +++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj @@ -161,7 +161,7 @@ - + @@ -170,6 +170,6 @@ - + \ No newline at end of file diff --git a/src/modules/CropAndLock/CropAndLock/packages.config b/src/modules/CropAndLock/CropAndLock/packages.config index 51fbe043d6..e769b0b805 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 aaaf2d0bd5..bc71d17593 100644 --- a/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj +++ b/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj @@ -103,7 +103,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config b/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config index d3882436a5..ee53a74931 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 01587e9186..f9d1c76216 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj @@ -65,8 +65,6 @@ - - diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj index 858f43313f..bf3df82c89 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj +++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj @@ -49,8 +49,6 @@ - - diff --git a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj b/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj index eefb123196..77a2d10288 100644 --- a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj +++ b/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj @@ -144,14 +144,14 @@ MakeAppx.exe pack /d . /p $(OutDir)FileLocksmithContextMenuPackage.msix /nv - + 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}. - + diff --git a/src/modules/FileLocksmith/FileLocksmithContextMenu/packages.config b/src/modules/FileLocksmith/FileLocksmithContextMenu/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/FileLocksmith/FileLocksmithContextMenu/packages.config +++ b/src/modules/FileLocksmith/FileLocksmithContextMenu/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj index 600216fdbf..f6633cbf62 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj @@ -61,7 +61,6 @@ - diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 86771137b4..180331e168 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps diff --git a/src/modules/Hosts/Hosts.UITests/HostsEditor.UITests.csproj b/src/modules/Hosts/Hosts.UITests/HostsEditor.UITests.csproj index e3fe2d8f65..cb9d64cdca 100644 --- a/src/modules/Hosts/Hosts.UITests/HostsEditor.UITests.csproj +++ b/src/modules/Hosts/Hosts.UITests/HostsEditor.UITests.csproj @@ -31,9 +31,6 @@ - - - diff --git a/src/modules/Hosts/Hosts/Hosts.csproj b/src/modules/Hosts/Hosts/Hosts.csproj index 2d00648ca4..f55f297d91 100644 --- a/src/modules/Hosts/Hosts/Hosts.csproj +++ b/src/modules/Hosts/Hosts/Hosts.csproj @@ -64,8 +64,6 @@ - - diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj index 86bc711c49..79f257b44b 100644 --- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj +++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj @@ -118,7 +118,7 @@ - + diff --git a/src/modules/LightSwitch/LightSwitchService/packages.config b/src/modules/LightSwitch/LightSwitchService/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/LightSwitch/LightSwitchService/packages.config +++ b/src/modules/LightSwitch/LightSwitchService/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/MouseWithoutBorders/App/Core/Encryption.cs b/src/modules/MouseWithoutBorders/App/Core/Encryption.cs index 9d00b6bb40..5a92989a43 100644 --- a/src/modules/MouseWithoutBorders/App/Core/Encryption.cs +++ b/src/modules/MouseWithoutBorders/App/Core/Encryption.cs @@ -121,12 +121,12 @@ internal static class Encryption if (!LegalKeyDictionary.TryGetValue(myKey, out byte[] value)) { - Rfc2898DeriveBytes key = new( + rv = Rfc2898DeriveBytes.Pbkdf2( myKey, Common.GetBytesU(InitialIV), 50000, - HashAlgorithmName.SHA512); - rv = key.GetBytes(32); + HashAlgorithmName.SHA512, + 32); _ = LegalKeyDictionary.AddOrUpdate(myKey, rv, (k, v) => rv); } else diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs index ac6ec8c311..59de710ec7 100644 --- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs +++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs @@ -37,7 +37,7 @@ namespace MouseWithoutBorders } } - protected override void OnClosing(System.ComponentModel.CancelEventArgs e) + protected override void OnFormClosing(System.Windows.Forms.FormClosingEventArgs e) { MachineStuff.Settings = null; @@ -47,7 +47,7 @@ namespace MouseWithoutBorders _currentPage.OnPageClosing(); } - base.OnClosing(e); + base.OnFormClosing(e); } internal SettingsFormPage GetCurrentPage() diff --git a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj index 53af161e16..0decd70d38 100644 --- a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj +++ b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj @@ -72,8 +72,6 @@ - - diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj index acb106b8f5..5b6bf45cb9 100644 --- a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj +++ b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj @@ -66,14 +66,14 @@ - + 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}. - + diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj index 895430df0b..206e868e10 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj +++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj @@ -143,7 +143,7 @@ - + @@ -151,6 +151,6 @@ - + \ No newline at end of file diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/packages.config b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/packages.config +++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/packages.config b/src/modules/NewPlus/NewShellExtensionContextMenu/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/NewPlus/NewShellExtensionContextMenu/packages.config +++ b/src/modules/NewPlus/NewShellExtensionContextMenu/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj index 0d02dc6b60..6a61c4ca8c 100644 --- a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj +++ b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj @@ -30,7 +30,6 @@ - diff --git a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj b/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj index f32e679128..f388636436 100644 --- a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj +++ b/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj @@ -174,7 +174,7 @@ - + @@ -182,6 +182,6 @@ - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesLauncher/packages.config b/src/modules/Workspaces/WorkspacesLauncher/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/Workspaces/WorkspacesLauncher/packages.config +++ b/src/modules/Workspaces/WorkspacesLauncher/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj index 5c300ae8a0..c20dca509b 100644 --- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj +++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj @@ -82,7 +82,7 @@ - + @@ -90,6 +90,6 @@ - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesLib/packages.config b/src/modules/Workspaces/WorkspacesLib/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/Workspaces/WorkspacesLib/packages.config +++ b/src/modules/Workspaces/WorkspacesLib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesModuleInterface/packages.config b/src/modules/Workspaces/WorkspacesModuleInterface/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/Workspaces/WorkspacesModuleInterface/packages.config +++ b/src/modules/Workspaces/WorkspacesModuleInterface/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj b/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj index 562ec78471..9d17fea79f 100644 --- a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj +++ b/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj @@ -166,7 +166,7 @@ - + @@ -174,6 +174,6 @@ - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesSnapshotTool/packages.config b/src/modules/Workspaces/WorkspacesSnapshotTool/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/Workspaces/WorkspacesSnapshotTool/packages.config +++ b/src/modules/Workspaces/WorkspacesSnapshotTool/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj b/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj index b56b3ff86f..f593b3c4e8 100644 --- a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj +++ b/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj @@ -165,7 +165,7 @@ - + @@ -173,6 +173,6 @@ - + \ No newline at end of file diff --git a/src/modules/Workspaces/WorkspacesWindowArranger/packages.config b/src/modules/Workspaces/WorkspacesWindowArranger/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/Workspaces/WorkspacesWindowArranger/packages.config +++ b/src/modules/Workspaces/WorkspacesWindowArranger/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj index 87f6cc7a2c..3f6c49da12 100644 --- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj +++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj @@ -391,9 +391,9 @@ - + - - \ No newline at end of file + + diff --git a/src/modules/ZoomIt/ZoomIt/packages.config b/src/modules/ZoomIt/ZoomIt/packages.config index 51fbe043d6..e769b0b805 100644 --- a/src/modules/ZoomIt/ZoomIt/packages.config +++ b/src/modules/ZoomIt/ZoomIt/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj b/src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj index 021759297d..e56a1a9c30 100644 --- a/src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj +++ b/src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj @@ -100,7 +100,7 @@ - + @@ -108,6 +108,6 @@ 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/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj b/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj index 4c30a44134..02f92adb45 100644 --- a/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj +++ b/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj @@ -119,7 +119,7 @@ - + @@ -127,6 +127,6 @@ - + \ No newline at end of file diff --git a/src/modules/ZoomIt/ZoomItSettingsInterop/packages.config b/src/modules/ZoomIt/ZoomItSettingsInterop/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/ZoomIt/ZoomItSettingsInterop/packages.config +++ b/src/modules/ZoomIt/ZoomItSettingsInterop/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj index 8b24f90bf9..e86f539c4b 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj @@ -187,7 +187,7 @@ - + @@ -195,6 +195,6 @@ - + \ No newline at end of file diff --git a/src/modules/alwaysontop/AlwaysOnTop/packages.config b/src/modules/alwaysontop/AlwaysOnTop/packages.config index d3882436a5..ee53a74931 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/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj index 4bb032431e..27dc9773e0 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/packages.config b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config index d3882436a5..ee53a74931 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 67f639d3ea..8c8d2ab704 100644 --- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj @@ -66,7 +66,7 @@ - + @@ -74,6 +74,6 @@ - + \ No newline at end of file diff --git a/src/modules/awake/AwakeModuleInterface/packages.config b/src/modules/awake/AwakeModuleInterface/packages.config index d3882436a5..ee53a74931 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/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj index 7d83967705..1c6aacdb7c 100644 --- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj @@ -5,7 +5,7 @@ app.manifest 10.0.26100.68-preview - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 10.0.19041.0 10.0.19041.0 win-x64;win-arm64 diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/Microsoft.CmdPal.UITests.csproj b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/Microsoft.CmdPal.UITests.csproj index dcfd3d987b..d78a392552 100644 --- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/Microsoft.CmdPal.UITests.csproj +++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/Microsoft.CmdPal.UITests.csproj @@ -16,11 +16,8 @@ $(SolutionDir)$(Platform)\$(Configuration)\tests\Microsoft.CmdPal.UITests\ - - - - - - - + + + + \ No newline at end of file diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs index ffd00ce7c8..1f2895b051 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs @@ -313,7 +313,7 @@ public class Win32Program : IProgram } // To filter out only those steam shortcuts which have 'run' or 'rungameid' as the hostname - if (InternetShortcutURLPrefixes.Match(urlPath).Success) + if (InternetShortcutURLPrefixes.IsMatch(urlPath)) { validApp = true; } diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs index fea869a497..dee89f56b7 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs @@ -10,7 +10,7 @@ using Windows.Foundation.Collections; namespace Microsoft.CmdPal.Ext.Calc.Helper; -public static class CalculateEngine +public static partial class CalculateEngine { private static readonly PropertySet _constants = new() { @@ -45,7 +45,7 @@ public static class CalculateEngine // check for division by zero // We check if the string contains a slash followed by space (optional) and zero. Whereas the zero must not be followed by a dot, comma, 'b', 'o' or 'x' as these indicate a number with decimal digits or a binary/octal/hexadecimal value respectively. The zero must also not be followed by other digits. - if (new Regex("\\/\\s*0(?!(?:[,\\.0-9]|[box]0*[1-9a-f]))", RegexOptions.IgnoreCase).Match(input).Success) + if (DivisionByZeroRegex().IsMatch(input)) { error = Properties.Resources.calculator_division_by_zero; return default; @@ -134,4 +134,7 @@ public static class CalculateEngine var rounded = Math.Round(value, maxDecimalDigits, MidpointRounding.AwayFromZero); return rounded / 1.000000000000000000000000000000000m; } + + [GeneratedRegex("\\/\\s*0(?!(?:[,\\.0-9]|[box]0*[1-9a-f]))", RegexOptions.IgnoreCase, "en-US")] + private static partial Regex DivisionByZeroRegex(); } diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs index 83992f6428..07fb700e03 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs @@ -27,9 +27,9 @@ internal partial class TextMetadataAnalyzer private LineEndingType DetectLineEnding(string text) { - var crlfCount = Regex.Matches(text, "\r\n").Count; - var lfCount = Regex.Matches(text, "(? 0 ? 1 : 0) + (lfCount > 0 ? 1 : 0) + (crCount > 0 ? 1 : 0); @@ -87,7 +87,7 @@ internal partial class TextMetadataAnalyzer return 0; } - return Regex.Matches(text, @"\b\w+\b").Count; + return Regex.Count(text, @"\b\w+\b"); } private int CountSentences(string text) diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index 2a09975846..f6c7168d1c 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -37,7 +37,6 @@ - diff --git a/src/modules/colorPicker/UITest-ColorPicker/UITest-ColorPicker.csproj b/src/modules/colorPicker/UITest-ColorPicker/UITest-ColorPicker.csproj index bc360c2c91..c7d1580bf5 100644 --- a/src/modules/colorPicker/UITest-ColorPicker/UITest-ColorPicker.csproj +++ b/src/modules/colorPicker/UITest-ColorPicker/UITest-ColorPicker.csproj @@ -20,9 +20,6 @@ - - - diff --git a/src/modules/fancyzones/FancyZones.UITests/FancyZones.UITests.csproj b/src/modules/fancyzones/FancyZones.UITests/FancyZones.UITests.csproj index 8554072add..cc20d06277 100644 --- a/src/modules/fancyzones/FancyZones.UITests/FancyZones.UITests.csproj +++ b/src/modules/fancyzones/FancyZones.UITests/FancyZones.UITests.csproj @@ -23,9 +23,6 @@ - - - diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj index e1744b8422..afe7fffcf5 100644 --- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj +++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj @@ -156,7 +156,7 @@ - + @@ -164,6 +164,6 @@ - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZones/packages.config b/src/modules/fancyzones/FancyZones/packages.config index d3882436a5..ee53a74931 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/FancyZonesCLI/FancyZonesCLI.csproj b/src/modules/fancyzones/FancyZonesCLI/FancyZonesCLI.csproj index 419c12cfd0..3635958b59 100644 --- a/src/modules/fancyzones/FancyZonesCLI/FancyZonesCLI.csproj +++ b/src/modules/fancyzones/FancyZonesCLI/FancyZonesCLI.csproj @@ -17,7 +17,6 @@ - diff --git a/src/modules/fancyzones/FancyZonesEditor.UITests/FancyZonesEditor.UITests.csproj b/src/modules/fancyzones/FancyZonesEditor.UITests/FancyZonesEditor.UITests.csproj index 443c50059a..7fd8964cf8 100644 --- a/src/modules/fancyzones/FancyZonesEditor.UITests/FancyZonesEditor.UITests.csproj +++ b/src/modules/fancyzones/FancyZonesEditor.UITests/FancyZonesEditor.UITests.csproj @@ -24,9 +24,6 @@ - - - diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj index 110c0ae69d..f7b1cf3a5b 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj @@ -157,7 +157,7 @@ - + @@ -165,6 +165,6 @@ - + \ No newline at end of file diff --git a/src/modules/fancyzones/FancyZonesLib/packages.config b/src/modules/fancyzones/FancyZonesLib/packages.config index d3882436a5..ee53a74931 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/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj index 8b6bdecfa9..2883f61656 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/packages.config b/src/modules/fancyzones/FancyZonesModuleInterface/packages.config index d3882436a5..ee53a74931 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 284f3397f5..3af27e2d1b 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj @@ -87,7 +87,7 @@ - + @@ -95,6 +95,6 @@ - + diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config b/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config index d3882436a5..ee53a74931 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/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj index ff6d92708e..e8a8c3b2b0 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj +++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj @@ -145,7 +145,7 @@ MakeAppx.exe pack /d "$(MSBuildThisFileDirectory)." /p "$(OutDir)ImageResizerCon - + @@ -153,6 +153,6 @@ MakeAppx.exe pack /d "$(MSBuildThisFileDirectory)." /p "$(OutDir)ImageResizerCon - + \ No newline at end of file diff --git a/src/modules/imageresizer/ImageResizerContextMenu/packages.config b/src/modules/imageresizer/ImageResizerContextMenu/packages.config index d3882436a5..ee53a74931 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/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj index f169c213cc..fa3a0f51f9 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj @@ -59,14 +59,14 @@ - + 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}. - + diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index e953143013..803472c33b 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -76,7 +76,7 @@ - + @@ -84,6 +84,6 @@ - + \ 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 d3882436a5..ee53a74931 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/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index dcfbb3dfb1..b91d5d071e 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 @@ -17,15 +17,6 @@ - - runtime - - - runtime - - - runtime - diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs index d16d0e32ca..2d64010a51 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs @@ -28,7 +28,7 @@ using DirectoryWrapper = Wox.Infrastructure.FileSystemHelper.DirectoryWrapper; namespace Microsoft.Plugin.Program.Programs { [Serializable] - public class Win32Program : IProgram + public partial class Win32Program : IProgram { public static readonly Win32Program InvalidProgram = new Win32Program { Valid = false, Enabled = false }; @@ -420,7 +420,8 @@ namespace Microsoft.Plugin.Program.Programs } } - private static readonly Regex InternetShortcutURLPrefixes = new Regex(@"^steam:\/\/(rungameid|run|open)\/|^com\.epicgames\.launcher:\/\/apps\/", RegexOptions.Compiled); + [GeneratedRegex(@"^steam:\/\/(rungameid|run|open)\/|^com\.epicgames\.launcher:\/\/apps\/", RegexOptions.Compiled)] + private static partial Regex InternetShortcutURLPrefixes(); // This function filters Internet Shortcut programs private static Win32Program InternetShortcutProgram(string path) @@ -450,7 +451,7 @@ namespace Microsoft.Plugin.Program.Programs } // To filter out only those steam shortcuts which have 'run' or 'rungameid' as the hostname - if (InternetShortcutURLPrefixes.Match(urlPath).Success) + if (InternetShortcutURLPrefixes().IsMatch(urlPath)) { validApp = true; } diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs index ef7e84fbd8..f44a72676c 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs @@ -11,7 +11,7 @@ using Mages.Core; namespace Microsoft.PowerToys.Run.Plugin.Calculator { - public class CalculateEngine + public partial class CalculateEngine { private readonly Engine _magesEngine = new Engine(new Configuration { @@ -45,7 +45,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator // check for division by zero // We check if the string contains a slash followed by space (optional) and zero. Whereas the zero must not be followed by a dot, comma, 'b', 'o' or 'x' as these indicate a number with decimal digits or a binary/octal/hexadecimal value respectively. The zero must also not be followed by other digits. - if (new Regex("\\/\\s*0(?!(?:[,\\.0-9]|[box]0*[1-9a-f]))", RegexOptions.IgnoreCase).Match(input).Success) + if (DivisionByZeroRegex().IsMatch(input)) { error = Properties.Resources.wox_plugin_calculator_division_by_zero; return default; @@ -124,5 +124,8 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator return result; } + + [GeneratedRegex("\\/\\s*0(?!(?:[,\\.0-9]|[box]0*[1-9a-f]))", RegexOptions.IgnoreCase, "en-US")] + private static partial Regex DivisionByZeroRegex(); } } 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 c4fcf151b8..508eb358b8 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 @@ -36,18 +36,6 @@ - - runtime - - - runtime - - - runtime - - - runtime - diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index d22f82282f..403439ef80 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -53,15 +53,10 @@ - - runtime - - - diff --git a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 026a6d4112..46a02c0fb7 100644 --- a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index ffdc41aad9..83fe37ad57 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -33,9 +33,6 @@ - - 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 0c7d6889a0..78efa43c29 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -34,8 +34,6 @@ - - diff --git a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj index 6d58478be3..585b580b8f 100644 --- a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj +++ b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj @@ -33,8 +33,6 @@ - - all diff --git a/src/modules/peek/Peek.UI/Peek.UI.csproj b/src/modules/peek/Peek.UI/Peek.UI.csproj index 6448ec7322..ac4c6815c1 100644 --- a/src/modules/peek/Peek.UI/Peek.UI.csproj +++ b/src/modules/peek/Peek.UI/Peek.UI.csproj @@ -83,8 +83,6 @@ - - diff --git a/src/modules/peek/peek/peek.vcxproj b/src/modules/peek/peek/peek.vcxproj index 428889c442..29f37b47c8 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/PowerAccent.Core/PowerAccent.Core.csproj b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj index 49ae53eb23..3f1dea6390 100644 --- a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj +++ b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj @@ -23,7 +23,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj index 75aa524883..e5bc1f5055 100644 --- a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj +++ b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj @@ -67,7 +67,7 @@ - + @@ -75,6 +75,6 @@ - + \ No newline at end of file diff --git a/src/modules/powerdisplay/PowerDisplay.Lib/PowerDisplay.Lib.csproj b/src/modules/powerdisplay/PowerDisplay.Lib/PowerDisplay.Lib.csproj index d89b52ee35..54d125feed 100644 --- a/src/modules/powerdisplay/PowerDisplay.Lib/PowerDisplay.Lib.csproj +++ b/src/modules/powerdisplay/PowerDisplay.Lib/PowerDisplay.Lib.csproj @@ -25,7 +25,6 @@ - all diff --git a/src/modules/powerdisplay/PowerDisplay.Models/PowerDisplay.Models.csproj b/src/modules/powerdisplay/PowerDisplay.Models/PowerDisplay.Models.csproj index 8ff0ad98e3..ee93e6b486 100644 --- a/src/modules/powerdisplay/PowerDisplay.Models/PowerDisplay.Models.csproj +++ b/src/modules/powerdisplay/PowerDisplay.Models/PowerDisplay.Models.csproj @@ -17,7 +17,4 @@ true - - - diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj b/src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj index 385f526e62..2cb02dc776 100644 --- a/src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj +++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj @@ -65,7 +65,6 @@ - diff --git a/src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj b/src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj index 23ba6b48e5..8abfdfdfc9 100644 --- a/src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj +++ b/src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj @@ -119,7 +119,7 @@ - + @@ -127,6 +127,6 @@ - + \ No newline at end of file diff --git a/src/modules/powerdisplay/PowerDisplayModuleInterface/packages.config b/src/modules/powerdisplay/PowerDisplayModuleInterface/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/powerdisplay/PowerDisplayModuleInterface/packages.config +++ b/src/modules/powerdisplay/PowerDisplayModuleInterface/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj index c4cddc1a7b..aab61d5b16 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj +++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj @@ -146,7 +146,7 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv - + @@ -154,6 +154,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 d3882436a5..ee53a74931 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/PowerRenameUITest/PowerRename.UITests.csproj b/src/modules/powerrename/PowerRenameUITest/PowerRename.UITests.csproj index 7cdde8ae3b..736d775426 100644 --- a/src/modules/powerrename/PowerRenameUITest/PowerRename.UITests.csproj +++ b/src/modules/powerrename/PowerRenameUITest/PowerRename.UITests.csproj @@ -26,9 +26,6 @@ - - - diff --git a/src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj b/src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj index 389c1ccf92..79dba6608f 100644 --- a/src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj @@ -105,7 +105,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/BgcodeThumbnailProviderCpp/packages.config b/src/modules/previewpane/BgcodeThumbnailProviderCpp/packages.config index d3882436a5..ee53a74931 100644 --- a/src/modules/previewpane/BgcodeThumbnailProviderCpp/packages.config +++ b/src/modules/previewpane/BgcodeThumbnailProviderCpp/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj index 0ae4f692fb..81372e4fc7 100644 --- a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj @@ -105,7 +105,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config b/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config index d3882436a5..ee53a74931 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/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 026a6d4112..46a02c0fb7 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 026a6d4112..46a02c0fb7 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj index fbb27c63df..aced29412b 100644 --- a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj @@ -105,7 +105,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config b/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config index d3882436a5..ee53a74931 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 bffcfa6db8..5da79d47cf 100644 --- a/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj @@ -105,7 +105,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config b/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config index d3882436a5..ee53a74931 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 4b2fe549b9..7f22a2acff 100644 --- a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj @@ -105,7 +105,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/StlThumbnailProviderCpp/packages.config b/src/modules/previewpane/StlThumbnailProviderCpp/packages.config index d3882436a5..ee53a74931 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/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 026a6d4112..46a02c0fb7 100644 --- a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 026a6d4112..46a02c0fb7 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration) diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj index 1ce28c3cb0..9a888c1272 100644 --- a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj @@ -105,7 +105,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config b/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config index d3882436a5..ee53a74931 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 d3882436a5..ee53a74931 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 45a9d83fd4..b33e90d90c 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -94,7 +94,7 @@ - + @@ -102,6 +102,6 @@ - + \ No newline at end of file diff --git a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj index 121f7d5488..aa296c59f7 100644 --- a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj +++ b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj @@ -117,7 +117,7 @@ - + @@ -125,6 +125,6 @@ - + \ No newline at end of file diff --git a/src/modules/registrypreview/RegistryPreviewExt/packages.config b/src/modules/registrypreview/RegistryPreviewExt/packages.config index d3882436a5..ee53a74931 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/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj b/src/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj index 5963476279..2a534f56c3 100644 --- a/src/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj +++ b/src/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj @@ -4,7 +4,7 @@ WinExe - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 Microsoft.PowerToys.QuickAccess PowerToys.QuickAccess ..\..\runner\svgs\icon.ico diff --git a/src/settings-ui/Settings.UI.Controls/Settings.UI.Controls.csproj b/src/settings-ui/Settings.UI.Controls/Settings.UI.Controls.csproj index 6cdd3d0867..451cb555ef 100644 --- a/src/settings-ui/Settings.UI.Controls/Settings.UI.Controls.csproj +++ b/src/settings-ui/Settings.UI.Controls/Settings.UI.Controls.csproj @@ -4,7 +4,7 @@ Library - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 Microsoft.PowerToys.Settings.UI.Controls PowerToys.Settings.UI.Controls true 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 dbe092c0ad..2d54ba04a4 100644 --- a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj +++ b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj @@ -21,9 +21,6 @@ - - - diff --git a/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj b/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj index 9c95839d6f..7f32380787 100644 --- a/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj +++ b/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj @@ -22,7 +22,6 @@ - diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index f60f63c51f..352f7997f7 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -78,9 +78,6 @@ - - - @@ -91,7 +88,7 @@ - + diff --git a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index cff222baf4..33c4e81155 100644 --- a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net9.0-windows10.0.22621.0 + net10.0-windows10.0.22621.0 10.0.19041.0 10.0.19041.0 $(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps diff --git a/src/settings-ui/UITest-Settings/UITest-Settings.csproj b/src/settings-ui/UITest-Settings/UITest-Settings.csproj index 917efdf1a3..52879f5f78 100644 --- a/src/settings-ui/UITest-Settings/UITest-Settings.csproj +++ b/src/settings-ui/UITest-Settings/UITest-Settings.csproj @@ -20,9 +20,6 @@ - - - diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj index be9a9bb279..5e9bfa9f41 100644 --- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj +++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj @@ -74,14 +74,14 @@ - + 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}. - + diff --git a/tools/BugReportTool/BugReportTool/packages.config b/tools/BugReportTool/BugReportTool/packages.config index d3882436a5..ee53a74931 100644 --- a/tools/BugReportTool/BugReportTool/packages.config +++ b/tools/BugReportTool/BugReportTool/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file