Fixed Guid checks

pnp · Dec 8, 2022 · 791b031 · 791b031
1 parent 14b8455
commit 791b031
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/Commands/Fields/AddField.cs b/src/Commands/Fields/AddField.cs
@@ -112,7 +112,7 @@ protected override void ExecuteCmdlet()
                         fieldCI.FieldOptions |= AddFieldOptions.AddToAllContentTypes;
                     }
 
-                    if (ClientSideComponentId != null)
+                    if (ClientSideComponentId != Guid.Empty)
                     {
                         fieldCI.ClientSideComponentId = ClientSideComponentId;
                     }
@@ -223,7 +223,7 @@ protected override void ExecuteCmdlet()
                     AddToDefaultView = AddToDefaultView
                 };
 
-                if (ClientSideComponentId != null)
+                if (ClientSideComponentId != Guid.Empty)
                 {
                     fieldCI.ClientSideComponentId = ClientSideComponentId;
                 }

diff --git a/src/Commands/Lists/GetListItem.cs b/src/Commands/Lists/GetListItem.cs
@@ -79,7 +79,7 @@ protected override void ExecuteCmdlet()
                 ClientContext.ExecuteQueryRetry();
                 WriteObject(listItem);
             }
-            else if (HasUniqueId())
+            else if (UniqueId != Guid.Empty)
             {
                 CamlQuery query = new CamlQuery();
                 var viewFieldsStringBuilder = new StringBuilder();
@@ -180,11 +180,6 @@ private bool HasId()
             return Id != -1;
         }
 
-        private bool HasUniqueId()
-        {
-            return UniqueId != null && UniqueId != Guid.Empty;
-        }
-
         private bool HasCamlQuery()
         {
             return Query != null;