Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Deps]Update winappsdk to 1.1.5 (#20898)

Browse Source 
* [Deps]Update WinAppSDK to 1.1.5

* Use hardlinks for winappsdk on MeasureTool
This commit is contained in:
Jaime Bernardo
2022-09-28 11:26:24 +01:00
committed by GitHub
parent 4e20ae07ca
commit b9e8b807fd
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installer/PowerToysSetupCustomActions/CustomAction.cpp
View File

@@ -1049,7 +1049,7 @@ UINT __stdcall CreateWinAppSDKHardlinksCA(MSIHANDLE hInstall)
{
HRESULT hr = S_OK;
UINT er = ERROR_SUCCESS;
std::wstring installationFolder, winAppSDKFilesSrcDir, settingsDir, powerRenameDir;
std::wstring installationFolder, winAppSDKFilesSrcDir, settingsDir, powerRenameDir, measureToolDir;
hr = WcaInitialize(hInstall, "CreateWinAppSDKHardlinksCA");
ExitOnFailure(hr, "Failed to initialize");
@@ -1060,12 +1060,14 @@ UINT __stdcall CreateWinAppSDKHardlinksCA(MSIHANDLE hInstall)
winAppSDKFilesSrcDir = installationFolder + L"dll\\WinAppSDK\\";
settingsDir = installationFolder + L"Settings\\";
powerRenameDir = installationFolder + L"modules\\PowerRename\\";
measureToolDir = installationFolder + L"modules\\MeasureTool\\";
for (auto file : winAppSdkFiles)
{
std::error_code ec;
std::filesystem::create_hard_link((winAppSDKFilesSrcDir + file).c_str(), (settingsDir + file).c_str(), ec);
std::filesystem::create_hard_link((winAppSDKFilesSrcDir + file).c_str(), (powerRenameDir + file).c_str(), ec);
std::filesystem::create_hard_link((winAppSDKFilesSrcDir + file).c_str(), (measureToolDir + file).c_str(), ec);
if (ec.value() != S_OK)
{
@@ -1136,7 +1138,7 @@ UINT __stdcall DeleteWinAppSDKHardlinksCA(MSIHANDLE hInstall)
{
HRESULT hr = S_OK;
UINT er = ERROR_SUCCESS;
std::wstring installationFolder, settingsDir, powerRenameDir;
std::wstring installationFolder, settingsDir, powerRenameDir, measureToolDir;
hr = WcaInitialize(hInstall, "DeleteWinAppSDKHardlinksCA");
ExitOnFailure(hr, "Failed to initialize");
@@ -1146,6 +1148,7 @@ UINT __stdcall DeleteWinAppSDKHardlinksCA(MSIHANDLE hInstall)
settingsDir = installationFolder + L"Settings\\";
powerRenameDir = installationFolder + L"modules\\PowerRename\\";
measureToolDir = installationFolder + L"modules\\MeasureTool\\";
try
{
@@ -1153,6 +1156,7 @@ UINT __stdcall DeleteWinAppSDKHardlinksCA(MSIHANDLE hInstall)
{
DeleteFile((settingsDir + file).c_str());
DeleteFile((powerRenameDir + file).c_str());
DeleteFile((measureToolDir + file).c_str());
}
}
catch (std::exception e)