Remove redundant source-build arguments #11191
Conversation
…on value of DisableSourceLink property
|
@NikolaMilosavljevic @MichaelSimons should this be ported to main? |
yes - @NikolaMilosavljevic - Can you open a PR for this? |
Sure - working on it. I believe |
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/arcade/actions/runs/3395480772 |
|
@NikolaMilosavljevic backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property
Using index info to reconstruct a base tree...
M src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@NikolaMilosavljevic an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
OK - will backport manually. |
|
Porting PR: #11513 |
Fixes: dotnet/source-build#2883
These properties are set at repo level, based on values of DisableSourceLink property.
This is a follow-up change for this: #11153 (comment)