Skip to content

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

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
Oct 7, 2026
Merged

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

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
8a0230a
Update dependencies from build 335390
dotnet-maestro[bot] Oct 7, 2026
dcc03b4
Fixed the analyzer test failures
Shyam-Gupta Oct 7, 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
50 changes: 25 additions & 25 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>12.0.0-beta.26480.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>12.0.0-alpha.1.26480.102</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>12.0.0-alpha.1.26480.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26480.102</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>12.0.0-alpha.1.26480.102</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>12.0.0-alpha.1.26480.102</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26480.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26480.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>12.0.0-alpha.1.26480.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>12.0.0-alpha.1.26480.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>12.0.0-alpha.1.26480.102</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>12.0.0-alpha.1.26480.102</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>12.0.0-alpha.1.26480.102</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>12.0.0-alpha.1.26480.102</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>12.0.0-alpha.1.26480.102</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>12.0.0-alpha.1.26480.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>12.0.0-alpha.1.26480.102</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>12.0.0-alpha.1.26480.102</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>12.0.0-alpha.1.26480.102</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>12.0.0-beta.26506.117</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>12.0.0-alpha.1.26506.117</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>12.0.0-alpha.1.26506.117</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26506.117</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>12.0.0-alpha.1.26506.117</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>12.0.0-alpha.1.26506.117</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26506.117</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26506.117</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>12.0.0-alpha.1.26506.117</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>12.0.0-alpha.1.26506.117</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>12.0.0-alpha.1.26506.117</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>12.0.0-alpha.1.26506.117</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>12.0.0-alpha.1.26506.117</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>12.0.0-alpha.1.26506.117</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>12.0.0-alpha.1.26506.117</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>12.0.0-alpha.1.26506.117</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>12.0.0-alpha.1.26506.117</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>12.0.0-alpha.1.26506.117</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>12.0.0-alpha.1.26506.117</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
102 changes: 51 additions & 51 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,110 +6,110 @@ 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="a2f466a2ccc2851d3c665f764a36b0cb59dd18b8" BarId="334576" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="c36f5f641e3dea81f9ab824316f7a2d168277ea3" BarId="335390" />
<ProductDependencies>
<Dependency Name="System.Resources.Extensions" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Resources.Extensions" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Windows.Extensions" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Text.Encodings.Web" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Text.Json" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.CodeDom" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Configuration.ConfigurationManager" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.Formats.Nrbf" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="12.0.0-alpha.1.26480.102">
<Dependency Name="System.IO.Hashing" Version="12.0.0-alpha.1.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26480.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26506.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a2f466a2ccc2851d3c665f764a36b0cb59dd18b8</Sha>
<Sha>c36f5f641e3dea81f9ab824316f7a2d168277ea3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 0 additions & 4 deletions eng/common/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,6 @@ try {
if (-not $PSBoundParameters.ContainsKey('nodeReuse')) {
$nodeReuse = $false
}
# MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded.
if (-not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) {
$msbuildMultiThreaded = $false
}
}

if (-not [string]::IsNullOrEmpty($binaryLogName)) {
Expand Down
5 changes: 2 additions & 3 deletions eng/common/core-templates/steps/astred-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ steps:
env:
ASTRED_BINLOG_DIR: ${{ parameters.binlogDir }}
ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }}
condition: succeededOrFailed()
continueOnError: true

- pwsh: |
Expand Down Expand Up @@ -94,12 +93,12 @@ steps:
env:
ASTRED_SOURCES_PATH: ${{ parameters.sourcesPath }}
ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }}
condition: succeededOrFailed()
continueOnError: true

- task: UploadAstred@0
displayName: Upload Digest to Astred
condition: and(succeededOrFailed(), eq(variables['ASTRED_DIGEST_READY'], 'true'))
condition: and(succeeded(), eq(variables['ASTRED_DIGEST_READY'], 'true'))
continueOnError: true
inputs:
SourcePath: ${{ parameters.capturePath }}/upload
env:
Expand Down
2 changes: 2 additions & 0 deletions eng/common/cross/install-debs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, t
f.write(content)
print(f"Downloaded {url} at {dest_path}")
return
elif response.status >= 500 or response.status in (408, 429):
response.raise_for_status()
else:
raise Exception(f"Failed to download {url}, Status Code: {response.status}")
except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e:
Expand Down
5 changes: 0 additions & 5 deletions eng/common/msbuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ try {
$nodeReuse = $false
}

# MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded.
if ($ci -and -not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) {
$msbuildMultiThreaded = $false
}

MSBuild @extraArgs
}
catch {
Expand Down
10 changes: 6 additions & 4 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
# Set to true to reuse msbuild nodes. Recommended to not reuse on CI.
[bool]$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { !$ci }

# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI.
[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { !$ci }
# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds.
# Not applied when building with msbuild.exe (VS MSBuild).
[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { $true }

# Configures warning treatment in msbuild.
[bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true }
Expand Down Expand Up @@ -812,8 +813,9 @@ function MSBuild() {

$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"

# Build with MSBuild's multi-threaded mode.
if ($msbuildMultiThreaded) {
# Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now.
# TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989
if ($msbuildMultiThreaded -and [System.IO.Path]::GetFileName($buildTool.Path) -ne 'msbuild.exe') {
$cmdArgs += ' -mt'
}

Expand Down
8 changes: 2 additions & 6 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,9 @@ else
node_reuse=${node_reuse:-true}
fi

# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI.
# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds.
msbuild_multi_threaded=$(NormalizeBoolArg "${msbuild_multi_threaded:-}")
if [[ "$ci" == true ]]; then
msbuild_multi_threaded=${msbuild_multi_threaded:-false}
else
msbuild_multi_threaded=${msbuild_multi_threaded:-true}
fi
msbuild_multi_threaded=${msbuild_multi_threaded:-true}

# Configures warning treatment in msbuild.
warn_as_error=$(NormalizeBoolArg "${warn_as_error:-}")
Expand Down
Loading