Skip to content

Commit 24a9fef

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250415.5 (#8116)
[feature/10.0] Update dependencies from dotnet/arcade
1 parent ee5072f commit 24a9fef

File tree

6 files changed

+34
-43
lines changed

6 files changed

+34
-43
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25214.8">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25215.5">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
27+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25214.8">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25215.5">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
31+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25214.8">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25215.5">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
35+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25214.8">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25215.5">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
39+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25214.8">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25215.5">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
43+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25214.8</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25214.8</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25215.5</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25215.5</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25215.5</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25210.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25210.6</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,6 @@ parameters:
1111
steps:
1212
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
1313
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
14-
# Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802
15-
- script: |
16-
version=$(python3 --version | awk '{print $2}')
17-
major=$(echo $version | cut -d. -f1)
18-
minor=$(echo $version | cut -d. -f2)
19-
20-
installPython=false
21-
if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then
22-
installPython=true
23-
fi
24-
25-
echo "Python version: $version."
26-
echo "Install Python 3.12.x: $installPython."
27-
echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython"
28-
name: InstallPython
29-
displayName: 'Determine Python installation'
30-
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
31-
32-
- task: UsePythonVersion@0
33-
inputs:
34-
versionSpec: '3.12.x'
35-
displayName: 'Use Python 3.12.x'
36-
condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT'))
37-
3814
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
3915
- task: UseDotNet@2
4016
displayName: Install .NET 8.0 SDK for MicroBuild Plugin

eng/common/sdk-task.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ Param(
66
[string] $msbuildEngine = $null,
77
[switch] $restore,
88
[switch] $prepareMachine,
9+
[switch][Alias('nobl')]$excludeCIBinaryLog,
910
[switch] $help,
1011
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1112
)
1213

1314
$ci = $true
14-
$binaryLog = $true
15+
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
1516
$warnAsError = $true
1617

1718
. $PSScriptRoot\tools.ps1
@@ -27,17 +28,19 @@ function Print-Usage() {
2728
Write-Host "Advanced settings:"
2829
Write-Host " -prepareMachine Prepare machine for CI run"
2930
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
31+
Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)"
3032
Write-Host ""
3133
Write-Host "Command line arguments not listed above are passed thru to msbuild."
3234
}
3335

3436
function Build([string]$target) {
3537
$logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
3638
$log = Join-Path $LogDir "$task$logSuffix.binlog"
39+
$binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
3740
$outputPath = Join-Path $ToolsetDir "$task\"
3841

3942
MSBuild $taskProject `
40-
/bl:$log `
43+
$binaryLogArg `
4144
/t:$target `
4245
/p:Configuration=$configuration `
4346
/p:RepoRoot=$RepoRoot `

eng/common/sdk-task.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ show_usage() {
77
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
88
echo " --help Print help and exit"
99
echo ""
10+
11+
echo "Advanced settings:"
12+
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo ""
1014
echo "Command line arguments not listed above are passed thru to msbuild."
1115
}
1216

@@ -27,10 +31,12 @@ Build() {
2731
local log_suffix=""
2832
[[ "$target" != "Execute" ]] && log_suffix=".$target"
2933
local log="$log_dir/$task$log_suffix.binlog"
34+
local binaryLogArg=""
35+
[[ $binary_log == true ]] && binaryLogArg="/bl:$log"
3036
local output_path="$toolset_dir/$task/"
3137

3238
MSBuild "$taskProject" \
33-
/bl:"$log" \
39+
$binaryLogArg \
3440
/t:"$target" \
3541
/p:Configuration="$configuration" \
3642
/p:RepoRoot="$repo_root" \
@@ -39,8 +45,10 @@ Build() {
3945
$properties
4046
}
4147

48+
binary_log=true
4249
configuration="Debug"
4350
verbosity="minimal"
51+
exclude_ci_binary_log=false
4452
restore=false
4553
help=false
4654
properties=''
@@ -60,6 +68,11 @@ while (($# > 0)); do
6068
verbosity=$2
6169
shift 2
6270
;;
71+
--excludecibinarylog|--nobl)
72+
binary_log=false
73+
exclude_ci_binary_log=true
74+
shift 1
75+
;;
6376
--help)
6477
help=true
6578
shift 1
@@ -72,7 +85,6 @@ while (($# > 0)); do
7285
done
7386

7487
ci=true
75-
binaryLog=true
7688
warnAsError=true
7789

7890
if $help; then

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25215.5",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25215.5"
3131
}
3232
}

0 commit comments

Comments
 (0)