Fix issues in release build (#16332)
This commit is contained in:
parent
6b9c3f3bdc
commit
10314b17db
@ -3883,8 +3883,16 @@ function New-GlobalToolNupkg
|
||||
|
||||
$packageInfo = @()
|
||||
|
||||
Remove-Item -Path (Join-Path $LinuxBinPath 'libcrypto.so.1.0.0') -Verbose -Force -Recurse
|
||||
Remove-Item -Path (Join-Path $LinuxBinPath 'libssl.so.1.0.0') -Verbose -Force -Recurse
|
||||
$libCryptoPath = Join-Path $LinuxBinPath 'libcrypto.so.1.0.0'
|
||||
$libSSLPath = Join-Path $LinuxBinPath 'libssl.so.1.0.0'
|
||||
|
||||
if (Test-Path $libCryptoPath) {
|
||||
Remove-Item -Path $libCryptoPath -Verbose -Force
|
||||
}
|
||||
|
||||
if (Test-Path $libSSLPath) {
|
||||
Remove-Item -Path $libSSLPath -Verbose -Force
|
||||
}
|
||||
|
||||
## Remove unnecessary xml files
|
||||
Get-ChildItem -Path $LinuxBinPath, $WindowsBinPath, $WindowsDesktopBinPath -Filter *.xml | Remove-Item -Verbose
|
||||
|
@ -133,9 +133,13 @@ jobs:
|
||||
inputs:
|
||||
tsaVersion: TsaV2
|
||||
codeBaseName: 'PowerShellCore_201906'
|
||||
uploadAPIScan: false
|
||||
uploadBinSkim: true
|
||||
uploadCredScan: false
|
||||
uploadFortifySCA: false
|
||||
uploadFxCop: false
|
||||
uploadModernCop: false
|
||||
uploadPoliCheck: false
|
||||
uploadPREfast: false
|
||||
uploadRoslyn: false
|
||||
uploadTSLint: false
|
||||
|
@ -118,20 +118,20 @@ jobs:
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Install NuGet.exe'
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
Import-Module $env:REPOROOT\build.psm1
|
||||
Import-Module $env:REPOROOT\tools\packaging
|
||||
Find-Dotnet
|
||||
New-ILNugetPackage -PackagePath "$(PackagePath)" -PackageVersion "$(Version)" -WinFxdBinPath '$(winFxdPath)' -LinuxFxdBinPath '$(linuxFxdPath)' -GenAPIToolPath "$(GenAPIToolPath)"
|
||||
displayName: 'Create Nuget Package Folders'
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
Get-ChildItem $(linuxFxdPath)
|
||||
Get-ChildItem $(winFxdPath)
|
||||
Get-ChildItem $(winFxdWinDesktopPath)
|
||||
displayName: Capture fxd folders
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
Import-Module $env:REPOROOT\build.psm1
|
||||
Import-Module $env:REPOROOT\tools\packaging
|
||||
Find-Dotnet
|
||||
@ -142,7 +142,7 @@ jobs:
|
||||
New-GlobalToolNupkg -LinuxBinPath "$(linuxFxdPath)" -WindowsBinPath "$(winFxdPath)" -WindowsDesktopBinPath "$(winFxdWinDesktopPath)" -PackageVersion "$(Version)" -DestinationPath "$(PackagePath)\globaltool"
|
||||
displayName: 'Create Global tool packages'
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
Get-ChildItem "$(PackagePath)" -Recurse
|
||||
displayName: Capture generated packages
|
||||
|
||||
@ -164,7 +164,7 @@ jobs:
|
||||
displayName: Fake copy when not signing
|
||||
condition: eq(variables['SHOULD_SIGN'], 'false')
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
Import-Module "${env:REPOROOT}\build.psm1" -Force
|
||||
Get-ChildItem -Recurse "$(System.ArtifactsDirectory)\signed\*.nupkg" -Verbose | ForEach-Object { Start-NativeExecution -sb { nuget.exe verify -All $_.FullName } }
|
||||
displayName: Verify all packages are signed
|
||||
@ -183,7 +183,7 @@ jobs:
|
||||
parameters:
|
||||
artifactPath: '$(System.ArtifactsDirectory)\signed'
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
if (-not (Test-Path "$(System.ArtifactsDirectory)\signed\globaltool"))
|
||||
{
|
||||
$null = New-Item -Path "$(System.ArtifactsDirectory)\signed\globaltool" -ItemType Directory -Force
|
||||
|
@ -46,7 +46,7 @@ jobs:
|
||||
parameters:
|
||||
repoRoot: $(PowerShellRoot)
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
|
||||
$runtime = switch ($env:Architecture)
|
||||
{
|
||||
@ -66,7 +66,7 @@ jobs:
|
||||
tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -location '$(PowerShellRoot)' -destination '$(Build.ArtifactStagingDirectory)/Symbols_$(Architecture)' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' -Symbols @params
|
||||
displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols zip'
|
||||
|
||||
- powershell: |
|
||||
- pwsh: |
|
||||
$packageName = (Get-ChildItem '$(Build.ArtifactStagingDirectory)\Symbols_$(Architecture)').FullName
|
||||
$vstsCommandString = "vso[artifact.upload containerfolder=results;artifactname=results]$packageName"
|
||||
Write-Host ("sending " + $vstsCommandString)
|
||||
|
Loading…
Reference in New Issue
Block a user