Skip to content

Extend #3907's fix of module import error to Linux #5260

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

Open
NoelTautges wants to merge 7 commits into
base: dev
Choose a base branch
from
+31 −59
Open

Extend #3907's fix of module import error to Linux #5260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9522c10
Fix capitalization of `$IsMacOS`
NoelTautges Mar 4, 2026
709cce9
Remove extraneous semicolons
NoelTautges Mar 4, 2026
b6ffad2
Skip duplicate finding of destination path while building
NoelTautges Mar 4, 2026
a9de99c
Remove extraneous semicolons
NoelTautges Mar 4, 2026
0632bb6
Deduplicate finding destination folder and fix destination folder in …
NoelTautges Mar 4, 2026
04647a0
Correct relative paths in nightly build script
NoelTautges Mar 4, 2026
8e675cb
Move `mydocuments` environment variable to Windows-only path
NoelTautges Mar 4, 2026
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
36 changes: 12 additions & 24 deletions build/Build-Debug.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@ $env:PnPFrameworkPath = ""
$versionFileContents = Get-Content "$PSScriptRoot/../version.json" -Raw | ConvertFrom-Json

if ($versionFileContents.Version.Contains("%")) {
$versionString = $versionFileContents.Version.Replace("%", "0");
$versionString = $versionFileContents.Version.Replace("%", "0")
$versionObject = [System.Management.Automation.SemanticVersion]::Parse($versionString)
$buildVersion = $versionObject.Patch;
$buildVersion = $versionObject.Patch
}
else {
$versionObject = [System.Management.Automation.SemanticVersion]::Parse($versionFileContents.Version)
$buildVersion = $versionObject.Patch + 1;
$buildVersion = $versionObject.Patch + 1
}

# $versionFileContents = Get-Content "$PSScriptRoot/../version.txt" -Raw
# if ($versionFileContents.Contains("%")) {
# $versionString = $versionFileContents.Replace("%", "0");
# $versionString = $versionFileContents.Replace("%", "0")
# $versionObject = [System.Management.Automation.SemanticVersion]::Parse($versionString)
# $buildVersion = $versionObject.Patch;
# $buildVersion = $versionObject.Patch
# }
# else {
# $versionObject = [System.Management.Automation.SemanticVersion]::Parse($versionFileContents)
# $buildVersion = $versionObject.Patch + 1;
# $buildVersion = $versionObject.Patch + 1
# }

$configuration = "net8.0"
Expand All @@ -53,9 +53,9 @@ $version = "$($versionObject.Major).$($versionObject.Minor).$buildVersion"

Write-Host "Building PnP.PowerShell version $version-debug" -ForegroundColor Yellow

$buildCmd = "dotnet build `"$PSScriptRoot/../src/Commands/PnP.PowerShell.csproj`" --nologo --configuration Debug -p:VersionPrefix=$version -p:VersionSuffix=debug";
$buildCmd = "dotnet build `"$PSScriptRoot/../src/Commands/PnP.PowerShell.csproj`" --nologo --configuration Debug -p:VersionPrefix=$version -p:VersionSuffix=debug"
if ($NoIncremental) {
$buildCmd += " --no-incremental";
$buildCmd += " --no-incremental"
}
if ($Force) {
$buildCmd += " --force"
Expand Down Expand Up @@ -95,19 +95,18 @@ Write-Host "Executing $buildCmd" -ForegroundColor Yellow
Invoke-Expression $buildCmd

if ($LASTEXITCODE -eq 0) {
$documentsFolder = [environment]::getfolderpath("mydocuments");

if ($IsLinux -or $isMacOS) {
if ($IsLinux -or $IsMacOS) {
$destinationFolder = "$HOME/.local/share/powershell/Modules/PnP.PowerShell"
}
else {
$documentsFolder = [environment]::getfolderpath("mydocuments")
$destinationFolder = "$documentsFolder/PowerShell/Modules/PnP.PowerShell"
}

$corePath = "$destinationFolder/Core"
$commonPath = "$destinationFolder/Common"

$assemblyExceptions = @("System.Memory.dll");
$assemblyExceptions = @("System.Memory.dll")

Try {
# Module folder there?
Expand Down Expand Up @@ -146,19 +145,8 @@ if ($LASTEXITCODE -eq 0) {
Write-Host "Generating PnP.PowerShell.psd1" -ForegroundColor Yellow
# Load the Module in a new PowerShell session
$scriptBlock = {
$documentsFolder = [environment]::getfolderpath("mydocuments");

if ($IsLinux) {
$destinationFolder = "$documentsFolder/.local/share/powershell/Modules/PnP.PowerShell"
}
elseif ($IsMacOS) {
$destinationFolder = "~/.local/share/powershell/Modules/PnP.PowerShell"
}
else {
$destinationFolder = "$documentsFolder/PowerShell/Modules/PnP.PowerShell"
}
Write-Host "Importing dotnet core version of assembly"
Import-Module -Name "$destinationFolder/Core/PnP.PowerShell.dll" -DisableNameChecking
Import-Module -Name "$using:destinationFolder/Core/PnP.PowerShell.dll" -DisableNameChecking
$cmdlets = Get-Command -Module PnP.PowerShell | ForEach-Object { "`"$_`"" }
$cmdlets -Join ","
}
Expand Down
2 changes: 1 addition & 1 deletion build/Build-HelpFile.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$documentsFolder = [environment]::getfolderpath("mydocuments")
if($IsLinux -or $isMacOS)
if($IsLinux -or $IsMacOS)
{
$destinationFolder = "$HOME/.local/share/powershell/Modules"
} else {
Expand Down
52 changes: 18 additions & 34 deletions build/Build-Nightly.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ $runPublish = $false

$dependencies = Invoke-RestMethod -Method Get -Uri https://raw.githubusercontent.com/pnp/powershell/dev/dependencies.json

$pnppowershell_hash = git ls-files -s ./src | git hash-object --stdin
#$existing_pnppowershell_hash = Get-Content ./pnppowershell_hash.txt -Raw -ErrorAction SilentlyContinue
$pnppowershell_hash = git ls-files -s "$PSScriptRoot/../src" | git hash-object --stdin
#$existing_pnppowershell_hash = Get-Content "$PSScriptRoot/../pnppowershell_hash.txt" -Raw -ErrorAction SilentlyContinue

#$existing_pnpframework_hash = Get-Content ./pnpframework_hash.txt -Raw -ErrorAction SilentlyContinue
#$existing_pnpframework_hash = Get-Content "$PSScriptRoot/../pnpframework_hash.txt" -Raw -ErrorAction SilentlyContinue
$pnpframework_response = Invoke-RestMethod -Method Get -Uri "$($env:GITHUB_API_URL)/repos/pnp/pnpframework/branches/dev" -SkipHttpErrorCheck
if ($null -ne $pnpframework_response) {
if ($null -ne $pnpframework_response.commit) {
$pnpframework_hash = $pnpframework_response.commit.sha
}
}

#$existing_pnpcoresdk_hash = Get-Content ./pnpcoresdk_hash.txt -Raw -ErrorAction SilentlyContinue
#$existing_pnpcoresdk_hash = Get-Content "$PSScriptRoot/../pnpcoresdk_hash.txt" -Raw -ErrorAction SilentlyContinue
$pnpcoresdk_response = Invoke-RestMethod -Method Get -Uri "$($env:GITHUB_API_URL)/repos/pnp/pnpcore/branches/dev" -SkipHttpErrorCheck
if ($null -ne $pnpcoresdk_response) {
if ($null -ne $pnpcoresdk_response.commit) {
Expand Down Expand Up @@ -42,18 +42,18 @@ if ($runPublish -eq $true) {
$dependencies.PnPFramework = $pnpframework_hash
$dependencies.PnPPowershell = $pnppowershell_hash

Set-Content ./dependencies.json -Value $(ConvertTo-Json $dependencies) -Force
Set-Content "$PSScriptRoot/../dependencies.json" -Value $(ConvertTo-Json $dependencies) -Force

$versionFileContents = Get-Content "$PSScriptRoot/../version.json" -Raw | ConvertFrom-Json

if ($versionFileContents.Version.Contains("%")) {
$versionString = $versionFileContents.Version.Replace("%", "0");
$versionString = $versionFileContents.Version.Replace("%", "0")
$versionObject = [System.Management.Automation.SemanticVersion]::Parse($versionString)
$buildVersion = $versionObject.Patch;
$buildVersion = $versionObject.Patch
}
else {
$versionObject = [System.Management.Automation.SemanticVersion]::Parse($versionFileContents.Version)
$buildVersion = $versionObject.Patch + 1;
$buildVersion = $versionObject.Patch + 1
}

$version = "$($versionObject.Major).$($versionObject.Minor).$buildVersion"
Expand All @@ -70,19 +70,14 @@ if ($runPublish -eq $true) {
exit 1# Do not proceed.
}

dotnet build ./src/Commands/PnP.PowerShell.csproj --nologo --configuration Release --no-incremental -p:VersionPrefix=$version -p:VersionSuffix=nightly
dotnet build "$PSScriptRoot/../src/Commands/PnP.PowerShell.csproj" --nologo --configuration Release --no-incremental -p:VersionPrefix=$version -p:VersionSuffix=nightly

$documentsFolder = [environment]::getfolderpath("mydocuments");

if ($IsLinux) {
$destinationFolder = "$documentsFolder/.local/share/powershell/Modules/PnP.PowerShell"
$helpfileDestinationFolder = "$documentsFolder/.local/share/powershell/Modules"
}
elseif ($IsMacOS) {
if ($IsLinux -or $IsMacOS) {
$destinationFolder = "$HOME/.local/share/powershell/Modules/PnP.PowerShell"
$helpfileDestinationFolder = "$HOME/.local/share/powershell/Modules"
}
else {
$documentsFolder = [environment]::getfolderpath("mydocuments")
$destinationFolder = "$documentsFolder/PowerShell/Modules/PnP.PowerShell"
$helpfileDestinationFolder = "$documentsFolder/PowerShell/Modules"
}
Expand All @@ -94,7 +89,7 @@ if ($runPublish -eq $true) {
$coreRuntimePathx86 = "$destinationFolder/Core/runtimes/win-x86/native"
$coreRuntimePathLinx64 = "$destinationFolder/Core/runtimes/linux-x64/native"

$assemblyExceptions = @("System.Memory.dll");
$assemblyExceptions = @("System.Memory.dll")

Try {
# Module folder there?
Expand Down Expand Up @@ -168,19 +163,8 @@ if ($runPublish -eq $true) {
Write-Host "Generating PnP.PowerShell.psd1" -ForegroundColor Yellow
# Load the Module in a new PowerShell session
$scriptBlock = {
$documentsFolder = [environment]::getfolderpath("mydocuments");

if ($IsLinux) {
$destinationFolder = "$documentsFolder/.local/share/powershell/Modules/PnP.PowerShell"
}
elseif ($IsMacOS) {
$destinationFolder = "~/.local/share/powershell/Modules/PnP.PowerShell"
}
else {
$destinationFolder = "$documentsFolder/PowerShell/Modules/PnP.PowerShell"
}
Write-Host "Importing dotnet core version of assembly" -ForegroundColor Yellow
Import-Module -Name "$destinationFolder/Core/PnP.PowerShell.dll" -DisableNameChecking
Import-Module -Name "$using:destinationFolder/Core/PnP.PowerShell.dll" -DisableNameChecking

Write-Host "Getting cmdlet info" -ForegroundColor Yellow
$cmdlets = Get-Command -Module PnP.PowerShell | ForEach-Object { "`"$_`"" }
Expand Down Expand Up @@ -223,16 +207,16 @@ if ($runPublish -eq $true) {
}

# Generate predictor commands
./build/Generate-PredictorCommands.ps1 -Version "nightly"
Generate-PredictorCommands.ps1 -Version "nightly"

Write-Host "Generating Documentation" -ForegroundColor Yellow
Set-PSRepository PSGallery -InstallationPolicy Trusted
Install-Module -Name Microsoft.PowerShell.PlatyPS -AllowPrerelease -RequiredVersion 1.0.0-preview1
Write-Host "Generating external help"
$mdFiles = Measure-PlatyPSMarkdown -Path ./documentation/*.md
$mdFiles = Measure-PlatyPSMarkdown -Path "$PSScriptRoot/../documentation/*.md"
$mdFiles | Import-MarkdownCommandHelp -Path {$_.FilePath} | Export-MamlCommandHelp -OutputFolder $helpfileDestinationFolder -Force
# Install-Module Microsoft.PlatyPS -ErrorAction Stop
# New-ExternalHelp -Path ./documentation -OutputPath $destinationFolder -Force
# New-ExternalHelp -Path "$PSScriptRoot/../documentation" -OutputPath $destinationFolder -Force

$apiKey = $("$env:POWERSHELLGALLERY_API_KEY")

Expand All @@ -241,11 +225,11 @@ if ($runPublish -eq $true) {
Publish-Module -Name PnP.PowerShell -AllowPrerelease -NuGetApiKey $apiKey

# Write version back to version
Set-Content ./version.txt -Value $version -Force -NoNewline
Set-Content "$PSScriptRoot/../version.txt" -Value $version -Force -NoNewline

# Write version back to version.json
$json = @{Version = "$version"; Message = "" } | ConvertTo-Json
Set-Content ./version.json -Value $json -Force -NoNewline
Set-Content "$PSScriptRoot/../version.json" -Value $json -Force -NoNewline
}
else {
Write-Host "No changes in PnP PowerShell, PnP Framework or PnP Core SDK. Exiting." -ForegroundColor Green
Expand Down
Loading