winget-cli

commit c1711c132ecab2b43eaba88d32917f6681072978
parent ae36a461206d003eb34aadf1654f80713473268f
Author: KEINOS <github+fork-qiita-news@keinos.com>
Date:   Tue, 24 Jun 2025 22:28:13 +0000

Merge remote-tracking branch 'upstream/master'

Diffstat:
M
src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
 | 
5
+++++
M
src/AppInstallerCLICore/Commands/DscCommandBase.cpp
 | 
2
+-
M
src/AppInstallerCLICore/Commands/DscCommandBase.h
 | 
2
+-

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
@@ -279,6 +279,11 @@
       <SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(UseProdCLSIDs)' == 'true'">
+    <ClCompile>
+      <PreprocessorDefinitions>USE_PROD_CLSIDS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(WingetDisableTestHooks)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions>AICLI_DISABLE_TEST_HOOKS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/src/AppInstallerCLICore/Commands/DscCommandBase.cpp b/src/AppInstallerCLICore/Commands/DscCommandBase.cpp
@@ -113,7 +113,7 @@ namespace AppInstaller::CLI
 
             Json::Value result{ Json::ValueType::objectValue };
 
-#ifndef AICLI_DISABLE_TEST_HOOKS
+#ifndef USE_PROD_CLSIDS
             result["executable"] = "wingetdev";
 #else
             result["executable"] = "winget";
diff --git a/src/AppInstallerCLICore/Commands/DscCommandBase.h b/src/AppInstallerCLICore/Commands/DscCommandBase.h
@@ -5,7 +5,7 @@
 #include <json/json.h>
 #include <optional>
 
-#ifndef AICLI_DISABLE_TEST_HOOKS
+#ifndef USE_PROD_CLSIDS
 #define WINGET_DSCV3_MODULE_NAME "Microsoft.WinGet.Dev"
 #define WINGET_DSCV3_MODULE_NAME_WIDE L"Microsoft.WinGet.Dev"
 #else