Skip to content

Add two-stage build support in source-build #112414

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

Closed
wants to merge 5 commits into from
+6 −0
Closed

Add two-stage build support in source-build #112414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22b5bb9
Add two-stage build support in source-build
am11 Feb 11, 2025
4d13dd3
Update Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
am11 Feb 11, 2025
a2ab3eb
Update Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
am11 Feb 11, 2025
269b644
Build tools.illink subset in stage2
am11 Feb 12, 2025
450f760
Merge branch 'main' into patch-30
am11 Feb 12, 2025
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
4 changes: 4 additions & 0 deletions eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@

<!-- Needed until https://github.com/dotnet/runtime/issues/109329 is fixed. -->
<InnerBuildArgs Condition="'$(NetCoreAppToolCurrentVersion)' != ''">$(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion)</InnerBuildArgs>

<!-- Two-stage build is for live runtime packs; apphost, crossgen2 and ilcompiler. It is typically (but not limited to be) used for community-supported platform builds. -->
<InnerBuildArgs Condition="'$(StageOneBuild)' != ''">$(InnerBuildArgs) /p:StageOneBuild=$(StageOneBuild) /p:Subset=clr+libs+host</InnerBuildArgs>
<InnerBuildArgs Condition="'$(StageTwoBuild)' != ''">$(InnerBuildArgs) /p:StageTwoBuild=$(StageTwoBuild) /p:Subset=clr.tools+tools.illink+packs</InnerBuildArgs>
</PropertyGroup>
</Target>

Expand Down
2 changes: 2 additions & 0 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<PublishReadyToRun Condition="'$(TargetOS)' == 'netbsd' or '$(TargetOS)' == 'illumos' or '$(TargetOS)' == 'solaris' or '$(TargetOS)' == 'haiku'">false</PublishReadyToRun>
<!-- Disable crossgen on FreeBSD when cross building from Linux. -->
<PublishReadyToRun Condition="'$(TargetOS)'=='freebsd' and '$(CrossBuild)'=='true'">false</PublishReadyToRun>
<!-- Disable crossgen for StageTwoBuild. -->
<PublishReadyToRun Condition="'$(StageTwoBuild)'=='true'">false</PublishReadyToRun>
<UsesMuxerHostModel Condition="'$(TargetsMobile)' != 'true'">true</UsesMuxerHostModel>
<IncludeDiaSymReaderNative Condition="'$(TargetOS)' == 'windows'">true</IncludeDiaSymReaderNative>
<UseLocalCrossgen2Pack>$(PublishReadyToRun)</UseLocalCrossgen2Pack>
Expand Down
Loading