Skip to content

[release/10.0.1xx] Source code updates from dotnet/deployment-tools#3121

Merged
dotnet-maestro[bot] merged 3 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-9b2fbfd0-184f-4d84-8dda-296722556d59
Oct 29, 2025
Merged

[release/10.0.1xx] Source code updates from dotnet/deployment-tools#3121
dotnet-maestro[bot] merged 3 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-9b2fbfd0-184f-4d84-8dda-296722556d59

Conversation

@dotnet-maestro
Copy link
Contributor

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/deployment-tools

@dotnet-maestro
Copy link
Contributor Author

@dotnet-maestro dotnet-maestro bot merged commit 4c1e015 into release/10.0.1xx Oct 29, 2025
16 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-release/10.0.1xx-9b2fbfd0-184f-4d84-8dda-296722556d59 branch October 29, 2025 09:52
This was referenced Dec 9, 2025
JanProvaznik added a commit that referenced this pull request Feb 12, 2026
Supersedes the previous EndsWith guard approach which didn't handle
roslyn-versioned analyzers (RecursiveDir='dotnet/roslyn4.8/cs/' vs
PackagePath='analyzers/dotnet/cs/' after version stripping).

The fix: only read NuGetRecursiveDir (set by _GetTfmSpecificContentForPackage
workaround) and stop falling back to the built-in RecursiveDir. Items that
flow through other targets (sharedfx.targets, aspnetcore sfxproj) have
already incorporated RecursiveDir into their PackagePath upstream, so
appending it again is always wrong for those items.

This handles all cases:
- NETCore.App.Ref analyzers (RecursiveDir baked into TargetPath)
- AspNetCore.App.Ref roslyn-versioned analyzers (RecursiveDir transformed)
- Content items with NuGetRecursiveDir (workaround still works)
- Old MSBuild (NuGetRecursiveDir was always the only source anyway)

TODO: Remove NuGetRecursiveDir workaround entirely when minimum MSBuild
includes the fix for #3121. See NuGet/Home#14413
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant