Skip to content
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

[release/7.0] source build backports #78395

Merged
merged 4 commits into from
Nov 18, 2022
Merged

Conversation

ViktorHofer
Copy link
Member

@ViktorHofer ViktorHofer commented Nov 15, 2022

Backport of

@tmds can you please verify that dotnet/runtime source builds as expected with these changes?

These are infrastructure only changes that greatly improve and simplify dotnet/runtime's source build for .NET 7. Spoke with @ericstj about this offline about it and we can treat them as tell-mode.

tmds and others added 4 commits November 15, 2022 17:33
…76068)

* Use generated runtime.json when building shared framework packages.

* Don't UpdateRuntimeJson on Build.

* PR feedback.

* Update Microsoft.NETCore.Platforms.csproj

Co-authored-by: Viktor Hofer <[email protected]>
…kages. (#75597)

* source-build: support building runtime using non-portable runtime packages.

Currently source-build performs a 'runtime-portable' build that produces
'linux-{arch}' packages that are used when building target runtime (non-portable).

With this change, we can use the non-portable packages that are produced by
a previous (non-portable) 'runtime' build. This helps eliminate the
'runtime-portable' build.

* Avoid references to Microsoft.AspNetCore.App.<rid>.

* crossgen2: set RuntimeIdentifier explicitly.

* PR feedback

* Revert "crossgen2: set RuntimeIdentifier explicitly."

This reverts commit 10be274.

* PR feedback.

* Revert changes to ILCompiler.csproj.

* Update Directory.Build.targets

Co-authored-by: Viktor Hofer <[email protected]>
* Pass SourceBuild TargetRid and SourceBuildPortable args through the native script.

* Rename -packagerid to -distrorid.

* Fix init-distro-rid.sh.

* Use OutputRid instead of PackageRid.

* Drop unnecessary Condition.

* Try passing --distrorid as OutputRid.

* NativeExport: use PackageRID for AppHostRuntimeIdentifier.

* Rename --distrorid to --outputrid.

* Fix SourceBuild.props.

* Undo changes to init-distro-rid.sh.

* Let source-build leg build 'banana-x64' rid.

* SourceBuild.props: don't force a RuntimeOS.

* SourceBuild.props: set AdditionalRuntimeIdentifierParent.

* Build banana.24-x64 instead.

* Fix SourceBuild.props.

* SourceBuild.props: try fix AdditionalRuntimeIdentifier* usage.

* source-build.yml: add runtimeOS parameter.

* SourceBuild.props: derive RuntimeOS from NETCoreSdkRuntimeIdentifier.

* Undo using NETCoreSdkRuntimeIdentifier.

* Update eng/pipelines/common/global-build-job.yml

Co-authored-by: Jeremy Koritzinsky <[email protected]>

Co-authored-by: Jeremy Koritzinsky <[email protected]>
@ViktorHofer ViktorHofer added this to the 7.0.x milestone Nov 15, 2022
@ViktorHofer ViktorHofer requested review from tmds and a team November 15, 2022 16:46
@ViktorHofer ViktorHofer self-assigned this Nov 15, 2022
@ghost
Copy link

ghost commented Nov 15, 2022

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

Issue Details

Backport of

@tmds can you please verify that dotnet/runtime source builds as expected with these changes?

// TODO: Fill out the servicing template

Author: ViktorHofer
Assignees: ViktorHofer
Labels:

area-Infrastructure

Milestone: 7.0.x

@tmds
Copy link
Member

tmds commented Nov 16, 2022

@tmds can you please verify that dotnet/runtime source builds as expected with these changes?

I will do this tomorrow.

@tmds
Copy link
Member

tmds commented Nov 17, 2022

This works as expected, :shipit:!

@ViktorHofer
Copy link
Member Author

Nice, thanks for double checking.

@carlossanlop carlossanlop merged commit 9bc19b7 into release/7.0 Nov 18, 2022
@carlossanlop carlossanlop deleted the SourceBuildBackports branch November 18, 2022 15:35
@ghost ghost locked as resolved and limited conversation to collaborators Dec 18, 2022
Sign up for free to 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.

3 participants