Merge pull request #1561 from erwinvanhunen/dev

Fix for issue #1550

Author: erwinvanhunen

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Added -CollapseSpecification option to Submit-PnPSearchQuery
 
 ### Changed
+- Fix for issue where using Add-PnPFile and setting Created and Modified did not update values
 
 ### Deprecated
 

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();
             }
         }
 

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
+    }
+}

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);
         }
     }

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);

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);
                       },

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" />

Commands/Utilities/ListItemHelper.cs

@@ -1,5 +1,6 @@
 using Microsoft.SharePoint.Client;
 using Microsoft.SharePoint.Client.Taxonomy;
+using SharePointPnP.PowerShell.Commands.Enums;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -30,7 +31,7 @@ public FieldUpdateValue(string key, object value, string fieldTypeString)
             }
         }
 
-        public static ListItem UpdateListItem(ListItem item, Hashtable valuesToSet, bool systemUpdate, Action<string> warningCallback, Action<string, string> terminatingError)
+        public static ListItem UpdateListItem(ListItem item, Hashtable valuesToSet, ListItemUpdateType updateType, Action<string> warningCallback, Action<string, string> terminatingError)
         {
             var itemValues = new List<FieldUpdateValue>();
 
@@ -253,13 +254,23 @@ public static ListItem UpdateListItem(ListItem item, Hashtable valuesToSet, bool
                 }
             }
 #if !ONPREMISES
-            if (systemUpdate)
+            switch(updateType)
             {
-                item.SystemUpdate();
-            }
-            else
-            {
-                item.Update();
+                case ListItemUpdateType.Update:
+                    {
+                        item.Update();
+                        break;
+                    }
+                case ListItemUpdateType.SystemUpdate:
+                    {
+                        item.SystemUpdate();
+                        break;
+                    }
+                case ListItemUpdateType.UpdateOverwriteVersion:
+                    {
+                        item.UpdateOverwriteVersion();
+                        break;
+                    }
             }
 #else
             item.Update();