Skip to content

Commit

Permalink
Merge pull request #26 from KoenZomers/PnPPoshPR2796
Browse files Browse the repository at this point in the history
Applying same fix as in PnP PowerShell PR 2796
  • Loading branch information
erwinvanhunen authored Nov 16, 2020
2 parents d183495 + 53a8ee0 commit df8d5e8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Removed `Add-PnPWorkflowDefinition`, `Add-PnPWorkflowSubscription`, `Get-PnPWorkflowDefinition`, `Get-PnPWorkflowInstances`, `Get-PnPWorkflowSubscription`, `Remove-PnPWorkflowDefinition`, `Remove-PnPWorkflowSubscription`, `Resume-PnPWorkflowInstance`, `Start-PnPWorkflowInstance` and `Stop-PnPWorkflowInstance` due to deprecated of the Workflow Services in SharePoint Online.
- Renamed `Test-PnPOffice365AliasIsUsed` to `Test-PnPMicrosoft365AliasIsUsed`
- Refactored some of the Taxonomy cmdlet parameters. See documentation.
- Change in `Copy-PnPFile` which should resolve some issues you may run into when copying files [PR #2796](https://github.com/pnp/PnP-PowerShell/pull/2796)

### Contributors
- Carlos Marins Jr [kadu-jr]
- Aimery Thomas [a1mery]
- Veronique Lengelle [veronicageek]
3 changes: 2 additions & 1 deletion src/Commands/Files/CopyFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ protected override void ExecuteCmdlet()
TargetUrl = UrlUtility.Combine(webServerRelativeUrl, TargetUrl);
}

string sourceFolder = SourceUrl.Substring(0, SourceUrl.LastIndexOf('/'));
Uri currentContextUri = new Uri(ClientContext.Url);
Uri sourceUri = new Uri(currentContextUri, SourceUrl);
Uri sourceUri = new Uri(currentContextUri, sourceFolder);
Uri sourceWebUri = Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect(ClientContext, sourceUri);
Uri targetUri = new Uri(currentContextUri, TargetUrl);
Uri targetWebUri = Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect(ClientContext, targetUri);
Expand Down

0 comments on commit df8d5e8

Please sign in to comment.