Skip to content

Commit 26e5eca

Browse files
authored
Move to proper signal for dev/not-dev (microsoft#5552)
## Change Use `UseProdCLSIDs` rather than `WingetDisableTestHooks` to drive the dev/not-dev decision in DSC v3 resources. This only matters to the internal local builds; everywhere else they are the same value.
1 parent 94b4348 commit 26e5eca

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/AppInstallerCLICore/AppInstallerCLICore.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,11 @@
279279
<SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">Windows</SubSystem>
280280
</Link>
281281
</ItemDefinitionGroup>
282+
<ItemDefinitionGroup Condition="'$(UseProdCLSIDs)' == 'true'">
283+
<ClCompile>
284+
<PreprocessorDefinitions>USE_PROD_CLSIDS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
285+
</ClCompile>
286+
</ItemDefinitionGroup>
282287
<ItemDefinitionGroup Condition="'$(WingetDisableTestHooks)'=='true'">
283288
<ClCompile>
284289
<PreprocessorDefinitions>AICLI_DISABLE_TEST_HOOKS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/AppInstallerCLICore/Commands/DscCommandBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ namespace AppInstaller::CLI
113113

114114
Json::Value result{ Json::ValueType::objectValue };
115115

116-
#ifndef AICLI_DISABLE_TEST_HOOKS
116+
#ifndef USE_PROD_CLSIDS
117117
result["executable"] = "wingetdev";
118118
#else
119119
result["executable"] = "winget";

src/AppInstallerCLICore/Commands/DscCommandBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <json/json.h>
66
#include <optional>
77

8-
#ifndef AICLI_DISABLE_TEST_HOOKS
8+
#ifndef USE_PROD_CLSIDS
99
#define WINGET_DSCV3_MODULE_NAME "Microsoft.WinGet.Dev"
1010
#define WINGET_DSCV3_MODULE_NAME_WIDE L"Microsoft.WinGet.Dev"
1111
#else

0 commit comments

Comments
 (0)