Skip to content

Commit 8c2cd30

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade, dotnet/sdk, dotnet/source-build-externals (#1229)
* Update dependencies from https://github.com/dotnet/arcade build 20250417.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25212.1 -> To Version 10.0.0-beta.25217.1 * Update dependencies from https://github.com/dotnet/sdk build 20250420.1 Microsoft.DotNet.GenAPI.Task From Version 10.0.100-preview.4.25211.22 -> To Version 10.0.100-preview.4.25220.1 * Update dependencies from https://github.com/dotnet/source-build-externals build 20250414.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 10.0.620701 -> To Version 10.0.621401 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 2228b45 commit 8c2cd30

File tree

7 files changed

+33
-38
lines changed

7 files changed

+33
-38
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
<Dependencies>
33
<ToolsetDependencies>
44
<!-- Intermediate is necessary for source build. -->
5-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.620701">
5+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.621401">
66
<Uri>https://github.com/dotnet/source-build-externals</Uri>
7-
<Sha>ebe6fe9cc5b8b9c87cb218b35514bf9d04475047</Sha>
7+
<Sha>d64d8da45618323a39fb77860d1140bdbcd506ad</Sha>
88
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
99
</Dependency>
1010
<!-- Intermediate is necessary for source build. -->
11-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25212.1">
11+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25217.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
13+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25212.1">
16+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
18+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.4.25211.22">
20+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.4.25220.1">
2121
<Uri>https://github.com/dotnet/sdk</Uri>
22-
<Sha>a081488f32ee97b730ac15197a1b0044a89a3995</Sha>
22+
<Sha>f4de547215d995985f21f195b29909d8569bcf46</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
2525
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
1717
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
1818
<!-- SDK dependencies -->
19-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.4.25211.22</MicrosoftDotNetGenAPITaskPackageVersion>
19+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.4.25220.1</MicrosoftDotNetGenAPITaskPackageVersion>
2020
<!-- xUnit dependencies -->
2121
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
2222
</PropertyGroup>

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
# Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
2828
publishAssetsImmediately: false
2929

30+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
31+
isAssetlessBuild: false
32+
3033
# Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
3134
artifactsPublishingAdditionalParameters: ''
3235
signingValidationAdditionalParameters: ''
@@ -110,6 +113,7 @@ jobs:
110113

111114
runAsPublic: ${{ parameters.runAsPublic }}
112115
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
116+
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
113117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
114118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
115119
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)