From 301ff87383f7677a071cff9e8048f1c10ab38cbc Mon Sep 17 00:00:00 2001 From: Jackson Myers Date: Fri, 6 Sep 2024 10:14:10 -0500 Subject: [PATCH 1/2] Updated module to support publishing on unix systems --- pbidevmode/fabricps-pbip/FabricPS-PBIP.psd1 | 2 +- pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pbidevmode/fabricps-pbip/FabricPS-PBIP.psd1 b/pbidevmode/fabricps-pbip/FabricPS-PBIP.psd1 index 69eb6226..c4094fe9 100644 --- a/pbidevmode/fabricps-pbip/FabricPS-PBIP.psd1 +++ b/pbidevmode/fabricps-pbip/FabricPS-PBIP.psd1 @@ -5,7 +5,7 @@ RootModule = 'FabricPS-PBIP.psm1' # Version number of this module. -ModuleVersion = '0.1' +ModuleVersion = '0.2' # Supported PSEditions CompatiblePSEditions = @("Core") diff --git a/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 b/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 index 7367f5fe..e45fd95e 100644 --- a/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 +++ b/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 @@ -753,7 +753,15 @@ Function Import-FabricItems { } } - $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("\").Replace("\", "/") + $os = uname -s + + if ($os -eq "Darwin" || $os -eq "Linux") { + $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("/").Replace("\", "/") + } + else { + $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("\").Replace("\", "/") + } + $fileEncodedContent = ($fileContent) ? [Convert]::ToBase64String($fileContent) : "" From ed4e7953948ff34be1105a4d1dae0c52646cbe27 Mon Sep 17 00:00:00 2001 From: Jackson Myers Date: Tue, 17 Sep 2024 11:50:42 -0500 Subject: [PATCH 2/2] Tested solution for MacOS, Linux, and Windows --- pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 b/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 index e45fd95e..6b48e1be 100644 --- a/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 +++ b/pbidevmode/fabricps-pbip/FabricPS-PBIP.psm1 @@ -753,15 +753,12 @@ Function Import-FabricItems { } } - $os = uname -s - - if ($os -eq "Darwin" || $os -eq "Linux") { - $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("/").Replace("\", "/") + if ($IsWindows) { + $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("\").Replace("\", "/") } else { - $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("\").Replace("\", "/") + $partPath = $filePath.Replace($itemPathAbs, "").TrimStart("/") } - $fileEncodedContent = ($fileContent) ? [Convert]::ToBase64String($fileContent) : ""