Add KeepNativeSymbols to CommonArgs in build props#3509
Conversation
|
@mynameisbogdan Do you need this in 10.0 or only 11.0? |
|
Would be nice to land in 10 as well, please. |
|
/backport to release/10.0 |
|
Started backporting to |
|
@mmitche an error occurred while backporting to |
|
will this be for release/10.0.1xx or release/10.0.2xx? |
|
/backport to release/10.0.1xx |
|
Started backporting to |
|
/backport to release/10.0.2xx |
|
Started backporting to |
|
@mthalman backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add KeepNativeSymbols to CommonArgs in build props
Using index info to reconstruct a base tree...
M repo-projects/Directory.Build.props
Falling back to patching base and 3-way merge...
Auto-merging repo-projects/Directory.Build.props
CONFLICT (content): Merge conflict in repo-projects/Directory.Build.props
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 Add KeepNativeSymbols to CommonArgs in build props
Error: The process '/usr/bin/git' failed with exit code 128 |
|
@mthalman backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add KeepNativeSymbols to CommonArgs in build props
Using index info to reconstruct a base tree...
M repo-projects/Directory.Build.props
Falling back to patching base and 3-way merge...
Auto-merging repo-projects/Directory.Build.props
CONFLICT (content): Merge conflict in repo-projects/Directory.Build.props
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 Add KeepNativeSymbols to CommonArgs in build props
Error: The process '/usr/bin/git' failed with exit code 128 |
|
@mynameisbogdan - You'll need to manually apply these changes to the release/10.0.1xx branch and create a PR for that. |
|
Okay, thank you for the heads up. |
4 participants
Allowing KeepNativeSymbols to be passed via CommonArgs since it's being enable for source builds by default in the runtime at
dotnet/src/runtime/Directory.Build.props
Line 276 in cc7f6e8