From b41d2d64cb0f2210e7e912a117e0a748748b49e4 Mon Sep 17 00:00:00 2001 From: yuyoyuppe Date: Tue, 4 Feb 2020 18:56:10 +0300 Subject: [PATCH] MSIX: fix uninstallation from msix_reinstall and split the scripts (#1183) --- 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 0000000000..5a241c13cb --- /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 bedd7b78e2..0000000000 --- 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 0000000000..703042f0ba --- /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 0000000000..0d3081edcf --- /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 0000000000..76c05f399f --- /dev/null +++ b/installer/MSIX/uninstall_msix.ps1 @@ -0,0 +1 @@ +Get-AppxPackage -Name '*PowerToys' | select -ExpandProperty "PackageFullName" | Remove-AppxPackage