From e06c2ce5a32b6a00efcde1cbfbdd1a8dfac10f41 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Mon, 16 May 2022 17:03:24 +0100 Subject: [PATCH 1/7] [ARM64]Build pipelines --- .github/workflows/package-submissions.yml | 2 +- .pipelines/ESRPSigning_core.json | 3 ++- .pipelines/build-installer-MSI.cmd | 5 ----- .pipelines/ci/ci.yml | 3 +++ .pipelines/release.yml | 1 + 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 .pipelines/build-installer-MSI.cmd diff --git a/.github/workflows/package-submissions.yml b/.github/workflows/package-submissions.yml index cbd7ea37b8c2..62d16dff61f8 100644 --- a/.github/workflows/package-submissions.yml +++ b/.github/workflows/package-submissions.yml @@ -21,7 +21,7 @@ jobs: $github = Invoke-RestMethod -uri "https://api.github.com/repos/Microsoft/PowerToys/releases" $targetRelease = $github | Where-Object -Property name -match 'Release'| Select -First 1 - $installerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup' | Select -ExpandProperty browser_download_url + $installerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*x64' | Select -ExpandProperty browser_download_url $ver = $targetRelease.tag_name.Trim("v") # getting latest wingetcreate file diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index f01ba1477ba5..7c1629d0fada 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -113,6 +113,7 @@ "modules\\VideoConference\\PowerToys.VideoConferenceModule.dll", "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x86.dll", "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x64.dll", + "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_arm64.dll", "Settings\\PowerToys.Settings.dll", "Settings\\PowerToys.Settings.exe" @@ -186,7 +187,7 @@ "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.Core.dll", "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.WinForms.dll", "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.Wpf.dll", - "modules\\FileExplorerPreview\\runtimes\\win-x64\\native\\WebView2Loader.dll", + "modules\\FileExplorerPreview\\WebView2Loader.dll", "modules\\launcher\\e_sqlite3.dll", "modules\\launcher\\SQLitePCLRaw.batteries_v2.dll", "modules\\launcher\\SQLitePCLRaw.core.dll", diff --git a/.pipelines/build-installer-MSI.cmd b/.pipelines/build-installer-MSI.cmd deleted file mode 100644 index 7959624204d2..000000000000 --- a/.pipelines/build-installer-MSI.cmd +++ /dev/null @@ -1,5 +0,0 @@ -cd /D "%~dp0" - -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/ci.yml b/.pipelines/ci/ci.yml index fd7b18829153..5f8b11af36e4 100644 --- a/.pipelines/ci/ci.yml +++ b/.pipelines/ci/ci.yml @@ -24,3 +24,6 @@ jobs: - template: ./templates/build-powertoys-ci.yml parameters: platform: x64 + - template: ./templates/build-powertoys-ci.yml + parameters: + platform: ARM64 diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 1d6c1d00f091..98fa02e368dd 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -15,6 +15,7 @@ parameters: type: object default: - x64 + - ARM64 - name: versionNumber type: string default: '0.0.1' From 99a54ce1edf764d6979164de200c4ef613f907db Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Mon, 16 May 2022 17:09:02 +0100 Subject: [PATCH 2/7] Fix localization in pipelines (no arm64 al.exe) --- src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj | 1 + .../editor/FancyZonesEditor/FancyZonesEditor.csproj | 1 + src/modules/imageresizer/ui/ImageResizerUI.csproj | 1 + .../Community.PowerToys.Run.Plugin.UnitConverter.csproj | 1 + .../Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj | 3 ++- .../Community.PowerToys.Run.Plugin.WebSearch.csproj | 4 ++-- .../Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj | 3 ++- .../Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj | 3 ++- .../Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj | 1 + .../Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj | 1 + .../Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj | 3 ++- .../Microsoft.Plugin.WindowWalker.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.Calculator.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.Registry.csproj | 1 + .../Microsoft.PowerToys.Run.Plugin.Service.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.System.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.TimeDate.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.TimeZone.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj | 3 ++- .../Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj | 3 ++- src/modules/launcher/PowerLauncher/PowerLauncher.csproj | 1 + .../launcher/Wox.Infrastructure/Wox.Infrastructure.csproj | 2 +- src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj | 3 ++- .../GcodePreviewHandler/GcodePreviewHandler.csproj | 1 + .../MarkdownPreviewHandler/MarkdownPreviewHandler.csproj | 1 + .../MonacoPreviewHandler/MonacoPreviewHandler.csproj | 3 ++- .../previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj | 1 + .../previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj | 1 + 28 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index 784a2722ea47..bb951262610b 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -6,6 +6,7 @@ $(SolutionDir)$(Platform)\$(Configuration)\modules\ColorPicker false false + true true ColorPicker.Program diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index 53f2f9982be0..a038d23ec01f 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -10,6 +10,7 @@ true false false + true $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj index 6ef4f541e59d..77b2fac87d64 100644 --- a/src/modules/imageresizer/ui/ImageResizerUI.csproj +++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj @@ -6,6 +6,7 @@ $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer false false + true true 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 72ee8942346d..18676fb5fb22 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 @@ -11,6 +11,7 @@ true false false + true ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\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 00587b59e8c7..c61421e92824 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 @@ -11,8 +11,9 @@ true false false + true ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\VSCodeWorkspaces\ - + true 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 caffa8ef2805..c88a95951d85 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 @@ -11,8 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WebSearch\ - + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WebSearch\ 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 959550c49e9b..b2c9e20f52af 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 @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Folder\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\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 1bba369ef1b9..6aa547807ef5 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 @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Indexer\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Indexer\ 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 1041e20714ad..b635ca2cc767 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 @@ -12,6 +12,7 @@ true false false + true ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\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 0a8a36bb2f4d..d102b7f89a80 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 @@ -11,6 +11,7 @@ true false false + true ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Shell\ 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 b7bf7735de5a..60fef1dc275b 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 @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Uri\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\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 35c3e4e61f1f..a762f5e65d81 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 @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowWalker\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowWalker\ 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 52815d8375de..ae997f5c502f 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 @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Calculator\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Calculator\ 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 aeffe69bca65..16d9a12ca08d 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 @@ -8,6 +8,7 @@ false false enable + true ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Registry\ 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 a29b21817d1a..8b4f909620e5 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 @@ -9,7 +9,8 @@ $(Version).0 false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Service\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Service\ 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 f2e33f5a27b5..c937abe33f82 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 @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\System\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\System\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj index 3a031f02344b..c395874ddbb1 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj @@ -11,7 +11,8 @@ true false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\TimeDate\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\TimeDate\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj index 42b0844942fe..15b2a833328c 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Microsoft.PowerToys.Run.Plugin.TimeZone.csproj @@ -8,7 +8,8 @@ false false enable - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\TimeZone\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\TimeZone\ 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 e79ab251e371..2d16591a3c3e 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 @@ -12,7 +12,8 @@ false true enable - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowsSettings\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowsSettings\ 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 59fbfa496bcf..765cff35d248 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 @@ -9,7 +9,8 @@ $(Version).0 false false - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowsTerminal\ + true + ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowsTerminal\ diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 5a55579ab241..0cc2a7069d26 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -18,6 +18,7 @@ PowerToys PowerLauncher PowerToys.PowerLauncher ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\ + true diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index 7467bf9da87a..7ba44612e51d 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -12,7 +12,7 @@ $(Version).0 false false - ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxInfrastructure + ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxInfrastructure diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index 828a022e7b11..2eaf08ff07c9 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -12,7 +12,8 @@ $(Version).0 false false - ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxPlugin + true + ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxPlugin diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index 6b48da4e16e3..1aecc28247fa 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -9,6 +9,7 @@ false false true + true PowerToys.GcodePreviewHandler diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index 944b181c9651..a13c76054627 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -9,6 +9,7 @@ false false true + true win10-x64;win10-arm64 net6.0-windows10.0.18362.0 diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index babcad3c87c2..6951ecc59c1e 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -7,6 +7,7 @@ false false true + true win10-x64;win10-arm64 @@ -16,7 +17,7 @@ Microsoft.PowerToys.PreviewHandler.Monaco net6.0-windows10.0.18362.0 true - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ + $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.MonacoPreviewHandler diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index caf4310210ff..21ab18e92375 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -9,6 +9,7 @@ false false true + true diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index 2ea8721651f2..5d08472f6552 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -9,6 +9,7 @@ false false true + true win10-x64;win10-arm64 net6.0-windows10.0.18362.0 From cda391dab26975facfb3c0ee2fe53d864ec64d9a Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Mon, 16 May 2022 20:13:42 +0100 Subject: [PATCH 3/7] Use lowercase arm64 for CI --- .pipelines/ci/ci.yml | 2 +- .pipelines/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/ci/ci.yml b/.pipelines/ci/ci.yml index 5f8b11af36e4..cab3c045fa42 100644 --- a/.pipelines/ci/ci.yml +++ b/.pipelines/ci/ci.yml @@ -26,4 +26,4 @@ jobs: platform: x64 - template: ./templates/build-powertoys-ci.yml parameters: - platform: ARM64 + platform: arm64 diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 98fa02e368dd..4c056871938e 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -15,7 +15,7 @@ parameters: type: object default: - x64 - - ARM64 + - arm64 - name: versionNumber type: string default: '0.0.1' From 4de2364b8db83df4fd0d75d9f58b34d7548c9c35 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Mon, 16 May 2022 22:12:48 +0100 Subject: [PATCH 4/7] Build installer to arm64 folder and arm64 name --- installer/PowerToysSetup/PowerToys.wxs | 2 +- installer/PowerToysSetup/PowerToysBootstrapper.wixproj | 6 +++++- installer/PowerToysSetup/PowerToysInstaller.wixproj | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs index 39a9da3effc0..91f749c96f9b 100644 --- a/installer/PowerToysSetup/PowerToys.wxs +++ b/installer/PowerToysSetup/PowerToys.wxs @@ -115,7 +115,7 @@ Hash="$(var.WinAppSDKPayloadHash)" /> diff --git a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj index 44cb6f667650..36561e9ea86d 100644 --- a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj +++ b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj @@ -20,7 +20,11 @@ PowerToysSetup-$(Version)-$(Platform) Bundle True - $(Platform)\$(Configuration)\ + + PowerToysSetup-$(Version)-arm64 + PowerToysSetup-$(Version)-$(Platform) + arm64\$(Configuration)\ + $(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ diff --git a/installer/PowerToysSetup/PowerToysInstaller.wixproj b/installer/PowerToysSetup/PowerToysInstaller.wixproj index e3209d6282da..c94e074e08d4 100644 --- a/installer/PowerToysSetup/PowerToysInstaller.wixproj +++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj @@ -35,14 +35,17 @@ call "..\..\publish.cmd" arm64 3.10 022a9d30-7c4f-416d-a9df-5ff2661cc0ad 2.0 - PowerToysSetup-$(Version)-$(Platform) + + PowerToysSetup-$(Version)-arm64 + PowerToysSetup-$(Version)-$(Platform) Package True - $(Platform)\$(Configuration)\ + arm64\$(Configuration)\ + $(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ ICE91 True From 102bef71e8ed45ba0d96c27f9ed73641d97c97a7 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Tue, 17 May 2022 10:03:27 +0100 Subject: [PATCH 5/7] Don't run arm64 tests, as there's no agent for it --- .pipelines/ci/templates/build-powertoys-steps.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index 65e95bc587ea..7a1a178488ab 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -128,6 +128,7 @@ steps: # directly not doing WinAppDriver testing - task: VSTest@2 displayName: 'MS Tests' + condition: ne('$(BuildPlatform)','arm64') # No arm64 agents to run the tests. inputs: platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' @@ -163,6 +164,7 @@ steps: # Native dlls - task: VSTest@2 + condition: ne('$(BuildPlatform)','arm64') # No arm64 agents to run the tests. displayName: 'Native Tests' inputs: platform: '$(BuildPlatform)' From 7437b41958e87bf6f42cc3ac41818bd2cf9d857c Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Tue, 17 May 2022 10:41:22 +0100 Subject: [PATCH 6/7] Fix pipeline conditions --- .pipelines/ci/templates/build-powertoys-steps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index 7a1a178488ab..17c9e783e277 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -128,7 +128,7 @@ steps: # directly not doing WinAppDriver testing - task: VSTest@2 displayName: 'MS Tests' - condition: ne('$(BuildPlatform)','arm64') # No arm64 agents to run the tests. + condition: ne(variables['BuildPlatform'], 'arm64') # No arm64 agents to run the tests. inputs: platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' @@ -164,7 +164,7 @@ steps: # Native dlls - task: VSTest@2 - condition: ne('$(BuildPlatform)','arm64') # No arm64 agents to run the tests. + condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests. displayName: 'Native Tests' inputs: platform: '$(BuildPlatform)' From 064b8126e947bc56dd7b7b75c05272de9917e2f9 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Tue, 17 May 2022 13:55:17 +0100 Subject: [PATCH 7/7] Divide symbol files by platform --- .pipelines/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 4c056871938e..a1dbdcc3f472 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -415,14 +415,14 @@ jobs: contents: >- **/*.pdb flattenFolders: True - targetFolder: $(Build.ArtifactStagingDirectory)/Symbols/ + targetFolder: $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/ - task: PowerShell@2 displayName: 'Remove unneeded files from ArtifactStagingDirectory' inputs: targetType: 'inline' script: | - cd $(Build.ArtifactStagingDirectory)/Symbols/ + cd $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/ Remove-Item vc143.pdb Remove-Item *test* @@ -431,21 +431,21 @@ jobs: continueOnError: True inputs: SearchPattern: | - $(Build.ArtifactStagingDirectory)/Symbols/**/*.* + $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/**/*.* IndexSources: false SymbolServerType: TeamServices - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: Symbols' inputs: - PathtoPublish: $(System.ArtifactsDirectory)/Symbols/ - ArtifactName: Symbols + PathtoPublish: $(System.ArtifactsDirectory)/Symbols-$(BuildPlatform)/ + ArtifactName: Symbols-$(BuildPlatform) - task: DeleteFiles@1 displayName: 'Remove symbols from ArtifactStagingDirectory' inputs: Contents: '*' - SourceFolder: $(Build.ArtifactStagingDirectory)/Symbols/ + SourceFolder: $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/ RemoveSourceFolder: True - task: CopyFiles@2