-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
Move generation of SuggestedBindingRedirects.targets to inner build #112379
Move generation of SuggestedBindingRedirects.targets to inner build #112379
Conversation
These targets depend on the AssemblyVersion of the library which is specific to the inner-build of the library. Generate them in the inner-build.
We should backport this to servicing as well. |
src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
Outdated
Show resolved
Hide resolved
….Extensions.csproj
src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
Show resolved
Hide resolved
src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
Show resolved
Hide resolved
/backport to release/9.0-staging |
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/13290017456 |
/backport to release/8.0-staging |
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/13290022508 |
@ericstj backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move generation of SuggestedBindingRedirects.targets to inner build
Using index info to reconstruct a base tree...
M src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
CONFLICT (content): Merge conflict in src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move generation of SuggestedBindingRedirects.targets to inner build
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
…otnet#112379) * Move generation of SuggestedBindingRedirects.targets to inner build These targets depend on the AssemblyVersion of the library which is specific to the inner-build of the library. Generate them in the inner-build. * Update src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
Fixes #111892
These targets depend on the
AssemblyVersion
of the library which is specific to the inner-build of the library. Generate them in the inner-build.I tried including in the package as part of the inner-build as well but we also have other infrastructure in the outer build that observes targets added to the package, but can only do so if they're added in the outer build.
runtime/eng/packaging.targets
Lines 229 to 230 in 91bbb32
I can't make that work so long as it runs in the outer build - since NuGet passes items out from inner-build only in a private item (
_PackageFiles
). Probably I could refactor that to be part of the inner-build but it would be a larger change.