Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue with filenames in template output of New-PnPSitetemplateFromFolder. Closes #2944 #2945

Merged
merged 2 commits into from
Mar 30, 2023
Merged

Fixes issue with filenames in template output of New-PnPSitetemplateFromFolder. Closes #2944 #2945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2201a90
Fixes issue with filenames in template output of New-PnPSitetemplateF…
martinlingstuyl Mar 28, 2023
aadcec2
Added changelog entry
KoenZomers Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Fixed `New-PnPSite` cmdlet to work with non-commercial cloud environments.
- Fixed `Set-PnPSearchSettings` cmdlet not working with vanity domain tenants [#2884](https://github.com/pnp/powershell/pull/2884)
- Fixed `Add-PnPFieldFromXml` cmdlet. It will now return the correct typed field if the added field was of type `Taxonomy`. [#2926](https://github.com/pnp/powershell/pull/2926)
- Fixed `New-PnPSitetemplateFromFolder` removing the first character of filenames [#2944](https://github.com/pnp/powershell/pull/2944)

### Contributors
- [enthusol]
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/Provisioning/Site/NewSiteTemplateFromFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private string GetFiles(XMLPnPSchemaVersion schema, string folder, string ctid)
var fileInfo = dirInfo.GetFiles(Match);
foreach (var file in fileInfo.Where(f => (f.Attributes & FileAttributes.Hidden) == 0))
{
var unrootedPath = file.FullName.Substring(Folder.Length + 1);
var unrootedPath = file.FullName.Substring(Folder.Length);
var targetFolder = Path.Combine(TargetFolder, unrootedPath.LastIndexOf("\\") > -1 ? unrootedPath.Substring(0, unrootedPath.LastIndexOf("\\")) : "");
targetFolder = targetFolder.Replace('\\', '/');
var modelFile = new PnP.Framework.Provisioning.Model.File()
Expand Down