diff --git a/.pipelines/build-installer-MSI.cmd b/.pipelines/build-installer-MSI.cmd index 0070994cec..7959624204 100644 --- a/.pipelines/build-installer-MSI.cmd +++ b/.pipelines/build-installer-MSI.cmd @@ -1,5 +1,5 @@ cd /D "%~dp0" -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 SET IsPipeline=1 call msbuild ../installer/PowerToysSetup.sln /target:PowerToysInstaller /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1 diff --git a/.pipelines/ci/templates/build-powertoys-ci.yml b/.pipelines/ci/templates/build-powertoys-ci.yml index b59fb6d335..33fdca3cc7 100644 --- a/.pipelines/ci/templates/build-powertoys-ci.yml +++ b/.pipelines/ci/templates/build-powertoys-ci.yml @@ -10,6 +10,7 @@ jobs: BuildConfiguration: ${{ parameters.configuration }} BuildPlatform: ${{ parameters.platform }} pool: + demands: ImageOverride -equals WinDevVS17-latest ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPoolOSS-L ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index c829384bd7..254dc0764e 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -7,12 +7,20 @@ steps: submodules: true clean: true -- task: NuGetToolInstaller@0 - displayName: Ensure NuGet 5.8.0 +- task: UseDotNet@2 + displayName: 'Use .NET 3.1 for unit test SDK' inputs: - versionSpec: 5.8.0 + packageType: sdk + version: '3.1.x' -#- template: .\..\..\..\restore-dependencies.yml +- task: UseDotNet@2 + displayName: 'Use .NET 6 SDK' + inputs: + packageType: sdk + version: '6.x' + +- task: NuGetToolInstaller@1 + displayName: Ensure NuGet Installer - task: VisualStudioTestPlatformInstaller@1 displayName: Ensure VSTest Platform @@ -30,7 +38,7 @@ steps: displayName: 'Build PowerToys.sln' inputs: solution: '**\PowerToys.sln' - vsVersion: 16.0 + vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' msbuildArgs: ${{ parameters.additionalBuildArguments }} @@ -49,7 +57,7 @@ steps: displayName: 'Build BugReportTool.sln' inputs: solution: '**\BugReportTool.sln' - vsVersion: 16.0 + vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' msbuildArgs: ${{ parameters.additionalBuildArguments }} @@ -68,7 +76,7 @@ steps: displayName: 'Build WebcamReportTool.sln' inputs: solution: '**\WebcamReportTool.sln' - vsVersion: 16.0 + vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' msbuildArgs: ${{ parameters.additionalBuildArguments }} @@ -87,7 +95,7 @@ steps: displayName: 'Build PowerToysSetup.sln' inputs: solution: '**\installer\PowerToysSetup.sln' - vsVersion: 16.0 + vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' msbuildArgs: ${{ parameters.additionalBuildArguments }} @@ -123,7 +131,7 @@ steps: **\Microsoft.Plugin.Uri.UnitTests.dll **\Wox.Test.dll **\Microsoft.PowerToys.Run.Plugin.System.UnitTests.dll - **\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.dll + **\Microsoft.Plugin.WindowsTerminal.UnitTests.dll !**\obj\** !**\ref\** diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 693c309bf3..f838de58b2 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -4,7 +4,7 @@ pr: none pool: name: WinDevPool-L - demands: ImageOverride -equals WinDevVS16-latest + demands: ImageOverride -equals WinDevVS17-latest parameters: - name: buildConfigurations @@ -53,37 +53,26 @@ jobs: scriptName: .pipelines/versionSetting.ps1 arguments: -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment '' - - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1 - displayName: 'Download Localization Files -- PowerToys 37400' +# Guardian tool needs 'Microsoft.NETCore.App', version '2.1.0' (x64) + - task: UseDotNet@2 + displayName: 'Use .NET Core 2.1 SDK' inputs: - teamId: 37400 - authId: '$(TouchdownApplicationID)' - authKey: '$(TouchdownApplicationKey)' - resourceFilePath: | - **\Resources.resx - **\Resource.resx - **\Resources.resw - appendRelativeDir: true - localizationTarget: false - pseudoSetting: Included - - task: PowerShell@2 - displayName: Move Loc files into correct locations + packageType: sdk + version: '2.1.x' + + - task: UseDotNet@2 + displayName: 'Use .NET 6 SDK' inputs: - targetType: inline - script: >- - $VerbosePreference = "Continue" + packageType: sdk + version: '6.x' - ./tools/build/move-and-rename-resx.ps1 - - ./tools/build/move-uwp-resw.ps1 - pwsh: true - task: NuGetAuthenticate@0 inputs: nuGetServiceConnections: PowerToysCDPxFeed + - task: NuGetToolInstaller@1 - displayName: Use NuGet 5.10 - inputs: - versionSpec: 5.10 + displayName: Use NuGet Installer latest + # this will restore the following nugets: # - main solution # - Bug report tool @@ -98,6 +87,32 @@ jobs: selectOrConfig: config nugetConfigPath: .pipelines/release-nuget.config + - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1 + displayName: 'Download Localization Files -- PowerToys 37400' + inputs: + teamId: 37400 + authId: '$(TouchdownApplicationID)' + authKey: '$(TouchdownApplicationKey)' + resourceFilePath: | + **\Resources.resx + **\Resource.resx + **\Resources.resw + appendRelativeDir: true + localizationTarget: false + pseudoSetting: Included + + - task: PowerShell@2 + displayName: Move Loc files into correct locations + inputs: + targetType: inline + script: >- + $VerbosePreference = "Continue" + + ./tools/build/move-and-rename-resx.ps1 + + ./tools/build/move-uwp-resw.ps1 + pwsh: true + - task: CmdLine@2 displayName: Moving telem files inputs: @@ -111,7 +126,7 @@ jobs: displayName: Build PowerToys main project inputs: solution: '**\PowerToys.sln' - vsVersion: 16.0 + vsVersion: 17.0 msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog platform: $(BuildPlatform) configuration: $(BuildConfiguration) @@ -133,7 +148,7 @@ jobs: displayName: Build WebcamReportTool inputs: solution: '**/tools/WebcamReportTool/WebcamReportTool.sln' - vsVersion: 16.0 + vsVersion: 17.0 msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog platform: $(BuildPlatform) configuration: $(BuildConfiguration) @@ -144,7 +159,7 @@ jobs: displayName: Build PowerToysSetupCustomActions inputs: solution: '**/installer/PowerToysSetup.sln' - vsVersion: 16.0 + vsVersion: 17.0 msbuildArgs: /target:PowerToysSetupCustomActions /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog platform: $(BuildPlatform) configuration: $(BuildConfiguration) @@ -155,7 +170,7 @@ jobs: displayName: Publish Settings for Packaging inputs: solution: 'src/settings-ui/PowerToys.Settings/PowerToys.Settings.csproj' - vsVersion: 16.0 + vsVersion: 17.0 msbuildArgs: >- /target:Publish /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never @@ -170,7 +185,7 @@ jobs: displayName: Publish Launcher for Packaging inputs: solution: 'src/modules/launcher/PowerLauncher/PowerLauncher.csproj' - vsVersion: 16.0 + vsVersion: 17.0 # The arguments should be the same as the ones for Settings; make sure they are. msbuildArgs: >- /target:Publish @@ -185,6 +200,7 @@ jobs: #### MAIN SIGNING AREA # reference https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/ESRPSigning.json&version=GBarm64-netcore&_a=contents for winappdriver # https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/CIPolicy.xml&version=GBarm64-netcore&_a=contents + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: Sign Core PT inputs: @@ -210,7 +226,7 @@ jobs: displayName: Build MSI inputs: solution: '**/installer/PowerToysSetup.sln' - vsVersion: 16.0 + vsVersion: 17.0 msbuildArgs: /p:CIBuild=true /target:PowerToysInstaller /bl:$(Build.SourcesDirectory)\msbuild.binlog platform: $(BuildPlatform) configuration: $(BuildConfiguration) @@ -246,7 +262,7 @@ jobs: displayName: Build Bootstrapper inputs: solution: '**/installer/PowerToysSetup.sln' - vsVersion: 16.0 + vsVersion: 17.0 msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog platform: $(BuildPlatform) configuration: $(BuildConfiguration) diff --git a/Cpp.Build.props b/Cpp.Build.props index 1f7d2a3931..02d6baed11 100644 --- a/Cpp.Build.props +++ b/Cpp.Build.props @@ -81,7 +81,7 @@ - v142 + v143 $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ Unicode diff --git a/PowerToys.sln b/PowerToys.sln index 14dd3a356a..7f571296ec 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.452 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner.vcxproj", "{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}" ProjectSection(ProjectDependencies) = postProject @@ -357,7 +357,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PdfThumbnailProvi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.WindowsTerminal", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj", "{A2D583F0-B70C-4462-B1F0-8E81AFB7BA85}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.csproj", "{4ED320BC-BA04-4D42-8D15-CBE62151F08B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.WindowsTerminal.UnitTests", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests\Microsoft.Plugin.WindowsTerminal.UnitTests.csproj", "{4ED320BC-BA04-4D42-8D15-CBE62151F08B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameUIHost", "src\modules\powerrename\PowerRenameUIHost\PowerRenameUIHost.vcxproj", "{F7EC4E6C-19CA-4FBD-9918-B8AC5FEF4F63}" ProjectSection(ProjectDependencies) = postProject diff --git a/doc/devdocs/modules/launcher/plugins/registry.md b/doc/devdocs/modules/launcher/plugins/registry.md index a222c5e9c5..fba1b4f233 100644 --- a/doc/devdocs/modules/launcher/plugins/registry.md +++ b/doc/devdocs/modules/launcher/plugins/registry.md @@ -78,7 +78,7 @@ The plugin use only these interfaces (all inside the `Main.cs`): | Name | Value | | --------------- | ------------------------------------------------------------------------------ | -| TargetFramework | `net5.0-windows` (.NET 5) or `net5.0-windows10.0.18362.0` (OS version specific)| +| TargetFramework | `net6.0-windows` (.NET 5) or `net6.0-windows10.0.18362.0` (OS version specific)| | LangVersion | `8.0` (mean C# 8.0) | | Platforms | `x64` | | Nullable | `true` | diff --git a/doc/devdocs/modules/launcher/plugins/windowssettings.md b/doc/devdocs/modules/launcher/plugins/windowssettings.md index bf04461db0..6f3701f6b8 100644 --- a/doc/devdocs/modules/launcher/plugins/windowssettings.md +++ b/doc/devdocs/modules/launcher/plugins/windowssettings.md @@ -141,7 +141,7 @@ Because the JSON file must have a object as root type, instead of a array. | Name | Value | | --------------- | --------------------------------------------------------------------------------------------------- | -| TargetFramework | `net5.0-windows` (.NET 5) or `net5.0-windows10.0.18362.0` (OS version specific) | +| TargetFramework | `net6.0-windows` (.NET 5) or `net6.0-windows10.0.18362.0` (OS version specific) | | Platforms | `x64` | | Output | `..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.WindowsSettings\` | | RootNamespace | `Microsoft.PowerToys.Run.Plugin.WindowsSettings` | diff --git a/doc/devdocs/readme.md b/doc/devdocs/readme.md index 8dd646b192..9e84e7bbbe 100644 --- a/doc/devdocs/readme.md +++ b/doc/devdocs/readme.md @@ -38,7 +38,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you ### Prerequisites for Compiling PowerToys 1. Windows 10 April 2018 Update (version 1803) or newer -2. Visual Studio Community/Professional/Enterprise 2019 +2. Visual Studio Community/Professional/Enterprise 2022 3. Once you've cloned and started the `PowerToys.sln`, in the solution explorer, if you see a dialog that says `install extra components`, click `install` ### Get Submodules to compile @@ -69,7 +69,7 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done ### Prerequisites for building the MSI installer -1. Install the [WiX Toolset Visual Studio 2019 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension). +1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension). 2. Install the [WiX Toolset build tools](https://wixtoolset.org/releases/). ### Locally compiling the Bug reporting tool diff --git a/installer/MSIX/build_msix_cdpx.cmd b/installer/MSIX/build_msix_cdpx.cmd index 94ed4ea199..261a6a6818 100644 --- a/installer/MSIX/build_msix_cdpx.cmd +++ b/installer/MSIX/build_msix_cdpx.cmd @@ -1,6 +1,6 @@ cd /D "%~dp0" -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 powershell -file update_appxmanifest_version.ps1 || exit /b 1 diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs index 00f1f8549c..69e6e6defb 100644 --- a/installer/PowerToysSetup/PowerToys.wxs +++ b/installer/PowerToysSetup/PowerToys.wxs @@ -21,7 +21,7 @@ - + @@ -59,22 +59,22 @@ Hash="08EF2F6CFDB33946061884B1CE13FA867EFBD576" /> + Hash="1DC44C31438725846F59071C868736112398329B" /> --> - + \ No newline at end of file diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index dae59f0083..c81f6b057e 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -541,7 +541,6 @@ - @@ -589,7 +588,6 @@ - @@ -783,7 +781,7 @@ - + @@ -801,7 +799,7 @@ - + @@ -817,22 +815,6 @@ - - - - - - - - - - - - - - - - @@ -1079,8 +1061,6 @@ - - @@ -1379,7 +1359,7 @@ - + diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj index b2883566b6..b77e94a53c 100644 --- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj +++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary Unicode - v142 + v143 DynamicLibrary Unicode true - v142 + v143 diff --git a/src/ActionRunner/actionRunner.vcxproj b/src/ActionRunner/actionRunner.vcxproj index 04855caae0..e09c109fdb 100644 --- a/src/ActionRunner/actionRunner.vcxproj +++ b/src/ActionRunner/actionRunner.vcxproj @@ -11,6 +11,12 @@ PowerToys.ActionRunner + + v143 + + + v143 + Application diff --git a/src/Update/PowerToys.Update.vcxproj b/src/Update/PowerToys.Update.vcxproj index 76d0f44642..f665c6aa51 100644 --- a/src/Update/PowerToys.Update.vcxproj +++ b/src/Update/PowerToys.Update.vcxproj @@ -11,6 +11,12 @@ PowerToys.Update + + v143 + + + v143 + Application diff --git a/src/common/COMUtils/COMUtils.vcxproj b/src/common/COMUtils/COMUtils.vcxproj index 74c6399dad..dfeb200089 100644 --- a/src/common/COMUtils/COMUtils.vcxproj +++ b/src/common/COMUtils/COMUtils.vcxproj @@ -11,6 +11,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/common/Common.UI/Common.UI.csproj b/src/common/Common.UI/Common.UI.csproj index 1444687378..da57190dc8 100644 --- a/src/common/Common.UI/Common.UI.csproj +++ b/src/common/Common.UI/Common.UI.csproj @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows true x64 x64 diff --git a/src/common/Display/Display.vcxproj b/src/common/Display/Display.vcxproj index c5bc2a03fc..a39d8100ef 100644 --- a/src/common/Display/Display.vcxproj +++ b/src/common/Display/Display.vcxproj @@ -11,6 +11,12 @@ StaticLibrary + + v143 + + + v143 + @@ -25,7 +31,7 @@ - NotUsing + NotUsing ..\..\..\;%(AdditionalIncludeDirectories) _LIB;%(PreprocessorDefinitions) NotUsing diff --git a/src/common/SettingsAPI/SetttingsAPI.vcxproj b/src/common/SettingsAPI/SetttingsAPI.vcxproj index 813c904374..46c5ff8bf4 100644 --- a/src/common/SettingsAPI/SetttingsAPI.vcxproj +++ b/src/common/SettingsAPI/SetttingsAPI.vcxproj @@ -12,6 +12,12 @@ StaticLibrary + + v143 + + + v143 + @@ -40,7 +46,7 @@ - + diff --git a/src/common/Themes/Themes.vcxproj b/src/common/Themes/Themes.vcxproj index e5737a006a..b1d049de0c 100644 --- a/src/common/Themes/Themes.vcxproj +++ b/src/common/Themes/Themes.vcxproj @@ -12,6 +12,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj index 7e8db5df29..e52a711669 100644 --- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj +++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj @@ -13,6 +13,12 @@ DynamicLibrary false + + v143 + + + v143 + diff --git a/src/common/interop/PowerToys.Interop.vcxproj b/src/common/interop/PowerToys.Interop.vcxproj index 5193865436..88bc40a772 100644 --- a/src/common/interop/PowerToys.Interop.vcxproj +++ b/src/common/interop/PowerToys.Interop.vcxproj @@ -19,6 +19,12 @@ DynamicLibrary true + + v143 + + + v143 + diff --git a/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj b/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj index 45e707cf2b..0520da272a 100644 --- a/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj +++ b/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows false win-x64 diff --git a/src/common/logger/logger.vcxproj b/src/common/logger/logger.vcxproj index 09649a7ce7..453b2c2d86 100644 --- a/src/common/logger/logger.vcxproj +++ b/src/common/logger/logger.vcxproj @@ -11,6 +11,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj index 84e7b38cfe..892e1adad4 100644 --- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj +++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj @@ -18,7 +18,7 @@ StaticLibrary - v142 + v143 Unicode false diff --git a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj index 854f307579..5f8ef92e78 100644 --- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj +++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj @@ -11,6 +11,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/common/notifications/notifications.vcxproj b/src/common/notifications/notifications.vcxproj index cf64ff4181..e14df8f921 100644 --- a/src/common/notifications/notifications.vcxproj +++ b/src/common/notifications/notifications.vcxproj @@ -12,6 +12,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj index ce14e6e809..5ced291a0c 100644 --- a/src/common/updating/updating.vcxproj +++ b/src/common/updating/updating.vcxproj @@ -13,6 +13,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/common/version/version.vcxproj b/src/common/version/version.vcxproj index b875a9b44b..871dea8463 100644 --- a/src/common/version/version.vcxproj +++ b/src/common/version/version.vcxproj @@ -21,6 +21,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/logging/logging.vcxproj b/src/logging/logging.vcxproj index 611f787cce..c4f14d8a04 100644 --- a/src/logging/logging.vcxproj +++ b/src/logging/logging.vcxproj @@ -14,6 +14,12 @@ StaticLibrary MultiByte + + v143 + + + v143 + diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj index fcf3bd4ae1..9c4dd44c98 100644 --- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj +++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj @@ -24,13 +24,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj index b9459eadeb..e3d51b85a8 100644 --- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj +++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj @@ -23,13 +23,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj index b1b8850987..0aa00812a5 100644 --- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj +++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj @@ -24,13 +24,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj index d85a26b05b..8e48ec184f 100644 --- a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj +++ b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj @@ -18,7 +18,7 @@ Application - v140 + v143 v141 v142 Unicode diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj index 7090758eed..1dec9b6f21 100644 --- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj +++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj @@ -26,14 +26,14 @@ DynamicLibrary true - v142 + v143 Unicode Spectre DynamicLibrary false - v142 + v143 true Unicode Spectre diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj index e9b1e9b31b..292ee6d49b 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj @@ -75,7 +75,7 @@ Application - v142 + v143 $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ Unicode Spectre diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj index 9e9c8ca0d0..e3c9042456 100644 --- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj @@ -12,6 +12,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/awake/Awake/Awake.csproj b/src/modules/awake/Awake/Awake.csproj index d18141e935..2737117b92 100644 --- a/src/modules/awake/Awake/Awake.csproj +++ b/src/modules/awake/Awake/Awake.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows $(SolutionDir)$(Platform)\$(Configuration)\modules\Awake enable x64 diff --git a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj index d9a10f06a5..776c7bf3f4 100644 --- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj @@ -23,6 +23,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj index 3cea41f4a2..234ac6a048 100644 --- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj +++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj @@ -15,6 +15,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index 7b6d4cea79..b235b9f125 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -21,7 +21,7 @@ WinExe ColorPicker PowerToys.ColorPickerUI - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 8.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -107,4 +107,4 @@ Resources.resx - \ 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 d1672693cb..f09e00be40 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -2,7 +2,7 @@ - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1} Microsoft.ColorPicker.UnitTests false diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj index fb8f7d7a6a..7236523fde 100644 --- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj +++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj @@ -75,7 +75,7 @@ Application - v142 + v143 $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ Unicode Spectre diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesDataTypes.cpp b/src/modules/fancyzones/FancyZonesLib/FancyZonesDataTypes.cpp index 0408854f6a..bf79eb46b1 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesDataTypes.cpp +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesDataTypes.cpp @@ -188,12 +188,12 @@ namespace FancyZonesDataTypes { for (const auto& c : parts[0]) { - std::stoi(std::wstring(&c)); + std::ignore = std::stoi(std::wstring(&c)); } for (const auto& c : parts[1]) { - std::stoi(std::wstring(&c)); + std::ignore = std::stoi(std::wstring(&c)); } data.width = std::stoi(parts[0]); @@ -269,11 +269,11 @@ namespace FancyZonesDataTypes //check if resolution contain only digits for (const auto& c : parts[1]) { - std::stoi(std::wstring(&c)); + std::ignore = std::stoi(std::wstring(&c)); } for (const auto& c : parts[2]) { - std::stoi(std::wstring(&c)); + std::ignore = std::stoi(std::wstring(&c)); } } catch (const std::exception&) diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj index 516c965c82..5e040395d3 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj @@ -15,6 +15,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj index 95b7ef7894..6117b8010d 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj +++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj @@ -12,6 +12,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj index 54b1173b39..7ba83bf83b 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj @@ -15,6 +15,12 @@ DynamicLibrary false + + v143 + + + v143 + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index c896109388..ca7f36e7bb 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -22,7 +22,7 @@ {5CCC8468-DEC8-4D36-99D4-5C891BEBD481} - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index 28698d3f95..a22a15564c 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -14,6 +14,12 @@ DynamicLibrary Static + + v143 + + + v143 + diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj index 1b79ee90c8..377d78ae57 100644 --- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj +++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj @@ -2,7 +2,7 @@ - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8} Library Properties diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj index 55be81ad27..180f5a1e25 100644 --- a/src/modules/imageresizer/ui/ImageResizerUI.csproj +++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj @@ -19,7 +19,7 @@ WinExe ImageResizer PowerToys.ImageResizer - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj index e477bbfc89..3d09bc48df 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj @@ -76,7 +76,7 @@ - v142 + v143 $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\$(MSBuildProjectName)\ Unicode diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj index f66bd4509c..1a98d0340e 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj @@ -15,6 +15,12 @@ StaticLibrary $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ + + v143 + + + v143 + diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj index 8bab96a553..d8f3de0521 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj @@ -14,6 +14,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj index 3c59ab31a3..e56d7105a6 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj @@ -18,6 +18,12 @@ Application + + v143 + + + v143 + diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj index d48f95a6d3..5b2d5382ab 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj @@ -15,6 +15,12 @@ StaticLibrary $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ + + v143 + + + v143 + diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj index ac472b5108..5cbbda55eb 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj @@ -15,6 +15,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj index 5820b4a7c1..354e5aa9c4 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj +++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj @@ -12,6 +12,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index abb63b2975..afca00e97c 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -14,6 +14,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 1bf1e91cf1..47e10420fa 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -17,6 +17,12 @@ DynamicLibrary $(SolutionDir)$(Platform)\$(Configuration)\modules\launcher\ + + v143 + + + v143 + diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj index 019cc90816..217870ca2c 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest/Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj @@ -1,7 +1,7 @@ - net5.0-windows + net6.0-windows false 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 2772451e05..dd3cda2ef2 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {BB23A474-5058-4F75-8FA3-5FE3DE53CDF4} Properties Community.PowerToys.Run.Plugin.UnitConverter 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 bc35100d7b..4f7e241f2b 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {4D971245-7A70-41D5-BAA0-DDB5684CAF51} Properties Community.PowerToys.Run.Plugin.VSCodeWorkspaces 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 da64d1018b..73db1f0f75 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {9F94B303-5E21-4364-9362-64426F8DB932} Properties Community.PowerToys.Run.Plugin.WebSearch diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj index 056a1a4065..cd5ae666d4 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj @@ -1,7 +1,7 @@ - net5.0-windows + net6.0-windows false x64 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 808b84a812..593ec7b91e 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} Properties Microsoft.Plugin.Folder 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 5985ac8ed8..ea7f53237e 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {F8B870EB-D5F5-45BA-9CF7-A5C459818820} Properties Microsoft.Plugin.Indexer diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj index 7bdd99dee2..006e0c6a60 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj @@ -1,7 +1,7 @@  - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 false diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs index c5d46a6f7c..99028165fd 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs @@ -59,7 +59,7 @@ namespace Microsoft.Plugin.Program.UnitTests.Programs Name = "x64 Native Tools Command Prompt for VS 2019", ExecutableName = "cmd.exe", FullPath = "c:\\windows\\system32\\cmd.exe", - Arguments = @"/k ""C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat""", + Arguments = @"/k ""C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat""", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\visual studio 2019\\visual studio tools\\vc\\x64 native tools command prompt for vs 2019.lnk", AppType = Win32Program.ApplicationType.Win32Application, }; 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 845707d3b7..2243891681 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 @@ -2,7 +2,7 @@ - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {FDB3555B-58EF-4AE6-B5F1-904719637AB4} Properties Microsoft.Plugin.Program 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 18f074da35..b18e55159f 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} Properties Microsoft.Plugin.Shell diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri.UnitTests/Microsoft.Plugin.Uri.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri.UnitTests/Microsoft.Plugin.Uri.UnitTests.csproj index e16b55e155..eac2a9d15e 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri.UnitTests/Microsoft.Plugin.Uri.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri.UnitTests/Microsoft.Plugin.Uri.UnitTests.csproj @@ -1,7 +1,7 @@  - net5.0-windows + net6.0-windows false x64 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 c880d30ca2..dd64070fc1 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {03276a39-d4e9-417c-8ffd-200b0ee5e871} Properties Microsoft.Plugin.Uri 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 46d2449bd1..364ab99e8a 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {74F1B9ED-F59C-4FE7-B473-7B453E30837E} Properties Microsoft.Plugin.WindowWalker diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj index 7158e785c1..0691967360 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj @@ -1,7 +1,7 @@ - net5.0-windows + net6.0-windows false x64 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 1afa4aba61..6d0c691474 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {59BD9891-3837-438A-958D-ADC7F91F6F7E} Properties Microsoft.PowerToys.Run.Plugin.Calculator diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj index 907db2d715..4ac6062d29 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj @@ -1,7 +1,7 @@  - net5.0-windows + net6.0-windows x64 en-US 8.0 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 26a5c69763..78ab7a4fed 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 @@ -1,7 +1,7 @@  - net5.0-windows + net6.0-windows Microsoft.PowerToys.Run.Plugin.Registry Microsoft.PowerToys.Run.Plugin.Registry $(Version).0 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 27641552e2..870a03e14d 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 @@ -3,7 +3,7 @@ - net5.0-windows + net6.0-windows Microsoft.PowerToys.Run.Plugin.Service Microsoft.PowerToys.Run.Plugin.Service $(Version).0 diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj index 8f10db8628..39d6bd5160 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj @@ -1,7 +1,7 @@  - net5.0-windows + net6.0-windows false x64 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 63a36015ff..2e83006600 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 @@ -3,7 +3,7 @@ Library - net5.0-windows + net6.0-windows Properties Microsoft.PowerToys.Run.Plugin.System Microsoft.PowerToys.Run.Plugin.System 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 a7ff279067..85b41a02bc 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 @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {5043CECE-E6A7-4867-9CBE-02D27D83747A} Properties Microsoft.PowerToys.Run.Plugin.WindowsSettings diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj similarity index 96% rename from src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.csproj rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj index ba66b3a496..ee87944c80 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj @@ -1,7 +1,7 @@ - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 x64 true false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/TerminalHelperTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/TerminalHelperTests.cs index f1badf08b7..b856e21172 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/TerminalHelperTests.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/TerminalHelperTests.cs @@ -5,10 +5,11 @@ using System; using System.IO; using System.Text.Json; +using Microsoft.PowerToys.Run.Plugin.WindowsTerminal; using Microsoft.PowerToys.Run.Plugin.WindowsTerminal.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests +namespace Microsoft.Plugin.WindowsTerminal.UnitTests { [TestClass] public class TerminalHelperTests 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 738b5d811f..f68f5068e7 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 @@ -3,7 +3,7 @@ - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 Microsoft.PowerToys.Run.Plugin.WindowsTerminal Microsoft.PowerToys.Run.Plugin.WindowsTerminal $(Version).0 diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs index ddb31eb437..90fd0af4d3 100644 --- a/src/modules/launcher/PowerLauncher/App.xaml.cs +++ b/src/modules/launcher/PowerLauncher/App.xaml.cs @@ -272,7 +272,9 @@ namespace PowerLauncher API?.SaveAppAllSettings(); PluginManager.Dispose(); - _mainWindow?.Dispose(); + + // Dispose needs to be called on the main Windows thread, since some resources owned by the thread need to be disposed. + _mainWindow?.Dispatcher.Invoke(Dispose); API?.Dispose(); _mainVM?.Dispose(); _themeManager?.Dispose(); diff --git a/src/modules/launcher/PowerLauncher/Helper/DataWebRequestFactory.cs b/src/modules/launcher/PowerLauncher/Helper/DataWebRequestFactory.cs index a627803742..8c37db5e25 100644 --- a/src/modules/launcher/PowerLauncher/Helper/DataWebRequestFactory.cs +++ b/src/modules/launcher/PowerLauncher/Helper/DataWebRequestFactory.cs @@ -14,10 +14,14 @@ namespace PowerLauncher.Helper { private readonly Uri _uri; +#pragma warning disable SYSLIB0014 // Type or member is obsolete + + // TODO: Verify if it's dead code or replace with HttpClient public DataWebRequest(Uri uri) { _uri = uri; } +#pragma warning restore SYSLIB0014 // Type or member is obsolete public override WebResponse GetResponse() { diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 06384a12b1..d0dc395ea6 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -3,7 +3,7 @@ PowerToys.Run WinExe - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 true true PowerLauncher.App diff --git a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 0f2d437f04..9244003dd4 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 - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\launcher win-$(Platform) false diff --git a/src/modules/launcher/Wox.Infrastructure/Http/HttpClient.cs b/src/modules/launcher/Wox.Infrastructure/Http/HttpClient.cs index 6ebeeeaef2..0f81630159 100644 --- a/src/modules/launcher/Wox.Infrastructure/Http/HttpClient.cs +++ b/src/modules/launcher/Wox.Infrastructure/Http/HttpClient.cs @@ -52,7 +52,11 @@ namespace Wox.Infrastructure.Http throw new ArgumentNullException(nameof(url)); } +#pragma warning disable SYSLIB0014 // Type or member is obsolete + + // TODO: Verify if it's dead code or replace with HttpClient var client = new WebClient { Proxy = WebProxy() }; +#pragma warning restore SYSLIB0014 // Type or member is obsolete client.Headers.Add("user-agent", UserAgent); client.DownloadFile(url.AbsoluteUri, filePath); client.Dispose(); diff --git a/src/modules/launcher/Wox.Infrastructure/Image/ImageHashGenerator.cs b/src/modules/launcher/Wox.Infrastructure/Image/ImageHashGenerator.cs index 8c7bbe680d..dc9b576234 100644 --- a/src/modules/launcher/Wox.Infrastructure/Image/ImageHashGenerator.cs +++ b/src/modules/launcher/Wox.Infrastructure/Image/ImageHashGenerator.cs @@ -35,7 +35,8 @@ namespace Wox.Infrastructure.Image enc.Frames.Add(bitmapFrame); enc.Save(outStream); var byteArray = outStream.GetBuffer(); - using (var sha1 = new SHA1CryptoServiceProvider()) + + using (var sha1 = SHA1.Create()) { var hash = Convert.ToBase64String(sha1.ComputeHash(byteArray)); return hash; diff --git a/src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs b/src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs index 12088202fe..9181364855 100644 --- a/src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs +++ b/src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs @@ -24,7 +24,7 @@ namespace Wox.Infrastructure.Storage // easier and flexible for default value of object private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions { - IgnoreNullValues = true, + DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull, IncludeFields = true, PropertyNameCaseInsensitive = true, WriteIndented = true, diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index e75b0a3751..ff00986ce3 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} Library true diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index e16bba8a8d..1e88524cfd 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -2,7 +2,7 @@ - net5.0-windows + net6.0-windows {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} true Library diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index f323d9422b..1e3f19945d 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -2,7 +2,7 @@ - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {FF742965-9A80-41A5-B042-D6C7D3A21708} Library Properties diff --git a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj index 680ffd745d..40bfa5dc7c 100644 --- a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj +++ b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj @@ -25,14 +25,14 @@ Application true - v142 + v143 Unicode false Application false - v142 + v143 true Unicode false diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj index 2232c30a3d..f758887276 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj @@ -16,6 +16,12 @@ PowerToys.PowerRenameExt $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + + v143 + + + v143 + diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj index ea51a2d18c..1adadac358 100644 --- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj +++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj @@ -10,6 +10,12 @@ StaticLibrary + + v143 + + + v143 + diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index 13205ee06b..69d3c0498e 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -11,6 +11,12 @@ Application + + v143 + + + v143 + diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index 862b17af7a..3e0c2ddafb 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -8,6 +8,12 @@ PowerRenameUnitTests + + v143 + + + v143 + DynamicLibrary diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index b4776aca3a..62a5a212b8 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -24,7 +24,7 @@ {805306FF-A562-4415-8DEF-E493BDC45918} Microsoft.PowerToys.PreviewHandler.Gcode - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ diff --git a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj index 6fc140e863..c35e353cd5 100644 --- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj @@ -10,7 +10,7 @@ Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys - net5.0-windows + net6.0-windows true true Microsoft Corporation diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index 5d4361aa1a..a25194840c 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -23,7 +23,7 @@ {6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB} Microsoft.PowerToys.PreviewHandler.Markdown - net5.0-windows + net6.0-windows true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.MarkdownPreviewHandler diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index 5346d29eb5..becbd2f5d4 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -22,7 +22,7 @@ Microsoft.PowerToys.PreviewHandler.Monaco - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.MonacoPreviewHandler diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index 70d1490488..8a296ef0d9 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -23,7 +23,7 @@ {69E1EE8D-143A-4060-9129-4658ACF14AAF} Microsoft.PowerToys.PreviewHandler.Pdf - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.PdfPreviewHandler diff --git a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj index 3ceb50d7ee..d7d8e1babe 100644 --- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj @@ -10,7 +10,7 @@ Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 true true Microsoft Corporation diff --git a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj index 0f82a9d0de..d7648eab6f 100644 --- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj +++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj @@ -10,7 +10,7 @@ Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys - net5.0-windows + net6.0-windows true true Microsoft Corporation diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index 8e9a5d8013..32e4b1846a 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -24,7 +24,7 @@ {DA425894-6E13-404F-8DCB-78584EC0557A} Microsoft.PowerToys.PreviewHandler.Svg - net5.0-windows + net6.0-windows true $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.SvgPreviewHandler diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index 57a128dce6..5dfe00faf1 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -10,7 +10,7 @@ Microsoft Corporation Copyright (C) 2020 Microsoft Corporation PowerToys - net5.0-windows + net6.0-windows true true Microsoft Corporation diff --git a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj index d81146a0a1..0b3f5a478c 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj @@ -17,7 +17,7 @@ {FCF3E52D-B80A-4FC3-98FD-6391354F0EE3} PdfPreviewHandlerUnitTests - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj index 35a7a44163..f798a6132e 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj @@ -17,7 +17,7 @@ {133281D8-1BCE-4D07-B31E-796612A9609E} GcodeThumbnailProviderUnitTests - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index f9c99ca819..65d0b75229 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -18,7 +18,7 @@ {A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} PreviewPaneUnitTests PreviewPaneUnitTests - net5.0-windows + net6.0-windows {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj index e8a6478483..fa6ec0d8b1 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj @@ -17,7 +17,7 @@ {ECC20689-002A-4354-95A6-B58DF089C6FF} PdfPreviewHandlerUnitTests - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj index 145743d86b..5bcc98265d 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj @@ -17,7 +17,7 @@ {F40C3397-1834-4530-B2D9-8F8B8456BCDF} PdfThumbnailProviderUnitTests - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index d56cc46338..4ef20b8abb 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -17,7 +17,7 @@ {748417CA-F17E-487F-9411-CAFB6D3F4877} PreviewHandlerCommonUnitTests - net5.0-windows + net6.0-windows {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj index d4b77ddfbd..df7aacc0aa 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj @@ -17,7 +17,7 @@ {F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} StlThumbnailProviderUnitTests - net5.0-windows10.0.18362.0 + net6.0-windows10.0.18362.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index dd34316deb..4521890c37 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -17,7 +17,7 @@ {060D75DA-2D1C-48E6-A4A1-6F0718B64661} SvgPreviewHandlerUnitTests - net5.0-windows + net6.0-windows {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 8386e6ab0b..6ad27c5ad2 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -17,7 +17,7 @@ {1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} SvgThumbnailProviderUnitTests - net5.0-windows + net6.0-windows {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index 8858a18176..d8c024fe30 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -22,7 +22,7 @@ {AF2349B8-E5B6-4004-9502-687C1C7730B1} - net5.0-windows + net6.0-windows $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.PreviewHandlerCommon diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index b27aa3a051..f97a12d925 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -15,6 +15,12 @@ DynamicLibrary + + v143 + + + v143 + diff --git a/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj b/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj index 3113dd1888..78701da876 100644 --- a/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj +++ b/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj @@ -23,14 +23,14 @@ DynamicLibrary true - v142 + v143 Unicode Spectre DynamicLibrary false - v142 + v143 true Unicode Spectre diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj index 5d4fea585a..642918d917 100644 --- a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj +++ b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj @@ -31,6 +31,18 @@ DynamicLibrary + + v143 + + + v143 + + + v143 + + + v143 + $(SolutionDir)\src\;$(ProjectDir)..\..\..\ diff --git a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj index d43024e69e..461d699619 100644 --- a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj +++ b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj @@ -36,7 +36,7 @@ StaticLibrary true - v142 + v143 Unicode diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj index cfd9f9e07f..de8a97be93 100644 --- a/src/runner/runner.vcxproj +++ b/src/runner/runner.vcxproj @@ -16,6 +16,12 @@ Application + + v143 + + + v143 + diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs index f26a09af88..dd762301e9 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs @@ -46,7 +46,7 @@ namespace PowerToysTests string zoneSettings = "{\"devices\":[{\"device-id\":\"DELA026#5&10a58c63&0&UID16777488_1920_1200_{39B25DD2-130D-4B5D-8851-4791D66B1539}\",\"active-zoneset\":{\"uuid\":\"{D13ABB6D-7721-4176-9647-C8C0836D99CC}\",\"type\":\"columns\"},\"editor-show-spacing\":true,\"editor-spacing\":16,\"editor-zone-count\":3}],\"custom-zone-sets\":[]}"; File.WriteAllText(_zoneSettingsPath, zoneSettings); - string appHistory = "{\"app-zone-history\":[{\"app-path\":\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\Common7\\IDE\\Extensions\\TestPlatform\\testhost.exe\",\"zone-index\":3,\"device-id\":\"DELA026#5&10a58c63&0&UID16777488_1920_1200_{39B25DD2-130D-4B5D-8851-4791D66B1539}\",\"zoneset-uuid\":\"{D13ABB6D-7721-4176-9647-C8C0836D99CC}\"}]}"; + string appHistory = "{\"app-zone-history\":[{\"app-path\":\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Common7\\IDE\\Extensions\\TestPlatform\\testhost.exe\",\"zone-index\":3,\"device-id\":\"DELA026#5&10a58c63&0&UID16777488_1920_1200_{39B25DD2-130D-4B5D-8851-4791D66B1539}\",\"zoneset-uuid\":\"{D13ABB6D-7721-4176-9647-C8C0836D99CC}\"}]}"; File.WriteAllText(_appHistoryPath, appHistory); } diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj index d1697ec382..4ff64d1634 100644 --- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj +++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj @@ -9,6 +9,12 @@ BugReportTool + + v143 + + + v143 + Application $(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\ diff --git a/tools/CleanUp_tool/CleanUp_tool.vcxproj b/tools/CleanUp_tool/CleanUp_tool.vcxproj index 3f6c697c05..f155e44c43 100644 --- a/tools/CleanUp_tool/CleanUp_tool.vcxproj +++ b/tools/CleanUp_tool/CleanUp_tool.vcxproj @@ -21,13 +21,13 @@ Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode diff --git a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj index 6c83590629..117445298a 100644 --- a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj +++ b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj @@ -29,26 +29,26 @@ Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode diff --git a/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj b/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj index 239b95ce92..bb7fd40526 100644 --- a/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj +++ b/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj @@ -28,26 +28,26 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/tools/WebcamReportTool/WebcamReportTool.vcxproj b/tools/WebcamReportTool/WebcamReportTool.vcxproj index 9f6a39bf8a..1b5354d9df 100644 --- a/tools/WebcamReportTool/WebcamReportTool.vcxproj +++ b/tools/WebcamReportTool/WebcamReportTool.vcxproj @@ -2,6 +2,12 @@ + + v143 + + + v143 + {FC9599B4-68CD-E14B-71D7-456FDD8D0845} diff --git a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj index 3e9fcc5c6e..c1e9451c82 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj index 3a9fb62be2..32581ac25b 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj @@ -23,14 +23,14 @@ DynamicLibrary true - v142 + v143 Unicode Spectre DynamicLibrary false - v142 + v143 true Unicode Spectre diff --git a/tools/project_template/ModuleTemplate/README.md b/tools/project_template/ModuleTemplate/README.md index 26d8fcadc7..54bf78bf33 100644 --- a/tools/project_template/ModuleTemplate/README.md +++ b/tools/project_template/ModuleTemplate/README.md @@ -6,7 +6,7 @@ This project is used to generate the Visual Studio PowerToys Module Template # Instruction In Visual Studio from the menu Project->Export Template... generate the template. Set the name `PowerToys Module`, add a description `A project for creating a PowerToys module` and an icon. -Open the resulting .zip file in `%USERNAME%\Documents\Visual Studio 2019\Templates\ProjectTemplates` +Open the resulting .zip file in `%USERNAME%\Documents\Visual Studio 2022\Templates\ProjectTemplates` and edit `MyTemplate.vstemplate` to make the necessary changes, the resulting template should look like this: ```xml diff --git a/tools/project_template/README.md b/tools/project_template/README.md index 48711ef18f..06c09ccf30 100644 --- a/tools/project_template/README.md +++ b/tools/project_template/README.md @@ -1,8 +1,8 @@ -# PowerToy DLL Project For Visual Studio 2019 +# PowerToy DLL Project For Visual Studio 2022 ## Installation -- Put the `ModuleTemplate.zip` file inside the `%USERPROFILE%\Documents\Visual Studio 2019\Templates\ProjectTemplates\` folder, which is the default *User project templates location*. You can change that location via `Tools > Options > Projects and Solutions`. +- Put the `ModuleTemplate.zip` file inside the `%USERPROFILE%\Documents\Visual Studio 2022\Templates\ProjectTemplates\` folder, which is the default *User project templates location*. You can change that location via `Tools > Options > Projects and Solutions`. - The template will be available in Visual Studio, when adding a new project, under the `Visual C++` tab. ## Contributing