Skip to content

Commit 29cb088

Browse files
dotnet-maestro[bot]marafakoeplinger
authored
Update dependencies from https://github.com/dotnet/arcade build 20250416.2 (#114777)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25214.8 -> To Version 10.0.0-beta.25216.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Marek Fišera <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 2e57030 commit 29cb088

File tree

7 files changed

+81
-86
lines changed

7 files changed

+81
-86
lines changed

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25214.8">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25216.2">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
89+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25214.8">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25216.2">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
94+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25214.8">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25216.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
99+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25214.8">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25216.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
103+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25214.8">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25216.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
107+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25214.8">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25216.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
111+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25214.8">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25216.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
115+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25214.8">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25216.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
119+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25214.8">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25216.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
123+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25214.8">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25216.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
127+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25214.8">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25216.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
131+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25214.8">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25216.2">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
135+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25214.8">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25216.2">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
139+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25214.8">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25216.2">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
143+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25214.8">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25216.2">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
147+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25214.8">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25216.2">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
151+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25214.8">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25216.2">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
155+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25214.8">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25216.2">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
159+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
160160
</Dependency>
161161
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25178.2">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163163
<Sha>7d1967403f5b12406763c666f41e3358bb542ced</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25214.8">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25216.2">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
167+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25215.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>3195dcce969c29fc109081c31d68622f5ce6de06</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25214.8">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25216.2">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
353+
<Sha>85aaca76f75b109aa45b9e949f4a1c9047725d09</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25216.3">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.4.25211.22</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25214.8</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25214.8</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25214.8</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25214.8</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25214.8</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25214.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25214.8</MicrosoftDotNetRemoteExecutorVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25216.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25216.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25216.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25216.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25216.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25216.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25216.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25216.2</MicrosoftDotNetRemoteExecutorVersion>
102102
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25178.2</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25214.8</MicrosoftDotNetPackageTestingVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25216.2</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "10.0.100-preview.3.25201.16"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25214.8",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25216.2",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25216.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25216.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "10.0.0-preview.4.25211.19"

0 commit comments

Comments
 (0)