Skip to content

Commit 8ce401d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230505.2 (#5144)
[main] Update dependencies from dotnet/arcade
1 parent ade3a23 commit 8ce401d

File tree

5 files changed

+71
-23
lines changed

5 files changed

+71
-23
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23255.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23255.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>94d40fc8f3d17444772d90db73469d795a68a421</Sha>
9+
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23255.1">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23255.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>94d40fc8f3d17444772d90db73469d795a68a421</Sha>
13+
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23255.1">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23255.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>94d40fc8f3d17444772d90db73469d795a68a421</Sha>
17+
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23255.1">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23255.2">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>94d40fc8f3d17444772d90db73469d795a68a421</Sha>
21+
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23255.1">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23255.2">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>94d40fc8f3d17444772d90db73469d795a68a421</Sha>
25+
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</PropertyGroup>
2424
<!-- Arcade dependencies -->
2525
<PropertyGroup>
26-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23255.1</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23255.1</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23255.1</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23255.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23255.1</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23255.2</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23255.2</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23255.2</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23255.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23255.2</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

‎eng/common/tools.ps1

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,25 @@ function InstallDotNet([string] $dotnetRoot,
287287
[string] $runtimeSourceFeedKey = '',
288288
[switch] $noPath) {
289289

290+
$dotnetVersionLabel = "'sdk v$version'"
291+
292+
if ($runtime -ne '' -and $runtime -ne 'sdk') {
293+
$runtimePath = $dotnetRoot
294+
$runtimePath = $runtimePath + "\shared"
295+
if ($runtime -eq "dotnet") { $runtimePath = $runtimePath + "\Microsoft.NETCore.App" }
296+
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
297+
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
298+
$runtimePath = $runtimePath + "\" + $version
299+
300+
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
301+
302+
if (Test-Path $runtimePath) {
303+
Write-Host " Runtime toolset '$runtime/$architecture v$version' already installed."
304+
$installSuccess = $true
305+
Exit
306+
}
307+
}
308+
290309
$installScript = GetDotNetInstallScript $dotnetRoot
291310
$installParameters = @{
292311
Version = $version
@@ -323,18 +342,18 @@ function InstallDotNet([string] $dotnetRoot,
323342
} else {
324343
$location = "public location";
325344
}
326-
Write-Host "Attempting to install dotnet from $location."
345+
Write-Host " Attempting to install $dotnetVersionLabel from $location."
327346
try {
328347
& $installScript @variation
329348
$installSuccess = $true
330349
break
331350
}
332351
catch {
333-
Write-Host "Failed to install dotnet from $location."
352+
Write-Host " Failed to install $dotnetVersionLabel from $location."
334353
}
335354
}
336355
if (-not $installSuccess) {
337-
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
356+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install $dotnetVersionLabel from any of the specified locations."
338357
ExitWithExitCode 1
339358
}
340359
}

‎eng/common/tools.sh

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,35 @@ function InstallDotNetSdk {
184184
function InstallDotNet {
185185
local root=$1
186186
local version=$2
187+
local runtime=$4
188+
189+
local dotnetVersionLabel="'$runtime v$version'"
190+
if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
191+
runtimePath="$root"
192+
runtimePath="$runtimePath/shared"
193+
case "$runtime" in
194+
dotnet)
195+
runtimePath="$runtimePath/Microsoft.NETCore.App"
196+
;;
197+
aspnetcore)
198+
runtimePath="$runtimePath/Microsoft.AspNetCore.App"
199+
;;
200+
windowsdesktop)
201+
runtimePath="$runtimePath/Microsoft.WindowsDesktop.App"
202+
;;
203+
*)
204+
;;
205+
esac
206+
runtimePath="$runtimePath/$version"
207+
208+
dotnetVersionLabel="runtime toolset '$runtime/$architecture v$version'"
209+
210+
if [ -d "$runtimePath" ]; then
211+
echo " Runtime toolset '$runtime/$architecture v$version' already installed."
212+
local installSuccess=1
213+
return
214+
fi
215+
fi
187216

188217
GetDotNetInstallScript "$root"
189218
local install_script=$_GetDotNetInstallScript
@@ -228,17 +257,17 @@ function InstallDotNet {
228257
for variationName in "${variations[@]}"; do
229258
local name="$variationName[@]"
230259
local variation=("${!name}")
231-
echo "Attempting to install dotnet from $variationName."
260+
echo " Attempting to install $dotnetVersionLabel from $variationName."
232261
bash "$install_script" "${variation[@]}" && installSuccess=1
233262
if [[ "$installSuccess" -eq 1 ]]; then
234263
break
235264
fi
236265

237-
echo "Failed to install dotnet from $variationName."
266+
echo " Failed to install $dotnetVersionLabel from $variationName."
238267
done
239268

240269
if [[ "$installSuccess" -eq 0 ]]; then
241-
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
270+
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install $dotnetVersionLabel from any of the specified locations."
242271
ExitWithExitCode 1
243272
fi
244273
}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": "8.0.100-preview.3.23178.7"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23255.1",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.1"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23255.2",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
1818
}
1919
}

0 commit comments

Comments
 (0)