maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add .NET install workaround for RTM (#13991)

Browse source
This commit is contained in:
Aditya Patwardhan 2020-11-05 16:34:51 -08:00 committed by GitHub
parent 05f274898d
commit 40549c3585
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/releaseBuild/azureDevOps/templates/nuget.yml
View file

@ -34,6 +34,13 @@ jobs:
displayName: 'Use .NET Core SDK from global.json'
inputs:
version: '$(SDKVersion)'
condition: ne(variables['SDKVersion'], '5.0.100')
- pwsh: |
Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
Install-Dotnet -Version '5.0.100-rtm.20526.5'
displayName: Install-DotNet
condition: eq(variables['SDKVersion'], '5.0.100')
- task: DownloadBuildArtifacts@0
displayName: 'Download PowerShell build artifacts'
@ -92,6 +99,7 @@ jobs:
- powershell: |
Import-Module $env:BUILD_SOURCESDIRECTORY\build.psm1
Import-Module $env:BUILD_SOURCESDIRECTORY\tools\packaging
Find-Dotnet
New-ILNugetPackage -PackagePath "$(PackagePath)" -PackageVersion "$(Version)" -WinFxdBinPath '$(winFxdPath)' -LinuxFxdBinPath '$(linuxFxdPath)' -GenAPIToolPath "$(GenAPIToolPath)"
displayName: 'Create Nuget Package Folders'
@ -104,7 +112,7 @@ jobs:
- powershell: |
Import-Module $env:BUILD_SOURCESDIRECTORY\build.psm1
Import-Module $env:BUILD_SOURCESDIRECTORY\tools\packaging
Find-Dotnet
# Create unified package first
New-GlobalToolNupkg -UnifiedPackage -LinuxBinPath "$(linuxFxdPath)" -WindowsBinPath "$(winFxdPath)" -WindowsDesktopBinPath "$(winFxdWinDesktopPath)" -PackageVersion "$(Version)" -DestinationPath "$(PackagePath)\globaltool"

3
tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
View file

@ -53,7 +53,8 @@ jobs:
## Install latest version from the channel
Install-Dotnet -Channel "$Channel" -Version $sdkVersion
#Install-Dotnet -Channel "$Channel" -Version $sdkVersion
Start-PSBootstrap
Write-Verbose -Message "Installing .NET SDK completed." -Verbose

3
tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
View file

@ -41,7 +41,8 @@ jobs:
## Install latest version from the channel
Install-Dotnet -Channel "$Channel" -Version $sdkVersion
#Install-Dotnet -Channel "$Channel" -Version $sdkVersion
Start-PSBootstrap
Write-Verbose -Message "Installing .NET SDK completed." -Verbose