Merge pull request #1570 from SharePoint/dev

erwinvanhunen · web-flow · commit f03a9b3fd0ea · 2018-05-16T10:17:01.000+02:00
May 2018 Intermediate Release 1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [2.27.1806.0]
+### Added
+
+### Changed
+
+### Deprecated
+
+### Contributors
+
+## [2.26.1805.1]
+### Added
+
+- Added -Timeout option to Add-PnPApp
+- Added -CollapseSpecification option to Submit-PnPSearchQuery
+- Added -InSiteHierarchy to Get-PnPField to search for fields in the site collection
+
+### Changed
+- Fix for issue where using Add-PnPFile and setting Created and Modified did not update values
+
 ## [2.26.1805.0]
 ### Added
 - Added Enable-PnPPowerShellTelemetry, Disable-PnPPowerShellTelemetry, Get-PnPPowershellTelemetryEnabled
diff --git a/Commands/Apps/AddApp.cs b/Commands/Apps/AddApp.cs
@@ -41,6 +41,9 @@ public class AddApp : PnPCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Overwrites the existing app package if it already exists")]
         public SwitchParameter Overwrite;
 
+        [Parameter(Mandatory = false, HelpMessage = "Specifies the timeout in seconds. Defaults to 200.")]
+        public int Timeout = 200;
+
         protected override void ExecuteCmdlet()
         {
             if (!System.IO.Path.IsPathRooted(Path))
@@ -54,7 +57,7 @@ protected override void ExecuteCmdlet()
 
             var manager = new AppManager(ClientContext);
 
-            var result = manager.Add(bytes, fileInfo.Name, Overwrite, Scope);
+            var result = manager.Add(bytes, fileInfo.Name, Overwrite, Scope, timeoutSeconds: Timeout);
 
             try
             {
diff --git a/Commands/Base/PnPCmdlet.cs b/Commands/Base/PnPCmdlet.cs
@@ -115,13 +115,8 @@ protected override void ProcessRecord()
             }
             catch (Exception ex)
             {
-                if (SPOnlineConnection.CurrentConnection.TelemetryClient != null)
-                {
-                    SPOnlineConnection.CurrentConnection.TelemetryClient.TrackException(ex);
-                }
                 SPOnlineConnection.CurrentConnection.RestoreCachedContext(SPOnlineConnection.CurrentConnection.Url);
                 WriteError(new ErrorRecord(ex, "EXCEPTION", ErrorCategory.WriteError, null));
-                SPOnlineConnection.CurrentConnection.TelemetryClient.Flush();
             }
         }
 
diff --git a/Commands/Enums/ListItemUpdateType.cs b/Commands/Enums/ListItemUpdateType.cs
@@ -0,0 +1,15 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SharePointPnP.PowerShell.Commands.Enums
+{
+    public enum ListItemUpdateType
+    {
+        Update,
+        SystemUpdate,
+        UpdateOverwriteVersion
+    }
+}
diff --git a/Commands/Fields/GetField.cs b/Commands/Fields/GetField.cs
@@ -32,6 +32,9 @@ public class GetField : PnPWebRetrievalsCmdlet<Field>
         [Parameter(Mandatory = false, HelpMessage = "Filter to the specified group")]
         public string Group;
 
+        [Parameter(Mandatory = false, ValueFromPipeline = false, HelpMessage = "Search site hierarchy for fields")]
+        public SwitchParameter InSiteHierarchy;
+
         protected override void ExecuteCmdlet()
         {
             if (List != null)
@@ -67,8 +70,10 @@ protected override void ExecuteCmdlet()
                 {
                     if (!string.IsNullOrEmpty(Group))
                     {
-                        WriteObject(fieldCollection.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)),true);
-                    } else {
+                        WriteObject(fieldCollection.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)), true);
+                    }
+                    else
+                    {
                         WriteObject(fieldCollection, true);
                     }
                 }
@@ -81,27 +86,62 @@ protected override void ExecuteCmdlet()
             {
                 if (Identity.Id == Guid.Empty && string.IsNullOrEmpty(Identity.Name))
                 {
-                    ClientContext.Load(SelectedWeb.Fields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));
+                    if (InSiteHierarchy.IsPresent)
+                    {
+                        ClientContext.Load(SelectedWeb.AvailableFields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));
+                    }
+                    else
+                    {
+                        ClientContext.Load(SelectedWeb.Fields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));
+                    }
                     ClientContext.ExecuteQueryRetry();
                     if (!string.IsNullOrEmpty(Group))
                     {
-                        WriteObject(SelectedWeb.Fields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)), true);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            WriteObject(SelectedWeb.AvailableFields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)).OrderBy(f => f.Title), true);
+                        }
+                        else
+                        {
+                            WriteObject(SelectedWeb.Fields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)).OrderBy(f => f.Title), true);
+                        }
                     }
                     else
                     {
-                        WriteObject(SelectedWeb.Fields, true);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            WriteObject(SelectedWeb.AvailableFields.OrderBy(f => f.Title), true);
+                        }
+                        else
+                        {
+                            WriteObject(SelectedWeb.Fields.OrderBy(f => f.Title), true);
+                        }
                     }
                 }
                 else
                 {
                     Field field = null;
                     if (Identity.Id != Guid.Empty)
                     {
-                        field = SelectedWeb.Fields.GetById(Identity.Id);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            field = SelectedWeb.AvailableFields.GetById(Identity.Id);
+                        }
+                        else
+                        {
+                            field = SelectedWeb.Fields.GetById(Identity.Id);
+                        }
                     }
                     else if (!string.IsNullOrEmpty(Identity.Name))
                     {
-                        field = SelectedWeb.Fields.GetByInternalNameOrTitle(Identity.Name);
+                        if (InSiteHierarchy.IsPresent)
+                        {
+                            field = SelectedWeb.AvailableFields.GetByInternalNameOrTitle(Identity.Name);
+                        }
+                        else
+                        {
+                            field = SelectedWeb.Fields.GetByInternalNameOrTitle(Identity.Name);
+                        }
                     }
                     ClientContext.Load(field, RetrievalExpressions);
                     ClientContext.ExecuteQueryRetry();
diff --git a/Commands/Files/AddFile.cs b/Commands/Files/AddFile.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using Microsoft.SharePoint.Client.Taxonomy;
 using SharePointPnP.PowerShell.Commands.Utilities;
+using SharePointPnP.PowerShell.Commands.Enums;
 
 namespace SharePointPnP.PowerShell.Commands.Files
 {
@@ -187,7 +188,7 @@ protected override void ExecuteCmdlet()
             {
                 var item = file.ListItemAllFields;
 
-                ListItemHelper.UpdateListItem(item, Values, true,
+                ListItemHelper.UpdateListItem(item, Values, ListItemUpdateType.UpdateOverwriteVersion,
                     (warning) =>
                     {
                         WriteWarning(warning);
@@ -201,7 +202,11 @@ protected override void ExecuteCmdlet()
             {
                 var item = file.ListItemAllFields;
                 item["ContentTypeId"] = targetContentType.Id.StringValue;
+#if !ONPREMISES
+                item.UpdateOverwriteVersion();
+#else
                 item.Update();
+#endif
                 ClientContext.ExecuteQueryRetry();
             }
 
@@ -214,7 +219,8 @@ protected override void ExecuteCmdlet()
 
             if (Approve)
                 SelectedWeb.ApproveFile(fileUrl, ApproveComment);
-
+            ClientContext.Load(file);
+            ClientContext.ExecuteQueryRetry();
             WriteObject(file);
         }
     }
diff --git a/Commands/Lists/AddListItem.cs b/Commands/Lists/AddListItem.cs
@@ -8,6 +8,7 @@
 using OfficeDevPnP.Core.Utilities;
 using SharePointPnP.PowerShell.CmdletHelpAttributes;
 using SharePointPnP.PowerShell.Commands.Base.PipeBinds;
+using SharePointPnP.PowerShell.Commands.Enums;
 using SharePointPnP.PowerShell.Commands.Taxonomy;
 using SharePointPnP.PowerShell.Commands.Utilities;
 
@@ -120,7 +121,7 @@ protected override void ExecuteCmdlet()
 
                 if (Values != null)
                 {
-                    item = ListItemHelper.UpdateListItem(item, Values, false,
+                    item = ListItemHelper.UpdateListItem(item, Values, ListItemUpdateType.Update,
                         (warning) =>
                         {
                             WriteWarning(warning);
diff --git a/Commands/Lists/SetListItem.cs b/Commands/Lists/SetListItem.cs
@@ -7,6 +7,7 @@
 using Microsoft.SharePoint.Client.Taxonomy;
 using SharePointPnP.PowerShell.CmdletHelpAttributes;
 using SharePointPnP.PowerShell.Commands.Base.PipeBinds;
+using SharePointPnP.PowerShell.Commands.Enums;
 using SharePointPnP.PowerShell.Commands.Utilities;
 // IMPORTANT: If you make changes to this cmdlet, also make the similar/same changes to the Add-PnPListItem Cmdlet
 
@@ -108,7 +109,12 @@ protected override void ExecuteCmdlet()
                 if (Values != null)
                 {
 #if !ONPREMISES
-                    item = ListItemHelper.UpdateListItem(item, Values, SystemUpdate, (warning) =>
+                    var updateType = ListItemUpdateType.Update;
+                    if(SystemUpdate.IsPresent)
+                    {
+                        updateType = ListItemUpdateType.SystemUpdate;
+                    }
+                    item = ListItemHelper.UpdateListItem(item, Values, updateType, (warning) =>
                       {
                           WriteWarning(warning);
                       },
@@ -118,7 +124,7 @@ protected override void ExecuteCmdlet()
                       }
                       );
 #else
-                    item = ListItemHelper.UpdateListItem(item, Values, false, (warning) =>
+                    item = ListItemHelper.UpdateListItem(item, Values, ListItemUpdateType.Update, (warning) =>
                       {
                           WriteWarning(warning);
                       },
diff --git a/Commands/Properties/AssemblyInfo.cs b/Commands/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.26.1805.0")]
-[assembly: AssemblyFileVersion("2.26.1805.0")]
+[assembly: AssemblyVersion("2.26.1805.1")]
+[assembly: AssemblyFileVersion("2.26.1805.1")]
 [assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]
diff --git a/Commands/Provisioning/ApplyProvisioningTemplate.cs b/Commands/Provisioning/ApplyProvisioningTemplate.cs
@@ -11,6 +11,7 @@
 using System.Linq;
 using OfficeDevPnP.Core.Framework.Provisioning.Providers;
 using SharePointPnP.PowerShell.Commands.Components;
+using System.Collections.Generic;
 
 namespace SharePointPnP.PowerShell.Commands.Provisioning
 {
@@ -119,7 +120,7 @@ protected override void ExecuteCmdlet()
                     {
                         Path = System.IO.Path.Combine(SessionState.Path.CurrentFileSystemLocation.Path, Path);
                     }
-                    if(!System.IO.File.Exists(Path))
+                    if (!System.IO.File.Exists(Path))
                     {
                         throw new FileNotFoundException($"File not found");
                     }
@@ -278,30 +279,45 @@ protected override void ExecuteCmdlet()
                 WriteProgress(progressRecord);
             };
 
+            var warningsShown = new List<string>();
+
             applyingInformation.MessagesDelegate = (message, type) =>
             {
                 switch (type)
                 {
                     case ProvisioningMessageType.Warning:
-                    {
-                        WriteWarning(message);
-                        break;
-                    }
+                        {
+                            if (!warningsShown.Contains(message))
+                            {
+                                WriteWarning(message);
+                                warningsShown.Add(message);
+                            }
+                            break;
+                        }
                     case ProvisioningMessageType.Progress:
-                    {
-                        var activity = message;
-                        if (message.IndexOf("|") > -1)
                         {
-                            var messageSplitted = message.Split('|');
-                            if (messageSplitted.Length == 4)
+                            var activity = message;
+                            if (message.IndexOf("|") > -1)
                             {
-                                var current = double.Parse(messageSplitted[2]);
-                                var total = double.Parse(messageSplitted[3]);
-                                subProgressRecord.RecordType = ProgressRecordType.Processing;
-                                subProgressRecord.Activity = messageSplitted[0];
-                                subProgressRecord.StatusDescription = messageSplitted[1];
-                                subProgressRecord.PercentComplete = Convert.ToInt32((100/total)*current);
-                                WriteProgress(subProgressRecord);
+                                var messageSplitted = message.Split('|');
+                                if (messageSplitted.Length == 4)
+                                {
+                                    var current = double.Parse(messageSplitted[2]);
+                                    var total = double.Parse(messageSplitted[3]);
+                                    subProgressRecord.RecordType = ProgressRecordType.Processing;
+                                    subProgressRecord.Activity = messageSplitted[0];
+                                    subProgressRecord.StatusDescription = messageSplitted[1];
+                                    subProgressRecord.PercentComplete = Convert.ToInt32((100 / total) * current);
+                                    WriteProgress(subProgressRecord);
+                                }
+                                else
+                                {
+                                    subProgressRecord.Activity = "Processing";
+                                    subProgressRecord.RecordType = ProgressRecordType.Processing;
+                                    subProgressRecord.StatusDescription = activity;
+                                    subProgressRecord.PercentComplete = 0;
+                                    WriteProgress(subProgressRecord);
+                                }
                             }
                             else
                             {
@@ -311,23 +327,14 @@ protected override void ExecuteCmdlet()
                                 subProgressRecord.PercentComplete = 0;
                                 WriteProgress(subProgressRecord);
                             }
+                            break;
                         }
-                        else
-                        {
-                            subProgressRecord.Activity = "Processing";
-                            subProgressRecord.RecordType = ProgressRecordType.Processing;
-                            subProgressRecord.StatusDescription = activity;
-                            subProgressRecord.PercentComplete = 0;
-                            WriteProgress(subProgressRecord);
-                        }
-                        break;
-                    }
                     case ProvisioningMessageType.Completed:
-                    {
+                        {
 
-                        WriteProgress(new ProgressRecord(1, message, " ") {RecordType = ProgressRecordType.Completed});
-                        break;
-                    }
+                            WriteProgress(new ProgressRecord(1, message, " ") { RecordType = ProgressRecordType.Completed });
+                            break;
+                        }
                 }
             };
 
diff --git a/Commands/Search/SubmitSearchQuery.cs b/Commands/Search/SubmitSearchQuery.cs
@@ -74,6 +74,9 @@ public class SubmitSearchQuery : PnPWebCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Specifies the name of the client which issued the query.", ParameterSetName = ParameterAttribute.AllParameterSets)]
         public string ClientType = "ContentSearchLow";
 
+        [Parameter(Mandatory = false, HelpMessage = "Limit the number of items per the collapse specification. See https://docs.microsoft.com/en-us/sharepoint/dev/general-development/customizing-search-results-in-sharepoint#collapse-similar-search-results-using-the-collapsespecification-property for more information.", ParameterSetName = ParameterAttribute.AllParameterSets)]
+        public string CollapseSpecification;
+
         [Parameter(Mandatory = false, HelpMessage = "The keyword query’s hidden constraints.", ParameterSetName = ParameterAttribute.AllParameterSets)]
         public string HiddenConstraints;
 
@@ -217,6 +220,7 @@ private KeywordQuery CreateKeywordQuery()
             if (MyInvocation.BoundParameters.ContainsKey("SourceId")) keywordQuery.SourceId = SourceId;
             if (MyInvocation.BoundParameters.ContainsKey("ProcessBestBets")) keywordQuery.ProcessBestBets = ProcessBestBets;
             if (MyInvocation.BoundParameters.ContainsKey("ProcessPersonalFavorites")) keywordQuery.ProcessPersonalFavorites = ProcessPersonalFavorites;
+            if (MyInvocation.BoundParameters.ContainsKey("CollapseSpecification")) keywordQuery.CollapseSpecification = CollapseSpecification;
 
             if (SortList != null)
             {
diff --git a/Commands/SharePointPnP.PowerShell.Commands.csproj b/Commands/SharePointPnP.PowerShell.Commands.csproj
@@ -464,6 +464,7 @@
     <Compile Include="Base\PipeBinds\SitePipeBind.cs" />
     <Compile Include="Base\PipeBinds\TenantSiteScriptPipeBind.cs" />
     <Compile Include="Base\PipeBinds\TenantSiteDesignPipeBind.cs" />
+    <Compile Include="Enums\ListItemUpdateType.cs" />
     <Compile Include="Enums\StorageEntityScope.cs" />
     <Compile Include="Model\ServicePrincipalPermissionGrant.cs" />
     <Compile Include="Navigation\GetNavigationNode.cs" />
diff --git a/Commands/Utilities/ListItemHelper.cs b/Commands/Utilities/ListItemHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ public class AddApp : PnPCmdlet`
`41`	`41`	`[Parameter(Mandatory = false, HelpMessage = "Overwrites the existing app package if it already exists")]`
`42`	`42`	`public SwitchParameter Overwrite;`
`43`	`43`
	`44`	`+ [Parameter(Mandatory = false, HelpMessage = "Specifies the timeout in seconds. Defaults to 200.")]`
	`45`	`+ public int Timeout = 200;`
	`46`	`+`
`44`	`47`	`protected override void ExecuteCmdlet()`
`45`	`48`	`{`
`46`	`49`	`if (!System.IO.Path.IsPathRooted(Path))`
`@@ -54,7 +57,7 @@ protected override void ExecuteCmdlet()`
`54`	`57`
`55`	`58`	`var manager = new AppManager(ClientContext);`
`56`	`59`
`57`		`- var result = manager.Add(bytes, fileInfo.Name, Overwrite, Scope);`
	`60`	`+ var result = manager.Add(bytes, fileInfo.Name, Overwrite, Scope, timeoutSeconds: Timeout);`
`58`	`61`
`59`	`62`	`try`
`60`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,8 @@ protected override void ProcessRecord()`
`115`	`115`	`}`
`116`	`116`	`catch (Exception ex)`
`117`	`117`	`{`
`118`		`- if (SPOnlineConnection.CurrentConnection.TelemetryClient != null)`
`119`		`- {`
`120`		`- SPOnlineConnection.CurrentConnection.TelemetryClient.TrackException(ex);`
`121`		`- }`
`122`	`118`	`SPOnlineConnection.CurrentConnection.RestoreCachedContext(SPOnlineConnection.CurrentConnection.Url);`
`123`	`119`	`WriteError(new ErrorRecord(ex, "EXCEPTION", ErrorCategory.WriteError, null));`
`124`		`- SPOnlineConnection.CurrentConnection.TelemetryClient.Flush();`
`125`	`120`	`}`
`126`	`121`	`}`
`127`	`122`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ public class GetField : PnPWebRetrievalsCmdlet<Field>`
`32`	`32`	`[Parameter(Mandatory = false, HelpMessage = "Filter to the specified group")]`
`33`	`33`	`public string Group;`
`34`	`34`
	`35`	`+ [Parameter(Mandatory = false, ValueFromPipeline = false, HelpMessage = "Search site hierarchy for fields")]`
	`36`	`+ public SwitchParameter InSiteHierarchy;`
	`37`	`+`
`35`	`38`	`protected override void ExecuteCmdlet()`
`36`	`39`	`{`
`37`	`40`	`if (List != null)`
`@@ -67,8 +70,10 @@ protected override void ExecuteCmdlet()`
`67`	`70`	`{`
`68`	`71`	`if (!string.IsNullOrEmpty(Group))`
`69`	`72`	`{`
`70`		`- WriteObject(fieldCollection.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)),true);`
`71`		`- } else {`
	`73`	`+ WriteObject(fieldCollection.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)), true);`
	`74`	`+ }`
	`75`	`+ else`
	`76`	`+ {`
`72`	`77`	`WriteObject(fieldCollection, true);`
`73`	`78`	`}`
`74`	`79`	`}`
`@@ -81,27 +86,62 @@ protected override void ExecuteCmdlet()`
`81`	`86`	`{`
`82`	`87`	`if (Identity.Id == Guid.Empty && string.IsNullOrEmpty(Identity.Name))`
`83`	`88`	`{`
`84`		`- ClientContext.Load(SelectedWeb.Fields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));`
	`89`	`+ if (InSiteHierarchy.IsPresent)`
	`90`	`+ {`
	`91`	`+ ClientContext.Load(SelectedWeb.AvailableFields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));`
	`92`	`+ }`
	`93`	`+ else`
	`94`	`+ {`
	`95`	`+ ClientContext.Load(SelectedWeb.Fields, fc => fc.IncludeWithDefaultProperties(RetrievalExpressions));`
	`96`	`+ }`
`85`	`97`	`ClientContext.ExecuteQueryRetry();`
`86`	`98`	`if (!string.IsNullOrEmpty(Group))`
`87`	`99`	`{`
`88`		`- WriteObject(SelectedWeb.Fields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)), true);`
	`100`	`+ if (InSiteHierarchy.IsPresent)`
	`101`	`+ {`
	`102`	`+ WriteObject(SelectedWeb.AvailableFields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)).OrderBy(f => f.Title), true);`
	`103`	`+ }`
	`104`	`+ else`
	`105`	`+ {`
	`106`	`+ WriteObject(SelectedWeb.Fields.Where(f => f.Group.Equals(Group, StringComparison.InvariantCultureIgnoreCase)).OrderBy(f => f.Title), true);`
	`107`	`+ }`
`89`	`108`	`}`
`90`	`109`	`else`
`91`	`110`	`{`
`92`		`- WriteObject(SelectedWeb.Fields, true);`
	`111`	`+ if (InSiteHierarchy.IsPresent)`
	`112`	`+ {`
	`113`	`+ WriteObject(SelectedWeb.AvailableFields.OrderBy(f => f.Title), true);`
	`114`	`+ }`
	`115`	`+ else`
	`116`	`+ {`
	`117`	`+ WriteObject(SelectedWeb.Fields.OrderBy(f => f.Title), true);`
	`118`	`+ }`
`93`	`119`	`}`
`94`	`120`	`}`
`95`	`121`	`else`
`96`	`122`	`{`
`97`	`123`	`Field field = null;`
`98`	`124`	`if (Identity.Id != Guid.Empty)`
`99`	`125`	`{`
`100`		`- field = SelectedWeb.Fields.GetById(Identity.Id);`
	`126`	`+ if (InSiteHierarchy.IsPresent)`
	`127`	`+ {`
	`128`	`+ field = SelectedWeb.AvailableFields.GetById(Identity.Id);`
	`129`	`+ }`
	`130`	`+ else`
	`131`	`+ {`
	`132`	`+ field = SelectedWeb.Fields.GetById(Identity.Id);`
	`133`	`+ }`
`101`	`134`	`}`
`102`	`135`	`else if (!string.IsNullOrEmpty(Identity.Name))`
`103`	`136`	`{`
`104`		`- field = SelectedWeb.Fields.GetByInternalNameOrTitle(Identity.Name);`
	`137`	`+ if (InSiteHierarchy.IsPresent)`
	`138`	`+ {`
	`139`	`+ field = SelectedWeb.AvailableFields.GetByInternalNameOrTitle(Identity.Name);`
	`140`	`+ }`
	`141`	`+ else`
	`142`	`+ {`
	`143`	`+ field = SelectedWeb.Fields.GetByInternalNameOrTitle(Identity.Name);`
	`144`	`+ }`
`105`	`145`	`}`
`106`	`146`	`ClientContext.Load(field, RetrievalExpressions);`
`107`	`147`	`ClientContext.ExecuteQueryRetry();`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using System.Collections.Generic;`
`11`	`11`	`using Microsoft.SharePoint.Client.Taxonomy;`
`12`	`12`	`using SharePointPnP.PowerShell.Commands.Utilities;`
	`13`	`+using SharePointPnP.PowerShell.Commands.Enums;`
`13`	`14`
`14`	`15`	`namespace SharePointPnP.PowerShell.Commands.Files`
`15`	`16`	`{`
`@@ -187,7 +188,7 @@ protected override void ExecuteCmdlet()`
`187`	`188`	`{`
`188`	`189`	`var item = file.ListItemAllFields;`
`189`	`190`
`190`		`- ListItemHelper.UpdateListItem(item, Values, true,`
	`191`	`+ ListItemHelper.UpdateListItem(item, Values, ListItemUpdateType.UpdateOverwriteVersion,`
`191`	`192`	`(warning) =>`
`192`	`193`	`{`
`193`	`194`	`WriteWarning(warning);`
`@@ -201,7 +202,11 @@ protected override void ExecuteCmdlet()`
`201`	`202`	`{`
`202`	`203`	`var item = file.ListItemAllFields;`
`203`	`204`	`item["ContentTypeId"] = targetContentType.Id.StringValue;`
	`205`	`+#if !ONPREMISES`
	`206`	`+ item.UpdateOverwriteVersion();`
	`207`	`+#else`
`204`	`208`	`item.Update();`
	`209`	`+#endif`
`205`	`210`	`ClientContext.ExecuteQueryRetry();`
`206`	`211`	`}`
`207`	`212`
`@@ -214,7 +219,8 @@ protected override void ExecuteCmdlet()`
`214`	`219`
`215`	`220`	`if (Approve)`
`216`	`221`	`SelectedWeb.ApproveFile(fileUrl, ApproveComment);`
`217`		`-`
	`222`	`+ ClientContext.Load(file);`
	`223`	`+ ClientContext.ExecuteQueryRetry();`
`218`	`224`	`WriteObject(file);`
`219`	`225`	`}`
`220`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using OfficeDevPnP.Core.Utilities;`
`9`	`9`	`using SharePointPnP.PowerShell.CmdletHelpAttributes;`
`10`	`10`	`using SharePointPnP.PowerShell.Commands.Base.PipeBinds;`
	`11`	`+using SharePointPnP.PowerShell.Commands.Enums;`
`11`	`12`	`using SharePointPnP.PowerShell.Commands.Taxonomy;`
`12`	`13`	`using SharePointPnP.PowerShell.Commands.Utilities;`
`13`	`14`
`@@ -120,7 +121,7 @@ protected override void ExecuteCmdlet()`
`120`	`121`
`121`	`122`	`if (Values != null)`
`122`	`123`	`{`
`123`		`- item = ListItemHelper.UpdateListItem(item, Values, false,`
	`124`	`+ item = ListItemHelper.UpdateListItem(item, Values, ListItemUpdateType.Update,`
`124`	`125`	`(warning) =>`
`125`	`126`	`{`
`126`	`127`	`WriteWarning(warning);`