Dev/yuyoyuppe/autoupdate polishing (#11693)

* [Updating] Create a dedicated executable project for updating procedures * [Updating] Use PowerToys.Update for update procedures (#11495) * [Updating] Use PowerToys.Update for update procedures * [Setup] Remove toast notifications and other dependencies from bootstrapper * [Installer] Remove Winstore, redundant strings * [Settings] Remove deprecated 'packaged' setting
2026-04-03 09:46:54 +02:00 · 2021-06-14 12:55:59 +03:00
parent 5b804a1ff6
commit cdd06d7e98
58 changed files with 914 additions and 1154 deletions
--- a/installer/PowerToysBootstrapper/PowerToysBootstrapper.sln
+++ b/installer/PowerToysBootstrapper/PowerToysBootstrapper.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30320.27
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updating", "..\..\src\common\updating\updating.vcxproj", "{17DA04DF-E393-4397-9CF0-84DABE11032E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bootstrapper", "bootstrapper\bootstrapper.vcxproj", "{D194E3AA-F824-4CA9-9A58-034DD6B7D022}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "..\..\src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
@@ -13,20 +11,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\..\src\common
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetttingsAPI", "..\..\src\common\SettingsAPI\SetttingsAPI.vcxproj", "{6955446D-23F7-4023-9BB3-8657F904AF99}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notifications", "..\..\src\common\notifications\notifications.vcxproj", "{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStore", "..\..\src\common\WinStore\Winstore.vcxproj", "{C502A854-53AC-4EBB-8DC0-E4AF2191E4F6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x64.ActiveCfg = Debug|x64
-		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x64.Build.0 = Debug|x64
-		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x64.ActiveCfg = Release|x64
-		{17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x64.Build.0 = Release|x64
 		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Debug|x64.ActiveCfg = Debug|x64
 		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Debug|x64.Build.0 = Debug|x64
 		{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Release|x64.ActiveCfg = Release|x64
@@ -43,14 +33,6 @@ Global
 		{6955446D-23F7-4023-9BB3-8657F904AF99}.Debug|x64.Build.0 = Debug|x64
 		{6955446D-23F7-4023-9BB3-8657F904AF99}.Release|x64.ActiveCfg = Release|x64
 		{6955446D-23F7-4023-9BB3-8657F904AF99}.Release|x64.Build.0 = Release|x64
-		{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}.Debug|x64.ActiveCfg = Debug|x64
-		{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}.Debug|x64.Build.0 = Debug|x64
-		{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}.Release|x64.ActiveCfg = Release|x64
-		{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}.Release|x64.Build.0 = Release|x64
-		{C502A854-53AC-4EBB-8DC0-E4AF2191E4F6}.Debug|x64.ActiveCfg = Debug|x64
-		{C502A854-53AC-4EBB-8DC0-E4AF2191E4F6}.Debug|x64.Build.0 = Debug|x64
-		{C502A854-53AC-4EBB-8DC0-E4AF2191E4F6}.Release|x64.ActiveCfg = Release|x64
-		{C502A854-53AC-4EBB-8DC0-E4AF2191E4F6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/installer/PowerToysBootstrapper/bootstrapper/DotnetInstallation.cpp
+++ b/installer/PowerToysBootstrapper/bootstrapper/DotnetInstallation.cpp
@@ -0,0 +1,90 @@
+#include "pch.h"
+
+#include "DotnetInstallation.h"
+
+#include <common/utils/exec.h>
+#include <common/utils/HttpClient.h>
+#include <common/utils/winapi_error.h>
+namespace fs = std::filesystem;
+
+namespace updating
+{
+    constexpr size_t REQUIRED_MINIMAL_PATCH = 15;
+
+    bool dotnet_is_installed()
+    {
+        auto runtimes = exec_and_read_output(LR"(dotnet --list-runtimes)");
+        if (!runtimes)
+        {
+            return false;
+        }
+        std::regex dotnet3_1_x{ R"(Microsoft\.WindowsDesktop\.App\s3\.1\.(\d+))" };
+
+        size_t latestPatchInstalled = 0;
+        using rexit = std::sregex_iterator;
+        for (auto it = rexit{ begin(*runtimes), end(*runtimes), dotnet3_1_x }; it != rexit{}; ++it)
+        {
+            if (!it->ready() || it->size() < 2)
+            {
+                continue;
+            }
+            auto patchNumberGroup = (*it)[1];
+            if (!patchNumberGroup.matched)
+            {
+                continue;
+            }
+            const auto patchString = patchNumberGroup.str();
+            size_t patch = 0;
+            if (auto [_, ec] = std::from_chars(&*begin(patchString), &*end(patchString), patch); ec == std::errc())
+            {
+                latestPatchInstalled = std::max(patch, latestPatchInstalled);
+            }
+        }
+        return latestPatchInstalled >= REQUIRED_MINIMAL_PATCH;
+    }
+
+    std::optional<fs::path> download_dotnet()
+    {
+        const wchar_t DOTNET_DESKTOP_DOWNLOAD_LINK[] = L"https://download.visualstudio.microsoft.com/download/pr/d30352fe-d4f3-4203-91b9-01a3b66a802e/bb416e6573fa278fec92113abefc58b3/windowsdesktop-runtime-3.1.15-win-x64.exe";
+        const wchar_t DOTNET_DESKTOP_FILENAME[] = L"windowsdesktop-runtime.exe";
+
+        auto dotnet_download_path = fs::temp_directory_path() / DOTNET_DESKTOP_FILENAME;
+        winrt::Windows::Foundation::Uri download_link{ DOTNET_DESKTOP_DOWNLOAD_LINK };
+
+        const size_t max_attempts = 3;
+        bool download_success = false;
+        for (size_t i = 0; i < max_attempts; ++i)
+        {
+            try
+            {
+                http::HttpClient client;
+                client.download(download_link, dotnet_download_path).wait();
+                download_success = true;
+                break;
+            }
+            catch (...)
+            {
+                // couldn't download
+            }
+        }
+        return download_success ? std::make_optional(dotnet_download_path) : std::nullopt;
+    }
+
+    bool install_dotnet(fs::path dotnet_download_path, const bool silent = false)
+    {
+        SHELLEXECUTEINFOW sei{ sizeof(sei) };
+        sei.fMask = { SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE };
+        sei.lpFile = dotnet_download_path.c_str();
+        sei.nShow = SW_SHOWNORMAL;
+        std::wstring dotnet_flags = L"/install ";
+        dotnet_flags += silent ? L"/quiet" : L"/passive";
+        sei.lpParameters = dotnet_flags.c_str();
+        if (ShellExecuteExW(&sei) != TRUE)
+        {
+            return false;
+        }
+        WaitForSingleObject(sei.hProcess, INFINITE);
+        CloseHandle(sei.hProcess);
+        return true;
+    }
+}
--- a/installer/PowerToysBootstrapper/bootstrapper/DotnetInstallation.h
+++ b/installer/PowerToysBootstrapper/bootstrapper/DotnetInstallation.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <filesystem>
+#include <optional>
+
+namespace fs = std::filesystem;
+namespace updating
+{
+    bool dotnet_is_installed();
+    std::optional<fs::path> download_dotnet();
+    bool install_dotnet(fs::path dotnet_download_path, const bool silent);
+}
--- a/installer/PowerToysBootstrapper/bootstrapper/Resources.resx
+++ b/installer/PowerToysBootstrapper/bootstrapper/Resources.resx
@@ -67,30 +67,9 @@
  <data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
    <value>PowerToys installation error</value>
  </data>
-  <data name="GITHUB_NEW_VERSION_AVAILABLE" xml:space="preserve">
-    <value>An update to PowerToys is available.</value>
-  </data>
-  <data name="GITHUB_NEW_VERSION_UPDATE_NOW" xml:space="preserve">
-    <value>Update now</value>
-  </data>
-  <data name="UNINSTALLATION_UNKNOWN_ERROR" xml:space="preserve">
-    <value>Error: please uninstall the previous version of PowerToys manually.</value>
-  </data>
  <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
    <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
  </data>
-  <data name="GITHUB_NEW_VERSION_MORE_INFO" xml:space="preserve">
-    <value>More info...</value>
-  </data>
-  <data name="TOAST_TITLE" xml:space="preserve">
-    <value>PowerToys Update</value>
-  </data>
-  <data name="OFFER_UNINSTALL_MSI" xml:space="preserve">
-    <value>We've detected a previous installation of PowerToys. Would you like to remove it?</value>
-  </data>
-  <data name="OFFER_UNINSTALL_MSI_TITLE" xml:space="preserve">
-    <value>PowerToys: uninstall previous version?</value>
-  </data>
  <data name="INSTALLER_EXTRACT_ERROR" xml:space="preserve">
    <value>Couldn't extract MSI installer.</value>
  </data>
--- a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
+++ b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
@@ -2,23 +2,21 @@
 #include "Generated Files/resource.h"

 #include "RcResource.h"
-#include <common/updating/dotnet_installation.h>
-#include <common/updating/installer.h>
-#include <common/updating/notifications.h>
+#include <common/version/helper.h>
 #include <common/version/version.h>
 #include <common/utils/appMutex.h>
 #include <common/utils/elevation.h>
+#include <common/utils/MsiUtils.h>
+#include <common/utils/os-detect.h>
 #include <common/utils/processApi.h>
 #include <common/utils/resources.h>
 #include <common/utils/window.h>
 #include <common/utils/winapi_error.h>
 #include <common/SettingsAPI/settings_helpers.h>

-#include <runner/action_runner_utils.h>
-
+#include "DotnetInstallation.h"
 #include "progressbar_window.h"

-auto Strings = create_notifications_strings();
 static bool g_Silent = false;

 #define STR_HELPER(x) #x
@@ -95,7 +93,7 @@ void CleanupSettingsFromOlderVersions()
            spdlog::info("Old log settings file wasn't found");
        }
    }
-    catch(...)
+    catch (...)
    {
        spdlog::error("Failed to cleanup old log settings");
    }
@@ -106,9 +104,9 @@ void ShowMessageBoxError(const wchar_t* message)
    if (!g_Silent)
    {
        MessageBoxW(nullptr,
-            message,
-            GET_RESOURCE_STRING(IDS_BOOTSTRAPPER_PROGRESS_TITLE).c_str(),
-            MB_OK | MB_ICONERROR);
+                    message,
+                    GET_RESOURCE_STRING(IDS_BOOTSTRAPPER_PROGRESS_TITLE).c_str(),
+                    MB_OK | MB_ICONERROR);
    }
 }

@@ -117,6 +115,46 @@ void ShowMessageBoxError(const UINT messageId)
    ShowMessageBoxError(GET_RESOURCE_STRING(messageId).c_str());
 }

+bool uninstall_msi_version(const std::wstring& package_path)
+{
+    const auto uninstall_result = MsiInstallProductW(package_path.c_str(), L"REMOVE=ALL");
+    return ERROR_SUCCESS == uninstall_result;
+}
+
+std::optional<VersionHelper> get_installed_powertoys_version()
+{
+    auto installed_path = GetMsiPackageInstalledPath();
+    if (!installed_path)
+    {
+        return std::nullopt;
+    }
+    *installed_path += L"\\PowerToys.exe";
+
+    // Get the version information for the file requested
+    const DWORD fvSize = GetFileVersionInfoSizeW(installed_path->c_str(), nullptr);
+    if (!fvSize)
+    {
+        return std::nullopt;
+    }
+
+    auto pbVersionInfo = std::make_unique<BYTE[]>(fvSize);
+
+    if (!GetFileVersionInfoW(installed_path->c_str(), 0, fvSize, pbVersionInfo.get()))
+    {
+        return std::nullopt;
+    }
+
+    VS_FIXEDFILEINFO* fileInfo = nullptr;
+    UINT fileInfoLen = 0;
+    if (!VerQueryValueW(pbVersionInfo.get(), L"\\", reinterpret_cast<LPVOID*>(&fileInfo), &fileInfoLen))
+    {
+        return std::nullopt;
+    }
+    return VersionHelper{ (fileInfo->dwFileVersionMS >> 16) & 0xffff,
+                          (fileInfo->dwFileVersionMS >> 0) & 0xffff,
+                          (fileInfo->dwFileVersionLS >> 16) & 0xffff };
+}
+
 int Bootstrapper(HINSTANCE hInstance)
 {
    winrt::init_apartment();
@@ -133,17 +171,17 @@ int Bootstrapper(HINSTANCE hInstance)
    cxxopts::Options options{ "PowerToysBootstrapper" };

    // clang-format off
-    options.add_options()
-        ("h,help", "Show help")
-        ("no_full_ui", "Use reduced UI for MSI")
-        ("s,silent", "Suppress all UI, notifications and does not start PowerToys")
-        ("no_start_pt", "Do not launch PowerToys after the installation is complete")
-        ("start_pt", "Always launch PowerToys after the installation is complete")
-        ("skip_dotnet_install", "Skip dotnet 3.X installation even if it's not detected")
-        ("log_level", "Log level. Possible values: off|debug|error", cxxopts::value<std::string>()->default_value("off"))
-        ("log_dir", "Log directory", cxxopts::value<std::string>()->default_value("."))
-        ("install_dir", "Installation directory", cxxopts::value<std::string>()->default_value(defaultInstallDir))
-        ("extract_msi", "Extract MSI to the working directory and exit. Use only if you must access MSI directly.");
+  options.add_options()
+    ("h,help", "Show help")
+    ("no_full_ui", "Use reduced UI for MSI")
+    ("s,silent", "Suppress all UI, notifications and does not start PowerToys")
+    ("no_start_pt", "Do not launch PowerToys after the installation is complete")
+    ("start_pt", "Always launch PowerToys after the installation is complete")
+    ("skip_dotnet_install", "Skip dotnet 3.X installation even if it's not detected")
+    ("log_level", "Log level. Possible values: off|debug|error", cxxopts::value<std::string>()->default_value("off"))
+    ("log_dir", "Log directory", cxxopts::value<std::string>()->default_value("."))
+    ("install_dir", "Installation directory", cxxopts::value<std::string>()->default_value(defaultInstallDir))
+    ("extract_msi", "Extract MSI to the working directory and exit. Use only if you must access MSI directly.");
    // clang-format on

    cxxopts::ParseResult cmdArgs;
@@ -234,15 +272,15 @@ int Bootstrapper(HINSTANCE hInstance)
    const VersionHelper myVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION);

    // Do not support installing on Windows < 1903
-    if (updating::is_1809_or_older())
+    if (!Is19H1OrHigher())
    {
-      ShowMessageBoxError(IDS_OLD_WINDOWS_ERROR);
-      spdlog::error("PowerToys {} requires at least Windows 1903 to run.", myVersion.toString());
-      return 1;
+        ShowMessageBoxError(IDS_OLD_WINDOWS_ERROR);
+        spdlog::error("PowerToys {} requires at least Windows 1903 to run.", myVersion.toString());
+        return 1;
    }

    // Check if there's a newer version installed
-    const auto installedVersion = updating::get_installed_powertoys_version();
+    const auto installedVersion = get_installed_powertoys_version();
    if (installedVersion && *installedVersion >= myVersion)
    {
        spdlog::error(L"Detected a newer version {} vs {}", (*installedVersion).toWstring(), myVersion.toWstring());
@@ -341,7 +379,7 @@ int Bootstrapper(HINSTANCE hInstance)
    });

    spdlog::debug("Acquiring existing MSI package path if exists");
-    const auto package_path = updating::get_msi_package_path();
+    const auto package_path = GetMsiPackagePath();
    if (!package_path.empty())
    {
        spdlog::debug(L"Existing MSI package path found: {}", package_path);
@@ -351,7 +389,7 @@ int Bootstrapper(HINSTANCE hInstance)
        spdlog::debug("Existing MSI package path not found");
    }

-    if (!package_path.empty() && !updating::uninstall_msi_version(package_path, Strings))
+    if (!package_path.empty() && !uninstall_msi_version(package_path))
    {
        spdlog::error("Couldn't install the existing MSI package ({})", GetLastError());
        ShowMessageBoxError(IDS_UNINSTALL_PREVIOUS_VERSION_ERROR);
@@ -401,7 +439,7 @@ int Bootstrapper(HINSTANCE hInstance)
        spdlog::error("Unknown exception during dotnet installation");
        ShowMessageBoxError(IDS_DOTNET_INSTALL_ERROR);
    }
-    
+
    // At this point, there's no reason to show progress bar window, since MSI installers have their own
    CloseProgressBarDialog();

@@ -419,7 +457,7 @@ int Bootstrapper(HINSTANCE hInstance)
    if ((!noStartPT && !g_Silent) || startPT)
    {
        spdlog::debug("Starting the newly installed PowerToys.exe");
-        auto newPTPath = updating::get_msi_package_installed_path();
+        auto newPTPath = GetMsiPackageInstalledPath();
        if (!newPTPath)
        {
            spdlog::error("Couldn't determine new MSI package install location ({})", GetLastError());
@@ -448,7 +486,7 @@ int WINAPI WinMain(HINSTANCE hi, HINSTANCE, LPSTR, int)
        std::string messageA{ "Unhandled std exception encountered\n" };
        messageA.append(ex.what());

-            spdlog::error(messageA.c_str());
+        spdlog::error(messageA.c_str());

        std::wstring messageW{};
        std::copy(messageA.begin(), messageA.end(), messageW.begin());
--- a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
+++ b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
@@ -24,7 +24,9 @@
    <VCProjectVersion>16.0</VCProjectVersion>
    <ProjectGuid>{D194E3AA-F824-4CA9-9A58-034DD6B7D022}</ProjectGuid>
    <RootNamespace>bootstrapper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <OverrideWindowsTargetPlatformVersion>true</OverrideWindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
    <ProjectName>bootstrapper</ProjectName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -71,7 +73,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
@@ -88,12 +90,12 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;Comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -106,11 +108,12 @@
    <Link>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;Comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="bootstrapper.cpp" />
+    <ClCompile Include="DotnetInstallation.cpp" />
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
@@ -119,6 +122,7 @@
    <ClCompile Include="RcResource.cpp" />
  </ItemGroup>
  <ItemGroup>
+    <ClInclude Include="DotnetInstallation.h" />
    <ClInclude Include="pch.h" />
    <ClInclude Include="progressbar_window.h" />
  </ItemGroup>
@@ -133,8 +137,11 @@
    <Image Include="..\runner\svgs\icon.ico" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\common\updating\updating.vcxproj">
-      <Project>{17da04df-e393-4397-9cf0-84dabe11032e}</Project>
+    <ProjectReference Include="..\..\..\src\common\SettingsAPI\SetttingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\common\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
    </ProjectReference>
    <ProjectReference Include="..\..\..\src\logging\logging.vcxproj">
      <Project>{7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f}</Project>
--- a/installer/PowerToysBootstrapper/bootstrapper/pch.h
+++ b/installer/PowerToysBootstrapper/bootstrapper/pch.h
@@ -6,6 +6,7 @@
 #include <shellapi.h>
 #include <commctrl.h>

+#include <charconv>
 #include <string_view>
 #include <optional>
 #include <fstream>
@@ -22,8 +23,10 @@
 #include <spdlog/sinks/null_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>

+#pragma warning(push, 0)
 #include <winrt/base.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
+#pragma warning(pop)

 #include <cxxopts.hpp>
--- a/installer/PowerToysBootstrapper/bootstrapper/progressbar_window.cpp
+++ b/installer/PowerToysBootstrapper/bootstrapper/progressbar_window.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"

-#include <common/updating/notifications.h>
 #include <common/utils/window.h>

 #include "progressbar_window.h"
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -359,6 +359,9 @@
      <Component Id="PowerToys_ActionRunner_exe" Guid="626ABB17-16F0-4007-9A58-6998724A5E14" Win64="yes">
        <File Id="PowerToys.ActionRunner.exe" KeyPath="yes" Checksum="yes" />
      </Component>
+      <Component Id="PowerToys_Update_exe" Guid="446D0AD4-AA8F-45BA-BDAC-6C620DF77AFF" Win64="yes">
+        <File Id="PowerToys.Update.exe" KeyPath="yes" Checksum="yes" />
+      </Component>      
      <Component Id="License_rtf" Guid="3E5AE43B-CFB4-449B-A346-94CAAFF3312E" Win64="yes">
        <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" KeyPath="yes" />
      </Component>
@@ -869,6 +872,7 @@
      <ComponentRef Id="PowerToysStartMenuShortcut"/>
      <ComponentRef Id="BackgroundActivator_dll" />
      <ComponentRef Id="PowerToys_ActionRunner_exe" />
+      <ComponentRef Id="PowerToys_Update_exe" />
      <ComponentRef Id="powertoys_toast_clsid" />
      <ComponentRef Id="License_rtf" />
      <ComponentRef Id="Notice_md" />
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -2,6 +2,7 @@

 #include <ProjectTelemetry.h>

+#include "../../src/common/utils/MsiUtils.h"
 #include "../../src/common/updating/installer.h"
 #include "../../src/common/version/version.h"

@@ -582,7 +583,7 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)

    try
    {
-        if (auto install_path = updating::get_msi_package_installed_path())
+        if (auto install_path = GetMsiPackageInstalledPath())
        {
            MsiSetPropertyW(hInstall, L"INSTALLFOLDER", install_path->data());
        }
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
@@ -56,7 +56,7 @@
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(WIX)sdk\$(WixPlatformToolset)\lib\x64;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\vs2017\lib\x64;..\..\$(PlatformShortName)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;ApplicationUpdate.lib;Notifications.lib;winstore.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;ApplicationUpdate.lib;Notifications.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">