mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Refreshed for the glourious TargetOS/TargetArchitecture future

Browse source
This commit is contained in:
Jo Shields 2024-02-02 13:35:24 -05:00
parent b43bf5d8df
commit 69f1c5855a
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/SourceBuild/content/Directory.Build.props
View file

@ -6,18 +6,6 @@
<DotNetBuildOrchestrator>true</DotNetBuildOrchestrator>
</PropertyGroup>
<PropertyGroup Label="ShortStacks">
<_OverrideTargetOS>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.LastIndexOf('-'))))</_OverrideTargetOS>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'wasi'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'browser'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'ios'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'iossimulator'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'tvos'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'tvossimulator'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'maccatalyst'">true</ShortStack>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'android'">true</ShortStack>
</PropertyGroup>
<PropertyGroup Label="CalculateTargetOS">
<BuildOS>linux</BuildOS>
<BuildOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</BuildOS>
@ -31,6 +19,18 @@
<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>
</PropertyGroup>
<PropertyGroup Label="CalculateArch">
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</BuildArchitecture>
<HostArchitecture Condition="'$(HostArchitecture)' == ''">$(BuildArchitecture)</HostArchitecture>

6
src/SourceBuild/content/repo-projects/runtime.proj
View file

@ -14,9 +14,9 @@
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)os $(TargetOS)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:TargetRid=$(TargetRid)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'>$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'>$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:TargetRid=$(TargetRid)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
<BuildArgs Condition="'$(ShortStack)' != 'true'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
</PropertyGroup>
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">