Force building of Mono manifest packages when building via source-build #81790
Conversation
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue Detailsnull
|
Yes, that makes it easier to reproduce the source-build configuration from |
|
@directhex please move that property out of SourceBuild.props and into another location, i.e. Directory.Build.props before Subsets.props are imported. |
|
@ViktorHofer so conditionally set the ForceBuildMobileManifests property, based on DotNetBuildFromSource, in Directory.Build.Props? |
|
Yes, exactly. But before the Subsets.props import as that file reads the property. |
|
E2E tested locally w/ VMR |
directhex
changed the title
|
/backport to release/8.0-preview1 |
|
Started backporting to release/8.0-preview1: https://github.com/dotnet/runtime/actions/runs/4135266103 |
|
@steveisok backporting to release/8.0-preview1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: We can't pass source-build properties externally, they need to come via SourceBuild.props
Applying: Indicate that we can consume emsdk manifest via source-build
Using index info to reconstruct a base tree...
M eng/Version.Details.xml
Falling back to patching base and 3-way merge...
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Indicate that we can consume emsdk manifest via source-build
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! |
|
@steveisok an error occurred while backporting to release/8.0-preview1, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
… building via source-build Backport of dotnet/runtime#81790 Original commit: dotnet/runtime@7deac7d [[ commit created by automation ]]
ghost
locked as resolved and limited conversation to collaborators
No description provided.