Skip to content

[main] Source code updates from dotnet/dotnet #14568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 2 commits into from
May 28, 2026
Merged

[main] Source code updates from dotnet/dotnet #14568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7dc242
Backflow from https://github.com/dotnet/dotnet / 6ca055a build 316114
dotnet-maestro[bot] May 28, 2026
89ab925
Update dependencies from build 316114
dotnet-maestro[bot] May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26276.113</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.5.26276.113</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26276.113</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26276.113</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.5.26276.113</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26276.113</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.5.26276.113</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26276.113</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26276.113</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.5.26276.113</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.5.26276.113</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.5.26276.113</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.5.26276.113</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.5.26276.113</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.5.26276.113</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.5.26276.113</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.5.26276.113</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.5.26276.113</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.5.26276.113</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26276.113</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26277.111</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.6.26277.111</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26277.111</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26277.111</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.6.26277.111</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26277.111</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.6.26277.111</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26277.111</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26277.111</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.6.26277.111</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.6.26277.111</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.6.26277.111</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.6.26277.111</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.6.26277.111</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.6.26277.111</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.6.26277.111</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.6.26277.111</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.6.26277.111</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.6.26277.111</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.6.26277.111</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
106 changes: 53 additions & 53 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,114 +6,114 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="1458981aa05717a57476cbef8ec76f066f70fcb5" BarId="315907" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="6ca055abbe0f7c50651e7768c3f466ef07907dc8" BarId="316114" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26276.113">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.5.26276.113">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26276.113">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26276.113">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26276.113">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.5.26276.113">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26276.113">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.5.26276.113">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.5.26276.113">
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.6.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26276.113">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26277.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1458981aa05717a57476cbef8ec76f066f70fcb5</Sha>
<Sha>6ca055abbe0f7c50651e7768c3f466ef07907dc8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>5</PreReleaseVersionIteration>
<PreReleaseVersionIteration>6</PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>
Expand Down
20 changes: 19 additions & 1 deletion eng/common/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Param(
[switch][Alias('pb')]$productBuild,
[switch]$fromVMR,
[switch][Alias('bl')]$binaryLog,
[string][Alias('bln')]$binaryLogName = '',
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
[switch] $prepareMachine,
Expand All @@ -46,6 +47,7 @@ function Print-Usage() {
Write-Host " -platform <value> Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild"
Write-Host " -verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
Write-Host " -binaryLog Output binary log (short: -bl)"
Write-Host " -binaryLogName <value> Binary log file name or path; implies -binaryLog (short: -bln)"
Write-Host " -help Print help and exit"
Write-Host ""

Expand Down Expand Up @@ -102,7 +104,19 @@ function Build {
$toolsetBuildProj = InitializeToolset
InitializeCustomToolset

$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
$bl = ''
if ($binaryLog) {
$binaryLogPath = if ([string]::IsNullOrEmpty($binaryLogName)) {
Join-Path $LogDir 'Build.binlog'
} elseif ([System.IO.Path]::IsPathRooted($binaryLogName)) {
$binaryLogName
} else {
Join-Path $LogDir $binaryLogName
}

Create-Directory (Split-Path -Parent $binaryLogPath)
$bl = '/bl:' + $binaryLogPath
}
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
$check = if ($buildCheck) { '/check' } else { '' }

Expand Down Expand Up @@ -162,6 +176,10 @@ try {
$nodeReuse = $false
}

if (-not [string]::IsNullOrEmpty($binaryLogName)) {
$binaryLog = $true
}

if ($nativeToolsOnMachine) {
$env:NativeToolsOnMachine = $true
}
Expand Down
19 changes: 18 additions & 1 deletion eng/common/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ usage()
echo " --configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
echo " --binaryLog Create MSBuild binary log (short: -bl)"
echo " --binaryLogName <value> Binary log file name or path; implies --binaryLog (short: -bln)"
echo " --help Print help and exit (short: -h)"
echo ""

Expand Down Expand Up @@ -83,6 +84,7 @@ warn_not_as_error=''
node_reuse=true
build_check=false
binary_log=false
binary_log_name=''
exclude_ci_binary_log=false

projects=''
Expand Down Expand Up @@ -114,6 +116,11 @@ while [[ $# -gt 0 ]]; do
-binarylog|-bl)
binary_log=true
;;
-binarylogname|-bln)
binary_log=true
binary_log_name=$2
shift
;;
-excludecibinarylog|-nobl)
exclude_ci_binary_log=true
;;
Expand Down Expand Up @@ -232,7 +239,17 @@ function Build {

local bl=""
if [[ "$binary_log" == true ]]; then
bl="/bl:\"$log_dir/Build.binlog\""
local binary_log_path=""
if [[ -z "$binary_log_name" ]]; then
binary_log_path="$log_dir/Build.binlog"
elif [[ "$binary_log_name" = /* ]]; then
binary_log_path="$binary_log_name"
else
binary_log_path="$log_dir/$binary_log_name"
fi

mkdir -p "$(dirname "$binary_log_path")"
bl="/bl:\"$binary_log_path\""
fi

local check=""
Expand Down
Loading
Loading