Skip to content

[main] Source code updates from dotnet/msbuild#4579

Merged
ViktorHofer merged 10 commits intomainfrom
darc-main-e5875312-5e2d-44d5-8949-2aefb30abf25
Feb 6, 2026
Merged

[main] Source code updates from dotnet/msbuild#4579
ViktorHofer merged 10 commits intomainfrom
darc-main-e5875312-5e2d-44d5-8949-2aefb30abf25

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 31, 2026

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/msbuild

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/msbuild:54d87c53bfa6554edc550216ff14874754bc2a5f..https://github.com/dotnet/dotnet:darc-main-e5875312-5e2d-44d5-8949-2aefb30abf25

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

@dotnet-policy-service dotnet-policy-service bot requested a review from a team January 31, 2026 02:07
@ViktorHofer
Copy link
Copy Markdown
Member

@rainersigwald looks like dotnet/msbuild#13157 - more specifically the nullability change in SdkResolver.cs requires a reaction in sdk. PTAL

rainersigwald added a commit to rainersigwald/msbuild that referenced this pull request Feb 4, 2026
The doc comment explicitly mentions returning null and the SDK can do
so, which caused a break in dotnet/dotnet#4579:

    src\sdk\src\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\WorkloadSdkResolver.cs(35,36): error CS8764: Nullability of return type doesn't match overridden member (possibly because of nullability attributes).
@rainersigwald
Copy link
Copy Markdown
Member

rainersigwald commented Feb 4, 2026

Indeed -- dotnet/msbuild#13197 should fix. Thanks for the ping!

@ViktorHofer
Copy link
Copy Markdown
Member

Thanks. Btw you could have fixed this directly here in this PR and the change would have then flown back to msbuild. Just a note for the future in case you want to go that route.

rainersigwald added a commit to dotnet/msbuild that referenced this pull request Feb 4, 2026
The doc comment explicitly mentions returning null and the SDK can do
so, which caused a break in dotnet/dotnet#4579:


src\sdk\src\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\WorkloadSdkResolver.cs(35,36):
error CS8764: Nullability of return type doesn't match overridden member
(possibly because of nullability attributes).

Follow up to #13157 / 0172c58.
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro bot commented Feb 5, 2026

@ViktorHofer ViktorHofer merged commit 865e919 into main Feb 6, 2026
16 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-e5875312-5e2d-44d5-8949-2aefb30abf25 branch February 6, 2026 07:38
@dotnet-policy-service dotnet-policy-service bot requested a review from a team February 6, 2026 07:40
JanProvaznik pushed a commit to JanProvaznik/msbuild that referenced this pull request Feb 25, 2026
The doc comment explicitly mentions returning null and the SDK can do
so, which caused a break in dotnet/dotnet#4579:


src\sdk\src\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\WorkloadSdkResolver.cs(35,36):
error CS8764: Nullability of return type doesn't match overridden member
(possibly because of nullability attributes).

Follow up to dotnet#13157 / 0172c58.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants