File tree Expand file tree Collapse file tree 5 files changed +11
-6
lines changed
Expand file tree Collapse file tree 5 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -113,8 +113,12 @@ jobs:
113113 parameters :
114114 ${{ if parameters.isArm64 }} :
115115 architecture : arm64
116+ # ARM64 needs to specify slightly different runtime version formats.
117+ # See the install-dotnet template docs for more info.
118+ runtimes : ['8.0', '9.0']
119+ ${{ else }} :
120+ runtimes : [8.x, 9.x]
116121 debug : ${{ parameters.debug }}
117- runtimes : ['8.x', '9.x']
118122
119123 - ${{ if ne(parameters.prebuildSteps, '') }} :
120124 - ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
@@ -280,7 +284,7 @@ jobs:
280284 architecture : x86
281285 debug : ${{ parameters.debug }}
282286 installDir : $(dotnetx86RootPath)
283- runtimes : [' 8.x', ' 9.x' ]
287+ runtimes : [8.x, 9.x]
284288
285289 - template : ../steps/run-all-tests-step.yml@self
286290 parameters :
Original file line number Diff line number Diff line change 77 # Install the .NET SDK and Runtimes.
88 - template : /eng/pipelines/steps/install-dotnet.yml@self
99 parameters :
10- runtimes : ['8.0', '9.0' ]
10+ runtimes : [8.x, 9.x ]
1111
1212 - script : SET
1313 displayName : ' Print Environment Variables'
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ jobs:
134134 # Install the .NET SDK and Runtimes.
135135 - template : /eng/pipelines/steps/install-dotnet.yml@self
136136 parameters :
137- runtimes : [' 8.x', ' 9.x' ]
137+ runtimes : [8.x, 9.x]
138138
139139 # Download the pipeline artifact that contains the MDS package to test.
140140 - task : DownloadPipelineArtifact@2
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ if ($Debug)
6565}
6666
6767# ------------------------------------------------------------------------------
68- # Download the dotnet-install.ps1 script it if isn't already present.
68+ # Download the dotnet-install.ps1 script if it isn't already present.
6969
7070if (-not (Test-Path - Path " $InstallDir /dotnet-install.ps1" - PathType Leaf))
7171{
@@ -116,6 +116,7 @@ if ($Debug)
116116}
117117
118118& ./ dotnet- install.ps1 - Verbose:$Debug - DryRun:$DryRun @installParams
119+
119120# ------------------------------------------------------------------------------
120121# Install the Runtimes, if any.
121122
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ parameters:
3737 # The list of .NET Runtimes to install, if any.
3838 #
3939 # When architecture is arm64, these must adhere to the format expected by the
40- # dotnet-install.ps1 script:
40+ # dotnet-install.ps1 script's -Channel option :
4141 #
4242 # https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
4343 #
You can’t perform that action at this time.
0 commit comments