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.

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

Change how we build the cross-OS DAC to support building in the VMR #111927

Merged
merged 11 commits into from
Feb 4, 2025
Merged

Change how we build the cross-OS DAC to support building in the VMR #111927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
afa727c
Don't build the linuxdac by default. Cross-os DAC build failures are …
jkoritzinsky Jan 17, 2025
2f515e7
Rewrite cross-os DAC packaging in terms of runtime packs instead of u…
jkoritzinsky Jan 17, 2025
69c1ac7
Add back missing label
jkoritzinsky Jan 17, 2025
89dd90b
Build the cross-os DACs when crossdacpack is built.
jkoritzinsky Jan 28, 2025
bef55a0
Merge branch 'main' of https://github.com/dotnet/runtime into xos-dac
jkoritzinsky Jan 28, 2025
b71364c
Forward the ESRP tool path down from DotNetBuild.props and set up the…
jkoritzinsky Jan 28, 2025
cad52e8
Pass down the buildpass to the inner build and decide what to build i…
jkoritzinsky Jan 28, 2025
484ed2a
Allow passing a script root (needed for VMR reusage of this template)
jkoritzinsky Jan 29, 2025
d5b2151
Adjust DAC signing script to fix failures in internal testing
jkoritzinsky Feb 3, 2025
accde76
Force the value of SignRequestFiles to always be an array
jkoritzinsky Feb 3, 2025
852fc69
Build the cross-os DACs via their subset names
jkoritzinsky Feb 3, 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
Prev Previous commit
Next Next commit
Pass down the buildpass to the inner build and decide what to build i… 
…n Subsets.props
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Jan 28, 2025
commit cad52e8ef0f06a810e145f928226a990cb8ebb4b
7 changes: 1 addition & 6 deletions eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<InnerBuildArgs Condition="'$(DotNetBuildMonoBundleLLVMOptimizer)' != ''">$(InnerBuildArgs) /p:MonoBundleLLVMOptimizer=$(DotNetBuildMonoBundleLLVMOptimizer)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(DotNetBuildMonoCrossAOT)' != ''">$(InnerBuildArgs) /p:DotNetBuildMonoCrossAOT=$(DotNetBuildMonoCrossAOT)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(DotNetBuildAllRuntimePacks)' != ''">$(InnerBuildArgs) /p:DotNetBuildAllRuntimePacks=$(DotNetBuildAllRuntimePacks)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(DotNetBuildPass)' != ''">$(InnerBuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(PgoInstrument)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)pgoinstrument</InnerBuildArgs>

<!-- This prop needs to be passed to the inner build manually as the BaseInnerSourceBuildCommand gets overridden above -->
Expand Down Expand Up @@ -111,12 +112,6 @@
<!-- Needed until https://github.com/dotnet/runtime/issues/109329 is fixed. -->
<InnerBuildArgs Condition="'$(NetCoreAppToolCurrentVersion)' != ''">$(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion)</InnerBuildArgs>
</PropertyGroup>

<!-- For BuildPass>1, we need to specify which subset/subsets to build. -->
<PropertyGroup Condition="'$(DotNetBuildPass)' == '2'">
<!-- We will build the cross-os DACs in the win-x86 join job. -->
<InnerBuildArgs Condition="'$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86'">-subset crossdacpack</InnerBuildArgs>
</PropertyGroup>
</Target>

<Target Name="CategorizeRuntimeSupplementalArtifacts"
Expand Down
5 changes: 4 additions & 1 deletion eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
<DefaultSubsets Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono'">clr+libs+tools+host+packs</DefaultSubsets>
<DefaultSubsets Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">clr.nativeaotlibs+clr.nativeaotruntime+libs+packs</DefaultSubsets>
<DefaultSubsets Condition="'$(DotNetBuildMonoCrossAOT)' == 'true'">mono+packs</DefaultSubsets>

<!-- In the Win-x86 BuildPass2 job in the VMR, we want to build the cross-OS DACs and pack them. -->
<DefaultSubsets Condition="'$(DotNetBuildPass)' == '2' and '$(TargetRid)' == 'win-x86'">crossdacpack</DefaultSubsets>
hoyosjs marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<PropertyGroup>
Expand All @@ -85,7 +88,7 @@
<_subset Condition="'$(Subset)' != ''">+$(Subset.ToLowerInvariant())+</_subset>
<_subset Condition="'$(Subset)' == ''">+$(DefaultSubsets)+</_subset>
</PropertyGroup>


<PropertyGroup Condition="'$(RuntimeFlavor)' == ''">
<RuntimeFlavor Condition="('$(TargetsMobile)' == 'true' or '$(TargetsLinuxBionic)' == 'true') and ($(_subset.Contains('+clr.nativeaotlibs+')) or $(_subset.Contains('+clr.runtime+')))">CoreCLR</RuntimeFlavor>
Expand Down
Loading