From 53af5ab73f75bf918221dedd62880cc9b7fce0ae Mon Sep 17 00:00:00 2001 From: yuyoyuppe Date: Thu, 30 Jan 2020 16:16:47 +0300 Subject: [PATCH 1/2] MSIX: fix uninstallation from msix_reinstall --- installer/MSIX/msix_reinstall.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/MSIX/msix_reinstall.ps1 b/installer/MSIX/msix_reinstall.ps1 index bedd7b78e2dd..4568ca4d1c71 100644 --- a/installer/MSIX/msix_reinstall.ps1 +++ b/installer/MSIX/msix_reinstall.ps1 @@ -1,6 +1,6 @@ taskkill /f /im explorer.exe -Get-AppxPackage -Name 'PowerToys' | select -ExpandProperty "PackageFullName" | Remove-AppxPackage +Get-AppxPackage -Name '*PowerToys' | select -ExpandProperty "PackageFullName" | Remove-AppxPackage .\build_msix.ps1 signtool sign /debug /a /fd SHA256 /f PowerToys_TemporaryKey.pfx /p 12345 bin\PowerToys-x64.msix From bd6d9d1ce5013776c3b3040912ec20d7b5e49a8f Mon Sep 17 00:00:00 2001 From: yuyoyuppe Date: Tue, 4 Feb 2020 18:15:26 +0300 Subject: [PATCH 2/2] FIXUP: further split the MSIX control scripts --- installer/MSIX/install_msix.ps1 | 1 + installer/MSIX/msix_reinstall.ps1 | 11 ----------- installer/MSIX/reinstall_msix.ps1 | 8 ++++++++ installer/MSIX/sign_msix.ps1 | 2 ++ installer/MSIX/uninstall_msix.ps1 | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 installer/MSIX/install_msix.ps1 delete mode 100644 installer/MSIX/msix_reinstall.ps1 create mode 100644 installer/MSIX/reinstall_msix.ps1 create mode 100644 installer/MSIX/sign_msix.ps1 create mode 100644 installer/MSIX/uninstall_msix.ps1 diff --git a/installer/MSIX/install_msix.ps1 b/installer/MSIX/install_msix.ps1 new file mode 100644 index 000000000000..5a241c13cbe6 --- /dev/null +++ b/installer/MSIX/install_msix.ps1 @@ -0,0 +1 @@ +Add-AppxPackage .\bin\PowerToys.msixbundle diff --git a/installer/MSIX/msix_reinstall.ps1 b/installer/MSIX/msix_reinstall.ps1 deleted file mode 100644 index 4568ca4d1c71..000000000000 --- a/installer/MSIX/msix_reinstall.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -taskkill /f /im explorer.exe - -Get-AppxPackage -Name '*PowerToys' | select -ExpandProperty "PackageFullName" | Remove-AppxPackage - -.\build_msix.ps1 -signtool sign /debug /a /fd SHA256 /f PowerToys_TemporaryKey.pfx /p 12345 bin\PowerToys-x64.msix -signtool sign /debug /a /fd SHA256 /f PowerToys_TemporaryKey.pfx /p 12345 bin\PowerToys.msixbundle - -Add-AppxPackage .\bin\PowerToys.msixbundle - -start $Env:windir\explorer.exe \ No newline at end of file diff --git a/installer/MSIX/reinstall_msix.ps1 b/installer/MSIX/reinstall_msix.ps1 new file mode 100644 index 000000000000..703042f0baa3 --- /dev/null +++ b/installer/MSIX/reinstall_msix.ps1 @@ -0,0 +1,8 @@ +taskkill /f /im explorer.exe + +.\uninstall_msix.ps1 +.\build_msix.ps1 +.\sign_msix.ps1 +.\install_msix.ps1 + +start $Env:windir\explorer.exe diff --git a/installer/MSIX/sign_msix.ps1 b/installer/MSIX/sign_msix.ps1 new file mode 100644 index 000000000000..0d3081edcf43 --- /dev/null +++ b/installer/MSIX/sign_msix.ps1 @@ -0,0 +1,2 @@ +signtool sign /debug /a /fd SHA256 /f PowerToys_TemporaryKey.pfx /p 12345 bin\PowerToys-x64.msix +signtool sign /debug /a /fd SHA256 /f PowerToys_TemporaryKey.pfx /p 12345 bin\PowerToys.msixbundle diff --git a/installer/MSIX/uninstall_msix.ps1 b/installer/MSIX/uninstall_msix.ps1 new file mode 100644 index 000000000000..76c05f399f31 --- /dev/null +++ b/installer/MSIX/uninstall_msix.ps1 @@ -0,0 +1 @@ +Get-AppxPackage -Name '*PowerToys' | select -ExpandProperty "PackageFullName" | Remove-AppxPackage