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 a843231211..0000000000 Binary files a/installer/MSIX/registry.dat and /dev/null differ diff --git a/installer/MSIX/registry.reg b/installer/MSIX/registry.reg deleted file mode 100644 index 8899b202da..0000000000 Binary files a/installer/MSIX/registry.reg and /dev/null differ 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 @@