Commit e1a4a41
committed
[xabuild] Probe DOTNET_ROOT for .NET sdks
Context: dotnet#4467
Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=3590265&view=logs&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=7b19ceb3-907a-5a0d-b8ed-87e3f7335a58
When trying to integration test dotnet/java-interop#614, the
`make all-tests` job fails:
/usr/local/share/dotnet/sdk/2.2.402/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.TargetFrameworkInference.targets(137,5):
error NETSDK1045: The current .NET SDK does not support targeting .NET Core 3.1. Either target .NET Core 2.2 or lower, or use a version of the .NET SDK that supports .NET Core 3.1.
[/Users/builder/azdo/_work/2/s/xamarin-android/external/Java.Interop/src/Java.Interop/Java.Interop.csproj]
Particularly odd about this is that we have an explicit job to install
.NET Core 3.1.100, so why is .NET Core 2.2.402 being used at all?!
Turns Out™ that while .NET Core 3.1.100 was installed, it was
installed *into a different prefix*; from the
`install .NET Core 3.1.100` job:
##[debug]set DOTNET_ROOT=/Users/builder/azdo/_work/_tool/dotnet
and from the `make jenkins` job output:
DOTNET_ROOT = /Users/builder/azdo/_work/_tool/dotnet
Thus, the `install .NET Core 3.1.100` job is installing .NET Core into
`$HOME/azdo/_work/_tool/dotnet`, while `make all-tests` is only
looking for .NET Core SDKs within `/usr/local/share/dotnet`, which
does *not* contain .NET Core 3.1 at all.
Where does the `make all-tests` path come from? It comes from
`tools/xabuild`, which sets the `MSBuildSDKsPath` environment
variable, and `xabuild` did not check `$DOTNET_ROOT`.
Update `xabuild` so that `$DOTNET_ROOT` is also probed for .NET Core
installation directories, and use the *latest* .NET Core SDK path
found between `$DOTNET_ROOT` and `/usr/local/share/dotnet`.1 parent 6e769fa commit e1a4a41
1 file changed
Lines changed: 13 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
145 | 148 | | |
146 | 149 | | |
147 | 150 | | |
148 | 151 | | |
149 | 152 | | |
150 | 153 | | |
151 | 154 | | |
152 | | - | |
| 155 | + | |
153 | 156 | | |
154 | 157 | | |
155 | 158 | | |
| |||
184 | 187 | | |
185 | 188 | | |
186 | 189 | | |
187 | | - | |
| 190 | + | |
188 | 191 | | |
189 | 192 | | |
190 | 193 | | |
| |||
291 | 294 | | |
292 | 295 | | |
293 | 296 | | |
294 | | - | |
| 297 | + | |
295 | 298 | | |
296 | | - | |
297 | | - | |
298 | | - | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
299 | 305 | | |
300 | 306 | | |
301 | 307 | | |
| |||
308 | 314 | | |
309 | 315 | | |
310 | 316 | | |
311 | | - | |
312 | 317 | | |
313 | | - | |
| 318 | + | |
314 | 319 | | |
315 | 320 | | |
316 | 321 | | |
| |||
0 commit comments