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
10 changes: 9 additions & 1 deletion tools/releaseBuild/azureDevOps/templates/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'

Expand All @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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

Expand Down