Skip to content

Commit 62b6699

Browse files
committed
More changes
1 parent 4721404 commit 62b6699

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

src/AppInstallerCLICore/Commands/DscUserSettingsFileResource.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,6 @@ namespace AppInstaller::CLI
3232
Input(json, ignoreFieldRequirements),
3333
_userSettingsPath(UserSettings::SettingsFilePath())
3434
{
35-
const auto& action = Input.Action();
36-
if (action.has_value())
37-
{
38-
if (Utility::CaseInsensitiveEquals(action.value(), ACTION_FULL))
39-
{
40-
Output.Action(ACTION_FULL);
41-
}
42-
else
43-
{
44-
Output.Action(ACTION_PARTIAL);
45-
}
46-
}
4735
}
4836

4937
const UserSettingsFileResourceObject Input;
@@ -78,10 +66,12 @@ namespace AppInstaller::CLI
7866
{
7967
if(Input.Action().has_value() && Utility::CaseInsensitiveEquals(Input.Action().value(), ACTION_FULL))
8068
{
69+
Output.Action(ACTION_FULL);
8170
_resolvedInputUserSettings = Input.Settings();
8271
}
8372
else
8473
{
74+
Output.Action(ACTION_PARTIAL);
8575
_resolvedInputUserSettings = MergeUserSettingsFiles(*Input.Settings());
8676
}
8777
}

0 commit comments

Comments
 (0)