From de4b66b51ee8154a98ccda098fee7f66adbb6b30 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com>
Date: Thu, 14 Jul 2022 18:33:15 +0200
Subject: [PATCH] [installer] Remove unneeded installer/MSIX directory (#19320)
* [installer] Remove uneeded installer/MSIX dir
* Run spellcheck
---
.github/actions/spell-check/expect.txt | 28 +---
installer/MSIX/PackagingLayout.xml | 78 -----------
installer/MSIX/appxmanifest.xml | 121 ------------------
installer/MSIX/build_msix.ps1 | 13 --
installer/MSIX/build_msix_cdpx.cmd | 14 --
installer/MSIX/generate_self_sign_cert.ps1 | 5 -
installer/MSIX/install_msix.ps1 | 1 -
installer/MSIX/registry.dat | Bin 12288 -> 0 bytes
installer/MSIX/registry.reg | Bin 6358 -> 0 bytes
installer/MSIX/reinstall_msix.ps1 | 5 -
installer/MSIX/sign_msix.ps1 | 2 -
installer/MSIX/uninstall_msix.ps1 | 1 -
.../MSIX/update_appxmanifest_version.ps1 | 5 -
.../{MSIX => PowerToysSetup}/Images/logo.png | Bin
.../Images/logo150.png | Bin
.../Images/logo44.png | Bin
installer/PowerToysSetup/PowerToys.wxs | 2 +-
17 files changed, 3 insertions(+), 272 deletions(-)
delete mode 100644 installer/MSIX/PackagingLayout.xml
delete mode 100644 installer/MSIX/appxmanifest.xml
delete mode 100644 installer/MSIX/build_msix.ps1
delete mode 100644 installer/MSIX/build_msix_cdpx.cmd
delete mode 100644 installer/MSIX/generate_self_sign_cert.ps1
delete mode 100644 installer/MSIX/install_msix.ps1
delete mode 100644 installer/MSIX/registry.dat
delete mode 100644 installer/MSIX/registry.reg
delete mode 100644 installer/MSIX/reinstall_msix.ps1
delete mode 100644 installer/MSIX/sign_msix.ps1
delete mode 100644 installer/MSIX/uninstall_msix.ps1
delete mode 100644 installer/MSIX/update_appxmanifest_version.ps1
rename installer/{MSIX => PowerToysSetup}/Images/logo.png (100%)
rename installer/{MSIX => PowerToysSetup}/Images/logo150.png (100%)
rename installer/{MSIX => PowerToysSetup}/Images/logo44.png (100%)
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 21df41882b..9e2ad31695 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -77,7 +77,6 @@ apps
appwindow
appwiz
appx
-appxmanifest
APSTUDIO
AQS
Aqtobe
@@ -142,7 +141,6 @@ Bashkortostan
Bayan
bbwe
bck
-Bcl
Belarus
betadele
betsegaw
@@ -416,7 +414,6 @@ deinitialization
DELA
deletethis
Delimarsky
-delims
dend
DENORMAL
Deondre
@@ -608,7 +605,6 @@ Filterkeyboard
Filterx
finalizer
findfast
-findstr
Firefox
FIXEDFILEINFO
FLASHZONES
@@ -646,7 +642,6 @@ GBs
GCLP
gcnew
gcode
-gcodepreviewhandler
gdi
gdiplus
GDISCALED
@@ -796,7 +791,6 @@ IComparer
ICompositor
ICONERROR
IContext
-ICONWARNING
ICreate
IData
IDD
@@ -955,7 +949,6 @@ ISingle
ISmart
isocpp
iss
-IStorage
IStream
istreambuf
istringstream
@@ -983,7 +976,6 @@ IVirtual
IWbem
IWIC
iwindow
-IWork
IXml
IYUV
IZone
@@ -1154,7 +1146,6 @@ Magadan
Mainwindow
majortype
MAJORVERSION
-makeappx
makecab
MAKEINTRESOURCE
MAKEINTRESOURCEW
@@ -1186,7 +1177,6 @@ MCDT
MCST
MDICHILD
MDL
-mdpreviewhandler
mdtext
mdtxt
mdwn
@@ -1199,7 +1189,6 @@ memset
MENUBREAK
MENUITEMINFO
MENUITEMINFOW
-messageboxes
Metadatas
metafile
mfapi
@@ -1275,9 +1264,7 @@ MSIHANDLE
msiquery
MSIRESTARTMANAGERCONTROL
msix
-msixbundle
MSIXCA
-MSIXVERSION
MSLLHOOKSTRUCT
Mso
msp
@@ -1295,7 +1282,7 @@ Mundrabilla
mutex
mutexes
muxc
-mvvm
+MVVM
myfile
MYICON
MYTZ
@@ -1385,7 +1372,6 @@ Noronha
NOSEARCH
NOSENDCHANGING
NOSIZE
-notafter
notfound
nothrow
NOTIFICATIONSDLL
@@ -1452,7 +1438,6 @@ ostream
ostringstream
OSVERSIONINFOEX
OSVERSIONINFOEXW
-OSVERSIONINFOW
osvi
OUTOFCONTEXT
OUTOFMEMORY
@@ -1492,7 +1477,6 @@ PCIDLIST
PCWSTR
pdb
pdbonly
-pdfpreviewhandler
pdo
pdto
pdtobj
@@ -1589,7 +1573,6 @@ PROPBAG
PROPERTYKEY
propkey
propvarutil
-PRTL
prvpane
psapi
PSECURITY
@@ -1686,8 +1669,6 @@ remappings
REMAPSUCCESSFUL
REMAPUNSUCCESSFUL
Remotable
-REMOTEDISPLAY
-REMOTESESSION
Removelnk
renamable
RENAMEONCOLLISION
@@ -1787,7 +1768,6 @@ Segoe
Sekan
SENDCHANGE
sendvirtualinput
-serializationexception
serializer
serverside
SETCONTEXT
@@ -1854,7 +1834,7 @@ siex
SIGABRT
sigdn
SIGNINGSCENARIO
-signtool
+Signtool
sinclairinat
SINGLEKEY
singlekeyremapcontrol
@@ -1979,7 +1959,6 @@ sut
SVE
SVGIn
SVGIO
-svgpreviewhandler
svgz
SWC
SWFO
@@ -2000,7 +1979,6 @@ SYSICONINDEX
SYSKEY
syskeydown
SYSKEYUP
-SYSLIB
syslog
SYSMENU
SYSTEMAPPS
@@ -2105,7 +2083,6 @@ uefi
UHash
UIA
uid
-Uid
uint
uintptr
UIPI
@@ -2333,7 +2310,6 @@ wpr
wprintf
wprp
wql
-WQL
wregex
WResize
writefile
diff --git a/installer/MSIX/PackagingLayout.xml b/installer/MSIX/PackagingLayout.xml
deleted file mode 100644
index 31d1d1128b..0000000000
--- a/installer/MSIX/PackagingLayout.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/installer/MSIX/appxmanifest.xml b/installer/MSIX/appxmanifest.xml
deleted file mode 100644
index fd1ea58156..0000000000
--- a/installer/MSIX/appxmanifest.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
- PowerToys
- Microsoft Corporation
- Windows system utilities to maximize productivity
- Images\logo.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- images\logo.png
- Powertoys custom protocol
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- .md
-
-
-
-
-
-
-
- .svg
-
-
-
-
-
-
-
- .pdf
-
-
-
-
-
-
-
- .gcode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Notifications.dll
-
-
-
-
-
diff --git a/installer/MSIX/build_msix.ps1 b/installer/MSIX/build_msix.ps1
deleted file mode 100644
index f494242400..0000000000
--- a/installer/MSIX/build_msix.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-param (
- [bool]$debug = 0
-)
-
-$PackagingLayoutFile = "PackagingLayout.xml"
-
-if ($debug) {
- (Get-Content $PackagingLayoutFile) `
- -replace 'x64\\Release\\', 'x64\Debug\' `
- | Out-File -Encoding utf8 "$env:temp\$PackagingLayoutFile"
- $PackagingLayoutFile = "$env:temp\$PackagingLayoutFile"
-}
-makeappx build /v /overwrite /f $PackagingLayoutFile /id "PowerToys-x64" /op bin\
diff --git a/installer/MSIX/build_msix_cdpx.cmd b/installer/MSIX/build_msix_cdpx.cmd
deleted file mode 100644
index d47353ae7f..0000000000
--- a/installer/MSIX/build_msix_cdpx.cmd
+++ /dev/null
@@ -1,14 +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.19041.0
-
-powershell -file update_appxmanifest_version.ps1 || exit /b 1
-
-call makeappx build /v /overwrite /f PackagingLayout.xml /id "PowerToys-x64" /op bin\ || exit /b 1
-
-setlocal EnableDelayedExpansion
-for /f "tokens=3delims=<>" %%i in ('findstr "" "..\Version.props"') do (
- set MSIXVERSION=%%i
-)
-setlocal DisableDelayedExpansion
-ren "bin\PowerToys-x64.msix" PowerToysSetup-%MSIXVERSION%-x64.msix
diff --git a/installer/MSIX/generate_self_sign_cert.ps1 b/installer/MSIX/generate_self_sign_cert.ps1
deleted file mode 100644
index 3b50d17ee2..0000000000
--- a/installer/MSIX/generate_self_sign_cert.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-$expirationDate = {Get-Date}.Invoke().AddYears(5)
-$pass = ConvertTo-SecureString -String "12345" -Force -AsPlainText
-$thumbprint = (New-SelfSignedCertificate -notafter $expirationDate -Type CodeSigningCert -Subject "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" -FriendlyName "PowerToys Test Certificate" -KeyDescription "PowerToys Test Certificate" -KeyFriendlyName "PowerToys Test Key" -KeyUsage "DigitalSignature" -CertStoreLocation Cert:\LocalMachine\My).Thumbprint
-Export-PfxCertificate -Cert cert:\LocalMachine\My\$thumbprint -FilePath PowerToys_TemporaryKey.pfx -Password $pass
-Import-PfxCertificate -CertStoreLocation Cert:\LocalMachine\Root -FilePath PowerToys_TemporaryKey.pfx -Password $pass
diff --git a/installer/MSIX/install_msix.ps1 b/installer/MSIX/install_msix.ps1
deleted file mode 100644
index 5a241c13cb..0000000000
--- a/installer/MSIX/install_msix.ps1
+++ /dev/null
@@ -1 +0,0 @@
-Add-AppxPackage .\bin\PowerToys.msixbundle
diff --git a/installer/MSIX/registry.dat b/installer/MSIX/registry.dat
deleted file mode 100644
index a84323121136c70c85157b967fefbd3d36b95dc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
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
Cj~_k&
diff --git a/installer/MSIX/reinstall_msix.ps1 b/installer/MSIX/reinstall_msix.ps1
deleted file mode 100644
index d836e85bd8..0000000000
--- a/installer/MSIX/reinstall_msix.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-.\uninstall_msix.ps1
-.\build_msix.ps1
-.\sign_msix.ps1
-.\install_msix.ps1
-
diff --git a/installer/MSIX/sign_msix.ps1 b/installer/MSIX/sign_msix.ps1
deleted file mode 100644
index 0d3081edcf..0000000000
--- a/installer/MSIX/sign_msix.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 76c05f399f..0000000000
--- a/installer/MSIX/uninstall_msix.ps1
+++ /dev/null
@@ -1 +0,0 @@
-Get-AppxPackage -Name '*PowerToys' | select -ExpandProperty "PackageFullName" | Remove-AppxPackage
diff --git a/installer/MSIX/update_appxmanifest_version.ps1 b/installer/MSIX/update_appxmanifest_version.ps1
deleted file mode 100644
index 59a0134790..0000000000
--- a/installer/MSIX/update_appxmanifest_version.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-$version = ([xml](Get-Content ..\Version.props)).Project.PropertyGroup.Version
-
-(Get-Content appxmanifest.xml) `
- -replace '(Name="[\.\w]+"\sVersion=")([\d\.]+)"', -join('${1}', $version, '.0"') `
- | Out-File -Encoding utf8 appxmanifest.xml
\ No newline at end of file
diff --git a/installer/MSIX/Images/logo.png b/installer/PowerToysSetup/Images/logo.png
similarity index 100%
rename from installer/MSIX/Images/logo.png
rename to installer/PowerToysSetup/Images/logo.png
diff --git a/installer/MSIX/Images/logo150.png b/installer/PowerToysSetup/Images/logo150.png
similarity index 100%
rename from installer/MSIX/Images/logo150.png
rename to installer/PowerToysSetup/Images/logo150.png
diff --git a/installer/MSIX/Images/logo44.png b/installer/PowerToysSetup/Images/logo44.png
similarity index 100%
rename from installer/MSIX/Images/logo44.png
rename to installer/PowerToysSetup/Images/logo44.png
diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
index ee7f7d7ec4..42d42f1763 100644
--- a/installer/PowerToysSetup/PowerToys.wxs
+++ b/installer/PowerToysSetup/PowerToys.wxs
@@ -44,7 +44,7 @@