Skip to content

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

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
akoeplinger merged 2 commits into from
Apr 9, 2026
Merged

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

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
64b1c18
Backflow from https://github.com/dotnet/dotnet / 0cf6b19 build 309569
dotnet-maestro[bot] Apr 9, 2026
effa474
Update dependencies from build 309569
dotnet-maestro[bot] Apr 9, 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
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="1a405c76db678301b6f6f5b22d2a63a152c26b97" BarId="309188" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2" BarId="309569" />
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ function MSBuild-Core() {
$cmdArgs += ' /p:TreatWarningsAsErrors=false'
}

if ($warnNotAsError) {
if ($warnAsError -and $warnNotAsError) {
$cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$warnNotAsError"
}

Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ function MSBuild-Core {
fi

local warnnotaserror_switch=""
if [[ -n "$warn_not_as_error" ]]; then
if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error"
fi

Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
<!-- By default do not build NuGet package for a non pkgproj project. Project may override. -->
<IsPackable Condition="'$(MSBuildProjectExtension)' != '.pkgproj'">false</IsPackable>

<!-- Allow additional values for NoWarn and WarningsNotAsErrors without behaving as global properties -->
<NoWarn Condition="'$(AdditionalNoWarn)' != ''">$(NoWarn);$(AdditionalNoWarn)</NoWarn>
<WarningsNotAsErrors Condition="'$(AdditionalWarningsNotAsErrors)' != ''">$(WarningsNotAsErrors);$(AdditionalWarningsNotAsErrors)</WarningsNotAsErrors>

<!--
Official build:
- Build standalone Portable PDBs to reduce the size of the binaries.
Expand Down
Loading