From 4d5fcd097560e079f988b86463090c86a62dd1ca Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 25 Jan 2022 14:33:10 -0800 Subject: [PATCH] updating everythign to .net 6 minus wxs for runtime --- .pipelines/ci/templates/build-powertoys-steps.yml | 6 ------ .../editor/FancyZonesEditor/FancyZonesEditor.csproj | 2 +- src/modules/imageresizer/tests/ImageResizerUITest.csproj | 2 +- src/modules/imageresizer/ui/ImageResizerUI.csproj | 2 +- .../Microsoft.Plugin.Program.UnitTests.csproj | 2 +- .../Microsoft.Plugin.Program.csproj | 2 +- ...ft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.csproj | 2 +- .../Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj | 2 +- src/modules/launcher/PowerLauncher/PowerLauncher.csproj | 2 +- src/modules/launcher/Wox.Test/Wox.Test.csproj | 2 +- .../GcodePreviewHandler/GcodePreviewHandler.csproj | 2 +- .../previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj | 2 +- .../PdfThumbnailProvider/PdfThumbnailProvider.csproj | 2 +- .../UnitTests-GcodePreviewHandler.csproj | 2 +- .../UnitTests-GcodeThumbnailProvider.csproj | 2 +- .../UnitTests-PdfPreviewHandler.csproj | 2 +- .../UnitTests-PdfThumbnailProvider.csproj | 2 +- 17 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index be9ab4346c..929ee9f938 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -7,12 +7,6 @@ steps: submodules: true clean: true -- task: UseDotNet@2 - displayName: 'Use .NET 5 SDK - unit tests' - inputs: - packageType: sdk - version: '5.x' - - task: UseDotNet@2 displayName: 'Use .NET 6 SDK' inputs: 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/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/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/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.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.PowerToys.Run.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.PowerToys.Run.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/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/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index ad6eb06765..6d868238d8 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/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/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/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/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-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