Skip to content

Force building of Mono manifest packages when building via source-build - #81790

Merged
directhex merged 4 commits into
dotnet:mainfrom
directhex:sourcebuild-manifests-part-4
Feb 9, 2023
Merged

Force building of Mono manifest packages when building via source-build#81790
directhex merged 4 commits into
dotnet:mainfrom
directhex:sourcebuild-manifests-part-4

Conversation

@directhex

Copy link
Copy Markdown
Contributor

No description provided.

@ghost

ghost commented Feb 7, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:directhex
Assignees:directhex
Labels:

area-Infrastructure-libraries

Milestone:-

@ViktorHofer

Copy link
Copy Markdown
Member

cc @tmds as that's the opposite of what you are doing in #81480. Should we also inline this property into the repo's config?

@tmds

tmds commented Feb 8, 2023

Copy link
Copy Markdown
Member

cc @tmds as that's the opposite of what you are doing in #81480. Should we also inline this property into the repo's config?

Yes, that makes it easier to reproduce the source-build configuration from ./build.sh without going through arcade, see #81480 (comment).

@ViktorHofer

Copy link
Copy Markdown
Member

@directhex please move that property out of SourceBuild.props and into another location, i.e. Directory.Build.props before Subsets.props are imported.

@directhex

Copy link
Copy Markdown
ContributorAuthor

@ViktorHofer so conditionally set the ForceBuildMobileManifests property, based on DotNetBuildFromSource, in Directory.Build.Props?

@ViktorHofer

Copy link
Copy Markdown
Member

Yes, exactly. But before the Subsets.props import as that file reads the property.

@directhex

Copy link
Copy Markdown
ContributorAuthor

E2E tested locally w/ VMR

@directhexdirecthex changed the title We can't pass source-build properties externally, they need to come via SourceBuild.propsForce building of Mono manifest packages when building via source-buildFeb 9, 2023
@directhex
directhex merged commit 917f407 into dotnet:mainFeb 9, 2023
@steveisok

Copy link
Copy Markdown
Member

/backport to release/8.0-preview1

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0-preview1: https://github.com/dotnet/runtime/actions/runs/4135266103

@github-actions

Copy link
Copy Markdown
Contributor

@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.propsApplying: Indicate that we can consume emsdk manifest via source-buildUsing index info to reconstruct a base tree...M	eng/Version.Details.xmlFalling back to patching base and 3-way merge...Auto-merging eng/Version.Details.xmlCONFLICT (content): Merge conflict in eng/Version.Details.xmlerror: Failed to merge in the changes.hint: Use 'git am --show-current-patch=diff' to see the failed patchPatch failed at 0002 Indicate that we can consume emsdk manifest via source-buildWhen 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 128

Please backport manually!

@github-actions

Copy link
Copy Markdown
Contributor

@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.

steveisok pushed a commit to steveisok/runtime that referenced this pull request Feb 9, 2023
dotnet-bot pushed a commit to dotnet/dotnet that referenced this pull request Feb 12, 2023
… building via source-build
Backport of dotnet/runtime#81790
Original commit: dotnet/runtime@7deac7d
[[ commit created by automation ]]
@ghostghost locked as resolved and limited conversation to collaborators Mar 11, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@directhex@ViktorHofer@tmds@steveisok