Case in

Author: AmelBawa-msft

src/AppInstallerCLICore/Commands/DscUserSettingsFileResource.cpp

@@ -4,6 +4,7 @@
 #include "DscUserSettingsFileResource.h"
 #include "DscComposableObject.h"
 #include "Resources.h"
+#include "AppInstallerStrings.h"
 
 using namespace AppInstaller::Utility::literals;
 using namespace AppInstaller::Settings;
@@ -31,14 +32,18 @@ namespace AppInstaller::CLI
                 Input(json, ignoreFieldRequirements),
                 _userSettingsPath(UserSettings::SettingsFilePath())
             {
+                const auto& action = Input.Action();
+                if (action.has_value() && (Utility::CaseInsensitiveEquals(action.value(), ACTION_FULL) || Utility::CaseInsensitiveEquals(action.value(), ACTION_PARTIAL)))
+                {
+                    Output.Action(Input.Action());
+                }
             }
 
             const UserSettingsFileResourceObject Input;
             UserSettingsFileResourceObject Output;
 
             void Get()
             {
-                Output.Action(ACTION_PARTIAL);
                 Output.Settings(GetUserSettings());
             }
 
@@ -64,7 +69,7 @@ namespace AppInstaller::CLI
                 THROW_HR_IF(E_UNEXPECTED, !Input.Settings().has_value());
                 if (!_resolvedInputUserSettings)
                 {
-                    if(Input.Action() == ACTION_FULL)
+                    if(Input.Action().has_value() && Utility::CaseInsensitiveEquals(Input.Action().value(), ACTION_FULL))
                     {
                         _resolvedInputUserSettings = Input.Settings();
                     }

src/AppInstallerCLIE2ETests/DSCv3UserSettingsFileResourceCommand.cs

@@ -70,7 +70,7 @@ public void UserSettingsFile_Get()
         var getOutput = Get(new ());
 
         Assert.IsNotNull(getOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, getOutput.Action);
+        Assert.IsNull(getOutput.Action);
         AssertSettingsAreEqual(expected, getOutput.Settings);
     }
 
@@ -90,7 +90,7 @@ public void UserSettingsFile_Set_NoDiff(string action)
         var expected = GetCurrentUserSettings();
 
         Assert.IsNotNull(setOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, setOutput.Action);
+        Assert.AreEqual(action, setOutput.Action);
         AssertSettingsAreEqual(expected, setOutput.Settings);
         AssertDiffState(setDiff, []);
     }
@@ -114,7 +114,7 @@ public void UserSettingsFile_Set_AddFields(string action)
 
         // Assert that the settings are added
         Assert.IsNotNull(setOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, setOutput.Action);
+        Assert.AreEqual(action, setOutput.Action);
         AssertMockProperties(setOutput.Settings, "mock");
         AssertSettingsAreEqual(expected, setOutput.Settings);
         AssertDiffState(setDiff, [ SettingsPropertyName ]);
@@ -138,7 +138,7 @@ public void UserSettingsFile_Set_ActionIsPartialByDefault()
 
         // Assert that the settings are added
         Assert.IsNotNull(setOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, setOutput.Action);
+        Assert.IsNull(setOutput.Action);
         AssertMockProperties(setOutput.Settings, "mock");
         AssertSettingsAreEqual(expected, setOutput.Settings);
         AssertDiffState(setDiff, [ SettingsPropertyName ]);
@@ -168,7 +168,7 @@ public void UserSettingsFile_Set_UpdateFields(string action)
 
         // Assert that the settings are updated
         Assert.IsNotNull(setOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, setOutput.Action);
+        Assert.AreEqual(action, setOutput.Action);
         AssertMockProperties(setOutput.Settings, "mock_new");
         AssertSettingsAreEqual(expected, setOutput.Settings);
         AssertDiffState(setDiff, [ SettingsPropertyName ]);
@@ -198,7 +198,7 @@ public void UserSettingsFile_Test_InDesiredState(string action)
 
         // Assert that the settings are in desired state
         Assert.IsNotNull(testOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, testOutput.Action);
+        Assert.AreEqual(action, testOutput.Action);
         AssertMockProperties(testOutput.Settings, "mock");
         AssertSettingsAreEqual(expected, testOutput.Settings);
         Assert.IsTrue(testOutput.InDesiredState);
@@ -229,7 +229,7 @@ public void UserSettingsFile_Test_NotInDesiredState(string action)
 
         // Assert that the settings are not in desired state
         Assert.IsNotNull(testOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, testOutput.Action);
+        Assert.AreEqual(action, testOutput.Action);
         AssertMockProperties(testOutput.Settings, "mock_set");
         AssertSettingsAreEqual(expected, testOutput.Settings);
         Assert.IsFalse(testOutput.InDesiredState);
@@ -246,7 +246,7 @@ public void UserSettingsFile_Export()
         var exportOutput = Export(new ());
 
         Assert.IsNotNull(exportOutput);
-        Assert.AreEqual(ActionPropertyValuePartial, exportOutput.Action);
+        Assert.IsNull(exportOutput.Action);
         AssertSettingsAreEqual(expected, exportOutput.Settings);
     }