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

Jump to bottom

Support for short stack builds. #18463

Merged
merged 18 commits into from
Feb 7, 2024
Merged

Support for short stack builds. #18463

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d78dbac
Support for short stack builds.
directhex Jan 30, 2024
b43bf5d
Merge remote-tracking branch 'origin/main' into shortstack
directhex Feb 2, 2024
69f1c58
Refreshed for the glourious TargetOS/TargetArchitecture future
directhex Feb 2, 2024
e06a805
Fix build locally, push to test on Mac
directhex Feb 2, 2024
5028977
change rootrepo
directhex Feb 2, 2024
68bdaff
Merge branch 'main' into shortstack
directhex Feb 5, 2024
30138aa
Merge branch 'main' into shortstack
directhex Feb 6, 2024
d5e8ffb
Merge remote-tracking branch 'origin/main' into shortstack
directhex Feb 7, 2024
efb2c9e
Temporarily enable full build so we can test CI
directhex Feb 7, 2024
33400c9
Add Android x64 to build, let's see what happens
directhex Feb 7, 2024
1400ef0
Add patch since runtime sync is out of date & missing needed patch
directhex Feb 7, 2024
280a9e0
fix paths in patch
directhex Feb 7, 2024
d83ebb2
Revert "Temporarily enable full build so we can test CI"
directhex Feb 7, 2024
3df779e
If we want to do a short stack Windows build, tweak the RID
directhex Feb 7, 2024
3a55a8e
Merge branch 'main' into shortstack
directhex Feb 7, 2024
b426ce6
Annotate patch
directhex Feb 7, 2024
33c4717
Merge branch 'main' into shortstack
directhex Feb 7, 2024
64e1ffe
That error message was thoroughly unhelpful
directhex Feb 7, 2024
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
15 changes: 15 additions & 0 deletions src/SourceBuild/content/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@
<TargetOS Condition="'$(TargetOS)' == ''">$(BuildOS)</TargetOS>
</PropertyGroup>

<!-- This is a list of cases where we aren't producing a whole SDK, just a runtime. This list should be kept in sync with https://github.com/dotnet/runtime/blob/main/eng/SourceBuild.props#L26 -->
<PropertyGroup Label="ShortStacks">
<ShortStack Condition="'$(TargetOS)' == 'wasi'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'browser'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'ios'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'iossimulator'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'tvos'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'tvossimulator'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'maccatalyst'">true</ShortStack>
<ShortStack Condition="'$(TargetOS)' == 'android'">true</ShortStack>
<!-- Short stack builds stop at runtime, not the whole SDK -->
<RootRepo Condition="'$(ShortStack)' == 'true'">runtime</RootRepo>
</PropertyGroup>

<PropertyGroup Label="CalculateArch">
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</BuildArchitecture>
<HostArchitecture Condition="'$(HostArchitecture)' == ''">$(BuildArchitecture)</HostArchitecture>
Expand Down Expand Up @@ -49,6 +63,7 @@
<PortableRid Condition="'$(PortableRid)' == '' and '$(TargetOS)' == 'windows'">win-$(TargetArchitecture)</PortableRid>

<TargetRid Condition="'$(PortableBuild)' == 'true' and '$(PortableRid)' != ''">$(PortableRid)</TargetRid>
<TargetRid Condition="'$(ShortStack)' == 'true'">$(TargetOS)-$(TargetArchitecture)</TargetRid>
directhex marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipArcadeSdkImport)' != 'true'" />
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/repo-projects/runtime.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)os $(TargetOS)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:TargetRid=$(TargetRid)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
directhex marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
Expand Down