Skip to content

Commit 67a3830

Browse files
authored
Remove XML files for min-size package (PowerShell#18189)
1 parent 0e4358c commit 67a3830

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

build.psm1

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,14 +1602,14 @@ function Show-PSPesterError
16021602
$description = $testFailure.description
16031603
$name = $testFailure.name
16041604
$message = $testFailure.failure.message
1605-
$StackTrace = $testFailure.failure."stack-trace"
1605+
$stack_trace = $testFailure.failure."stack-trace"
16061606
}
16071607
elseif ($PSCmdlet.ParameterSetName -eq 'object')
16081608
{
16091609
$description = $testFailureObject.Describe + '/' + $testFailureObject.Context
16101610
$name = $testFailureObject.Name
16111611
$message = $testFailureObject.FailureMessage
1612-
$StackTrace = $testFailureObject.StackTrace
1612+
$stack_trace = $testFailureObject.StackTrace
16131613
}
16141614
else
16151615
{
@@ -1621,7 +1621,7 @@ function Show-PSPesterError
16211621
Write-Log -isError -message "message:"
16221622
Write-Log -isError -message $message
16231623
Write-Log -isError -message "stack-trace:"
1624-
Write-Log -isError -message $StackTrace
1624+
Write-Log -isError -message $stack_trace
16251625

16261626
}
16271627

@@ -1659,14 +1659,14 @@ function Test-XUnitTestResults
16591659
$description = $failure.type
16601660
$name = $failure.method
16611661
$message = $failure.failure.message
1662-
$StackTrace = $failure.failure.'stack-trace'
1662+
$stack_trace = $failure.failure.'stack-trace'
16631663

16641664
Write-Log -isError -message ("Description: " + $description)
16651665
Write-Log -isError -message ("Name: " + $name)
16661666
Write-Log -isError -message "message:"
16671667
Write-Log -isError -message $message
16681668
Write-Log -isError -message "stack-trace:"
1669-
Write-Log -isError -message $StackTrace
1669+
Write-Log -isError -message $stack_trace
16701670
Write-Log -isError -message " "
16711671
}
16721672

@@ -2846,7 +2846,6 @@ assembly
28462846
# only create an assembly group if we have tests
28472847
if ( $tCases.count -eq 0 -and ! $includeEmpty ) { continue }
28482848
$tGroup = $tCases | Group-Object result
2849-
$total = $tCases.Count
28502849
$asm = [testassembly]::new()
28512850
$asm.environment = $environment
28522851
$asm."run-date" = $rundate

tools/packaging/packaging.psm1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4587,7 +4587,6 @@ function Invoke-AzDevOpsLinuxPackageBuild {
45874587
# Remove symbol files, xml document files.
45884588
Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force
45894589

4590-
45914590
## Build 'linux-arm' and create 'tar.gz' package for it.
45924591
## Note that 'linux-arm' can only be built on Ubuntu environment.
45934592
$buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${arm32LinuxBuildFolder}"
@@ -4600,14 +4599,14 @@ function Invoke-AzDevOpsLinuxPackageBuild {
46004599
# Remove symbol files.
46014600
Remove-Item "${buildFolder}\*.pdb" -Force
46024601
} elseif ($BuildType -eq 'rpm') {
4603-
## Build 'min-size'
4602+
## Build for Mariner
46044603
$options = Get-PSOptions
4605-
Write-Verbose -Verbose "---- Min-Size ----"
4604+
Write-Verbose -Verbose "---- Mariner ----"
46064605
Write-Verbose -Verbose "options.Output: $($options.Output)"
46074606
Write-Verbose -Verbose "options.Top $($options.Top)"
46084607
$binDir = Join-Path -Path $options.Top -ChildPath 'bin'
46094608
if (Test-Path -Path $binDir) {
4610-
Write-Verbose -Verbose "Remove $binDir, to get a clean build for min-size package"
4609+
Write-Verbose -Verbose "Remove $binDir, to get a clean build for Mariner package"
46114610
Remove-Item -Path $binDir -Recurse -Force
46124611
}
46134612

tools/releaseBuild/azureDevOps/templates/windows-packaging.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ jobs:
202202
$BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
203203
204204
Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
205+
if ($env:BuildConfiguration -eq 'minSize') {
206+
## Remove XML files when making a min-size package.
207+
Remove-Item "$BuildPath/*.xml" -Force
208+
}
205209
displayName: Merge ThirdParty signed files with Build
206210
condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
207211

0 commit comments

Comments
 (0)