Fixes

Author: stevebeauge

Commands/Base/BaseFileProvisioningCmdlet.cs

@@ -267,8 +267,7 @@ private string Tokenize(string input)
             {
                 input = input
                     .ReplaceCaseInsensitive(list.Id.ToString("D"), "{listid:" + Regex.Escape(list.Title) + "}")
-                    .ReplaceCaseInsensitive(SelectedWeb.Url.TrimEnd('/') + "/" + list.GetWebRelativeUrl(), "{listurl:" + Regex.Escape(list.Title) + "}")
-                    .ReplaceCaseInsensitive(list.RootFolder.ServerRelativeUrl, "{listurl:" + Regex.Escape(list.Title) + "}");
+                    .ReplaceCaseInsensitive(list.GetWebRelativeUrl(), "{listurl:" + Regex.Escape(list.Title) + "}");
             }
             return input.ReplaceCaseInsensitive(SelectedWeb.Url, "{site}")
                 .ReplaceCaseInsensitive(SelectedWeb.ServerRelativeUrl, "{site}")

Commands/Provisioning/AddFilesToProvisioningTemplate.cs

@@ -75,7 +75,7 @@ protected override void ProcessRecord()
 
                 for (int i = 0; i < files.Length; i++)
                 {
-                    var file = files[0];
+                    var file = files[i];
 
                     _progressFilesEnumeration.PercentComplete = 100 * i / files.Length;
                     _progressFilesEnumeration.StatusDescription = $"Processing file {file.ServerRelativeUrl}";