Skip to content

Fix issues in release build #16332

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

Merged
adityapatwardhan merged 4 commits into from
Oct 29, 2021
Merged

Fix issues in release build #16332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca8bd3a
Change powershell to pwsh in release build
adityapatwardhan Oct 29, 2021
1be0098
Change to pwsh in nuget stage
adityapatwardhan Oct 29, 2021
90e4078
Check files before deleting
adityapatwardhan Oct 29, 2021
2a81d6e
Update TSA upload task
adityapatwardhan Oct 29, 2021
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
12 changes: 10 additions & 2 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3882,8 +3882,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
Expand Down
7 changes: 4 additions & 3 deletions tools/releaseBuild/azureDevOps/templates/compliance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,16 @@ 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
uploadBinSkim: false
uploadTSLint: false
uploadCredScan: false
uploadPoliCheck: false

- task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
displayName: 'Create Security Analysis Report'
Expand Down
12 changes: 6 additions & 6 deletions tools/releaseBuild/azureDevOps/templates/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
parameters:
repoRoot: $(PowerShellRoot)

- powershell: |
- pwsh: |

$runtime = switch ($env:Architecture)
{
Expand All @@ -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)
Expand Down