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
17 changes: 13 additions & 4 deletions build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,10 @@ function Get-PesterTag {

function Publish-PSTestTools {
[CmdletBinding()]
param()
param(
[string]
$runtime
)

Find-Dotnet

Expand All @@ -859,7 +862,12 @@ function Publish-PSTestTools {
{
Push-Location $tool.Path
try {
dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
if (-not $runtime) {
dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
} else {
dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $runtime
}

$toolPath = Join-Path -Path $tool.Path -ChildPath "bin"

if ( -not $env:PATH.Contains($toolPath) ) {
Expand Down Expand Up @@ -2974,7 +2982,8 @@ function New-TestPackage
[CmdletBinding()]
param(
[Parameter(Mandatory = $true)]
[string] $Destination
[string] $Destination,
[string] $Runtime
)

if (Test-Path $Destination -PathType Leaf)
Expand Down Expand Up @@ -3002,7 +3011,7 @@ function New-TestPackage
Write-Verbose -Verbose "PackagePath: $packagePath"

# Build test tools so they are placed in appropriate folders under 'test' then copy to package root.
$null = Publish-PSTestTools
$null = Publish-PSTestTools -runtime $Runtime
$powerShellTestRoot = Join-Path $PSScriptRoot 'test'
Copy-Item $powerShellTestRoot -Recurse -Destination $packageRoot -Force
Write-Verbose -Message "Copied test directory"
Expand Down
2 changes: 2 additions & 0 deletions tools/releaseBuild/azureDevOps/diagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ folder "Package Signing and Upload" as PkgSignUpload {
folder "Build Test Artifacts" as TestArtifacts {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add TestArtifacts to start and finish?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It already is connected to start and finish.

agent "Windows" as WinTest
agent "Linux" as LinuxTest
agent "Linux-ARM" as LinuxArmTest
agent "Linux-ARM64" as LinuxArm64Test
}

agent "Compliance" as Compliance
Expand Down
Loading