Fix a property not loaded exception

stevebeauge · stevebeauge · commit a4ed0c8f324a · 2018-07-13T12:11:01.000+02:00
diff --git a/Commands/Base/BaseFileProvisioningCmdlet.cs b/Commands/Base/BaseFileProvisioningCmdlet.cs
@@ -119,8 +119,8 @@ protected void AddFileToTemplate(ProvisioningTemplate template, Stream fs, strin
         /// <param name="file">The SharePoint file to retrieve and add</param>
         protected void AddSPFileToTemplate(ProvisioningTemplate template, SPFile file)
         {
-            var fileName = file.EnsureProperty(f => f.Name);
-            var folderRelativeUrl = file.ServerRelativeUrl.Substring(0, file.ServerRelativeUrl.Length - fileName.Length - 1);
+            file.EnsureProperties(f => f.Name, f => f.ServerRelativeUrl);
+            var folderRelativeUrl = file.ServerRelativeUrl.Substring(0, file.ServerRelativeUrl.Length - file.Name.Length - 1);
             var folderWebRelativeUrl = HttpUtility.UrlKeyValueDecode(folderRelativeUrl.Substring(SelectedWeb.ServerRelativeUrl.TrimEnd('/').Length + 1));
             if (ClientContext.HasPendingRequest) ClientContext.ExecuteQuery();
             try
@@ -132,7 +132,7 @@ protected void AddSPFileToTemplate(ProvisioningTemplate template, SPFile file)
                     // and the stream provided by OpenBinaryDirect does not allow it
                     fi.Stream.CopyTo(ms);
                     ms.Position = 0;
-                    AddFileToTemplate(template, ms, folderWebRelativeUrl, fileName, folderWebRelativeUrl);
+                    AddFileToTemplate(template, ms, folderWebRelativeUrl, file.Name, folderWebRelativeUrl);
                 }
             }
             catch (WebException exc)

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ protected void AddFileToTemplate(ProvisioningTemplate template, Stream fs, strin`
`119`	`119`	`/// <param name="file">The SharePoint file to retrieve and add</param>`
`120`	`120`	`protected void AddSPFileToTemplate(ProvisioningTemplate template, SPFile file)`
`121`	`121`	`{`
`122`		`- var fileName = file.EnsureProperty(f => f.Name);`
`123`		`- var folderRelativeUrl = file.ServerRelativeUrl.Substring(0, file.ServerRelativeUrl.Length - fileName.Length - 1);`
	`122`	`+ file.EnsureProperties(f => f.Name, f => f.ServerRelativeUrl);`
	`123`	`+ var folderRelativeUrl = file.ServerRelativeUrl.Substring(0, file.ServerRelativeUrl.Length - file.Name.Length - 1);`
`124`	`124`	`var folderWebRelativeUrl = HttpUtility.UrlKeyValueDecode(folderRelativeUrl.Substring(SelectedWeb.ServerRelativeUrl.TrimEnd('/').Length + 1));`
`125`	`125`	`if (ClientContext.HasPendingRequest) ClientContext.ExecuteQuery();`
`126`	`126`	`try`
`@@ -132,7 +132,7 @@ protected void AddSPFileToTemplate(ProvisioningTemplate template, SPFile file)`
`132`	`132`	`// and the stream provided by OpenBinaryDirect does not allow it`
`133`	`133`	`fi.Stream.CopyTo(ms);`
`134`	`134`	`ms.Position = 0;`
`135`		`- AddFileToTemplate(template, ms, folderWebRelativeUrl, fileName, folderWebRelativeUrl);`
	`135`	`+ AddFileToTemplate(template, ms, folderWebRelativeUrl, file.Name, folderWebRelativeUrl);`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`catch (WebException exc)`