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

[Installer]Create DSC module in right path for user installs (#33782)

Browse Source
This commit is contained in:
Jaime Bernardo
2024-07-11 13:49:52 +01:00
committed by GitHub
parent 7b37eba0f9
commit 57b06fa431
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer/PowerToysSetupCustomActions/CustomAction.cpp
View File

@@ -357,7 +357,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
ExitOnFailure(hr, "Unable to determine Powershell modules path"); ExitOnFailure(hr, "Unable to determine Powershell modules path");
} }
const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / get_product_version(); const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / get_product_version(false);
std::error_code errorCode; std::error_code errorCode;
fs::create_directories(modulesPath, errorCode); fs::create_directories(modulesPath, errorCode);
@@ -411,7 +411,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
} }
const auto powerToysModulePath = baseModulesPath / L"Microsoft.PowerToys.Configure"; const auto powerToysModulePath = baseModulesPath / L"Microsoft.PowerToys.Configure";
const auto versionedModulePath = powerToysModulePath / get_product_version(); const auto versionedModulePath = powerToysModulePath / get_product_version(false);
std::error_code errorCode; std::error_code errorCode;

8
src/common/version/version.h
View File

@@ -27,18 +27,18 @@ enum class version_architecture
version_architecture get_current_architecture(); version_architecture get_current_architecture();
const wchar_t* get_architecture_string(const version_architecture); const wchar_t* get_architecture_string(const version_architecture);
inline std::wstring get_product_version() inline std::wstring get_product_version(bool includeV = true)
{ {
static std::wstring version = L"v" + std::to_wstring(VERSION_MAJOR) + static std::wstring version = (includeV ? L"v" : L"") + std::to_wstring(VERSION_MAJOR) +
L"." + std::to_wstring(VERSION_MINOR) + L"." + std::to_wstring(VERSION_MINOR) +
L"." + std::to_wstring(VERSION_REVISION); L"." + std::to_wstring(VERSION_REVISION);
return version; return version;
} }
inline std::wstring get_std_product_version() inline std::wstring get_std_product_version(bool includeV = true)
{ {
static std::wstring version = L"v" + std::to_wstring(VERSION_MAJOR) + static std::wstring version = (includeV ? L"v" : L"") + std::to_wstring(VERSION_MAJOR) +
L"." + std::to_wstring(VERSION_MINOR) + L"." + std::to_wstring(VERSION_MINOR) +
L"." + std::to_wstring(VERSION_REVISION) + L".0"; L"." + std::to_wstring(VERSION_REVISION) + L".0";