Skip to content

[release/6.0] Conditionally build allconfigurations in source-build #58122

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.

Sign up for GitHub

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

Merged
danmoseley merged 1 commit into from
Aug 30, 2021
Merged

[release/6.0] Conditionally build allconfigurations in source-build #58122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Conditionally build allconfigurations 
When building portable, only a subset of runtime needs to be
built.  allconfigurations is only needed in a non-portable build.
  • Loading branch information
@dseefeld
dseefeld committed Aug 25, 2021
commit 7934b154bbd5efbde5266ca0ba9cbe1b7057ec39
2 changes: 1 addition & 1 deletion eng/SourceBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<InnerBuildArgs>$(InnerBuildArgs) --arch $(TargetRidPlatform)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --configuration $(Configuration)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --ci</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
<InnerBuildArgs Condition="'$(SourceBuildNonPortable)' == 'true'">$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
Copy link
Member

@ViktorHofer ViktorHofer Aug 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the SourceBuildNonPortable switch control? I don't see it yet being used in the repo anywhere.

Copy link
Contributor Author

@dseefeld dseefeld Aug 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the switch that we pass in from source-build to do a portable or non-portable build. In the source-build tarball build,
it builds runtime both portable and non-portable. In the non-portable case, we pass this flag. https://github.com/dotnet/installer/blob/fd550a3dacfda14c19c0c96ce7a7243e90a13ea5/src/SourceBuild/tarball/content/repos/runtime.proj#L12

Copy link
Member

@ViktorHofer ViktorHofer Aug 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I meant is, where is the logic that controls which subset of runtime is built during a source build portable build? I would have expected that the SourceBuildNonPortable property appears in Subsets.props to control what of runtime is built during a portable build.

Copy link
Contributor Author

@dseefeld dseefeld Aug 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no difference in subsets between portable and non-portable. The only change is to only build allconfigurations when building a non-portable build.

<InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
Expand Down