[Installer]Create DSC module in right path for user installs

microsoft · Jul 11, 2024 · f7aae0e · f7aae0e
1 parent 7b37eba
commit f7aae0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -357,7 +357,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
             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;
         fs::create_directories(modulesPath, errorCode);
@@ -411,7 +411,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
         }
 
         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;
 

diff --git a/src/common/version/version.h b/src/common/version/version.h
@@ -27,18 +27,18 @@ enum class version_architecture
 version_architecture get_current_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_REVISION);
 
     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_REVISION) + L".0";