diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp index e9c412e71f..968fcc2530 100644 --- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp +++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp @@ -1352,47 +1352,6 @@ UINT __stdcall InstallCmdPalPackageCA(MSIHANDLE hInstall) return WcaFinalize(er); } -UINT __stdcall InstallCmdPalExtPowerToysPackageCA(MSIHANDLE hInstall) -{ - using namespace winrt::Windows::Foundation; - using namespace winrt::Windows::Management::Deployment; - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder; - - hr = WcaInitialize(hInstall, "InstallCmdPalExtPowerToysPackage"); - hr = getInstallFolder(hInstall, installationFolder); - - try - { - auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPalExtensions\\Microsoft.CmdPal.Ext.PowerToys\\", false); - auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPalExtensions\\Microsoft.CmdPal.Ext.PowerToys\\Dependencies\\", true); - - if (!msix.empty()) - { - auto msixPath = msix[0]; - - if (!package::RegisterPackage(msixPath, dependencies)) - { - Logger::error(L"Failed to install CmdPal PowerToys extension package"); - er = ERROR_INSTALL_FAILURE; - } - } - } - catch (std::exception &e) - { - std::string errorMessage{"Exception thrown while trying to install CmdPal PowerToys extension package: "}; - errorMessage += e.what(); - Logger::error(errorMessage); - - er = ERROR_INSTALL_FAILURE; - } - - er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er; - return WcaFinalize(er); -} - UINT __stdcall UnRegisterCmdPalPackageCA(MSIHANDLE hInstall) { using namespace winrt::Windows::Foundation; @@ -1427,39 +1386,6 @@ UINT __stdcall UnRegisterCmdPalPackageCA(MSIHANDLE hInstall) return WcaFinalize(er); } -UINT __stdcall UnRegisterCmdPalExtPowerToysPackageCA(MSIHANDLE hInstall) -{ - using namespace winrt::Windows::Foundation; - using namespace winrt::Windows::Management::Deployment; - - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, "UnRegisterCmdPalExtPowerToysPackage"); - - try - { - std::wstring packageToRemoveDisplayName{L"Microsoft.CmdPal.Ext.PowerToys"}; - - if (!package::UnRegisterPackage(packageToRemoveDisplayName)) - { - Logger::error(L"Failed to unregister package: " + packageToRemoveDisplayName); - er = ERROR_INSTALL_FAILURE; - } - } - catch (std::exception &e) - { - std::string errorMessage{"Exception thrown while trying to unregister the CmdPal PowerToys extension package: "}; - errorMessage += e.what(); - Logger::error(errorMessage); - - er = ERROR_INSTALL_FAILURE; - } - - er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er; - return WcaFinalize(er); -} - UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall) { diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def index 9e7330c5b2..4bad107f16 100644 --- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def +++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def @@ -19,10 +19,8 @@ EXPORTS InstallEmbeddedMSIXCA InstallDSCModuleCA InstallCmdPalPackageCA - InstallCmdPalExtPowerToysPackageCA UnApplyModulesRegistryChangeSetsCA UnRegisterCmdPalPackageCA - UnRegisterCmdPalExtPowerToysPackageCA UnRegisterContextMenuPackagesCA UninstallEmbeddedMSIXCA UninstallDSCModuleCA diff --git a/installer/PowerToysSetupVNext/CmdPalExtPowerToys.wxs b/installer/PowerToysSetupVNext/CmdPalExtPowerToys.wxs deleted file mode 100644 index a2196b5053..0000000000 --- a/installer/PowerToysSetupVNext/CmdPalExtPowerToys.wxs +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj index 00da2207ce..6cc45163e6 100644 --- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj +++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj @@ -114,7 +114,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil - diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs index a8ba62b647..3e812beb2e 100644 --- a/installer/PowerToysSetupVNext/Product.wxs +++ b/installer/PowerToysSetupVNext/Product.wxs @@ -69,7 +69,6 @@ - @@ -110,7 +109,6 @@ - @@ -126,7 +124,6 @@ - @@ -146,7 +143,6 @@ - @@ -170,7 +166,6 @@ - @@ -260,12 +255,10 @@ - -