Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion PSUtil/PSUtil.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Version number of this module.

ModuleVersion = '2.2.35'
ModuleVersion = '2.2.38'

# ID used to uniquely identify this module
GUID = '9ef51588-c40c-4064-910d-9b624b758cf6'
Expand Down
2 changes: 1 addition & 1 deletion PSUtil/functions/explorer/Backup-PSULocation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
$Levels = (Get-PSFConfigValue -FullName 'PSUtil.Path.BackupStepsDefault' -Fallback 1)
)

Set-Location -Path (,".." * $Levels | Join-String -With ([System.IO.Path]::DirectorySeparatorChar))
Set-Location -Path (,".." * $Levels | Join-String -Separator ([System.IO.Path]::DirectorySeparatorChar))
}

Import-PSUAlias -Name "bu" -Command "Backup-PSULocation"
12 changes: 12 additions & 0 deletions build/psf-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ param (
$WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY
)

#region Handle Working Directory Defaults
if (-not $WorkingDirectory)
{
if ($env:RELEASE_PRIMARYARTIFACTSOURCEALIAS)
{
$WorkingDirectory = Join-Path -Path $env:SYSTEM_DEFAULTWORKINGDIRECTORY -ChildPath $env:RELEASE_PRIMARYARTIFACTSOURCEALIAS
}
else { $WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY }
}
if (-not $WorkingDirectory) { $WorkingDirectory = Split-Path $PSScriptRoot }
#endregion Handle Working Directory Defaults

# Prepare publish folder
Write-PSFMessage -Level Important -Message "Creating and populating publishing directory"
$publishDir = New-Item -Path $WorkingDirectory -Name publish -ItemType Directory -Force
Expand Down
15 changes: 14 additions & 1 deletion build/vsts-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,22 @@ param (
$WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY
)

#region Handle Working Directory Defaults
if (-not $WorkingDirectory)
{
if ($env:RELEASE_PRIMARYARTIFACTSOURCEALIAS)
{
$WorkingDirectory = Join-Path -Path $env:SYSTEM_DEFAULTWORKINGDIRECTORY -ChildPath $env:RELEASE_PRIMARYARTIFACTSOURCEALIAS
}
else { $WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY }
}
if (-not $WorkingDirectory) { $WorkingDirectory = Split-Path $PSScriptRoot }
#endregion Handle Working Directory Defaults

# Prepare publish folder
Write-PSFMessage -Level Important -Message "Creating and populating publishing directory"
$publishDir = New-Item -Path $WorkingDirectory -Name publish -ItemType Directory
$publishDir = New-Item -Path $WorkingDirectory -Name publish -ItemType Directory -Force
Remove-Item -Path "$publishDir\*" -Recurse -Force -ErrorAction SilentlyContinue
Copy-Item -Path "$($WorkingDirectory)\PSUtil" -Destination $publishDir.FullName -Recurse -Force

#region Gather text data to compile
Expand Down