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

Adds support for generating Mono named NETCore.App Runtime Packs #34980

Merged
merged 16 commits into from
Apr 17, 2020
Merged

Adds support for generating Mono named NETCore.App Runtime Packs #34980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
57e1d7e
Adds support for generating Mono named NETCoreApp Runtime Packs
Apr 15, 2020
67144c5
Tweaks
Apr 15, 2020
a4e79df
Add additional platforms to the installer build
Apr 15, 2020
3403d21
Added runtime flavor to job name in official build
Apr 15, 2020
f8a20b6
Syntax
Apr 15, 2020
2fffa1d
Update eng/pipelines/installer/jobs/base-job.yml
steveisok Apr 15, 2020
47c7107
Disabled crossgen for desktop mono installer and addressed feedback
steveisok Apr 15, 2020
3d0823f
Merge branch 'enable-custom-named-runtimepack' of github.com:steveiso…
steveisok Apr 15, 2020
4d03a34
Removed extra crossgen removal and renamed target
Apr 15, 2020
da55a57
Tweak to get things going
Apr 15, 2020
a8803f0
Little more yml tweaking
Apr 15, 2020
0f5b218
Make sure RuntimeFlavor is being set when just the installer subset i…
Apr 16, 2020
49d4216
Extra yml tweaks
Apr 16, 2020
d301875
Shifted building runtime packs only for all of mono. Altered subsets…
Apr 16, 2020
4752408
Removing linux and windows from the mono installer as there are error…
Apr 16, 2020
305b0cc
Made log name unique to the runtime flavor
Apr 17, 2020
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
3 changes: 3 additions & 0 deletions src/installer/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,22 @@
<PropertyGroup>
<TargetsiOS>true</TargetsiOS>
<TargetsUnix>true</TargetsUnix>
<TargetsMobile>true</TargetsMobile>
</PropertyGroup>
</When>
<When Condition="$(OutputRid.StartsWith('tvos'))">
<PropertyGroup>
<TargetstvOS>true</TargetstvOS>
<TargetsUnix>true</TargetsUnix>
<TargetsMobile>true</TargetsMobile>
</PropertyGroup>
</When>
<When Condition="$(OutputRid.StartsWith('android'))">
<PropertyGroup>
<TargetsAndroid>true</TargetsAndroid>
<TargetsLinux>true</TargetsLinux>
<TargetsUnix>true</TargetsUnix>
<TargetsMobile>true</TargetsMobile>
</PropertyGroup>
</When>
<When Condition="$(OutputRid.StartsWith('debian'))">
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
out and skip building.
-->
<Target Name="MobileSkipBuildProps"
Condition="'$(SkipBuildOnRuntimePackOnlyOS)' == 'true' and ('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Android')"
Condition="'$(SkipBuildOnRuntimePackOnlyOS)' == 'true' and '$(TargetsMobile)' == 'true'"
BeforeTargets="GetSkipBuildProps">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
Expand Down
12 changes: 9 additions & 3 deletions src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
shared framework on those platforms.
-->
<PropertyGroup>
<ExcludeHostAssets Condition="'$(TargetOS)' == 'iOS'">true</ExcludeHostAssets>
<ExcludeHostAssets Condition="'$(TargetOS)' == 'tvOS'">true</ExcludeHostAssets>
<ExcludeHostAssets Condition="'$(TargetOS)' == 'Android'">true</ExcludeHostAssets>
steveisok marked this conversation as resolved.
Show resolved Hide resolved
<ExcludeHostAssets Condition="'$(TargetsMobile)' == 'iOS'">true</ExcludeHostAssets>
</PropertyGroup>
<!--
Include HostPolicy and HostResolver based on legacy packages. This can be collapsed once the
Expand All @@ -16,4 +14,12 @@
<Import Condition="'$(ExcludeHostAssets)' != 'true'" Project="..\..\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.props" />
<Import Condition="'$(ExcludeHostAssets)' != 'true'" Project="..\..\Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.props" />

<!-- Keep this isolated to desktop mono for now -->
<Target Name="MobileGetBuildRidSpecificPackageProps"
Condition="'$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' == ''"
steveisok marked this conversation as resolved.
Show resolved Hide resolved
AfterTargets="GetBuildRidSpecificPackageProps">
<PropertyGroup>
<RidSpecificPackProperties>BaseId=$(MSBuildProjectName)$(RuntimeSpecificFrameworkSuffix).Mono.$(PackageBuildRID);IdPrefix=</RidSpecificPackProperties>
dagood marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
</Target>
</Project>