diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index c833956afe..70dbe48f53 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -49,7 +49,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp index 57df075882..b15421c4f6 100644 --- a/installer/PowerToysSetupCustomActions/CustomAction.cpp +++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp @@ -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) diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index fed339372d..fa24baeaa5 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -1,6 +1,6 @@  - + @@ -145,7 +145,7 @@ - + @@ -156,8 +156,8 @@ - - + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj index f158d6b81d..2685cfb617 100644 --- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj +++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj @@ -63,7 +63,7 @@ - + diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index 34f5f326ac..20bd0100b5 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,6 +1,6 @@  - + @@ -186,7 +186,7 @@ - + @@ -199,8 +199,8 @@ - - + + diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config index 89e6eaa159..ec2d205c1c 100644 --- a/src/modules/powerrename/PowerRenameUILib/packages.config +++ b/src/modules/powerrename/PowerRenameUILib/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index aa4fec0fb1..0235b5cdb8 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -48,7 +48,7 @@ - +