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

Add build configuration to generate runtime packs for iOS #34050

Merged
merged 20 commits into from
Apr 2, 2020
Merged

Add build configuration to generate runtime packs for iOS #34050

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6c61240
Add build configuration to generate runtime packs for iOS
Mar 25, 2020
f88d464
Take away unnecessary subsets / fix syntax error
Mar 25, 2020
f7a6dd7
Addressed some feedback
Mar 25, 2020
013d727
Attempt to add iOS installer lanes
Mar 25, 2020
ff4c087
Trying a single platform to see if it'll work
Mar 25, 2020
b997ec4
I guess there's one already?
Mar 26, 2020
bb866f8
Adding ios installer ci back in. It's gonna fail
Mar 26, 2020
a7e7237
Tweaked platform matrix for ios_arm & ios_arm64 so that they do not r…
Mar 27, 2020
5fa7c8f
Added iOS as part of the base job check
Mar 27, 2020
4eff34f
Added os and archType to the ios installer args
Mar 27, 2020
2479df0
yml syntax :-(
Mar 27, 2020
5c6f78f
Yml syntax
Mar 27, 2020
f3b3b0a
Pushed skipping unnecessary pkgproj into installer/pkg area
Mar 31, 2020
b8f457b
Adjusted skip props for host pkgproj
Apr 1, 2020
7060904
More feedback
Apr 1, 2020
da25949
More feedback
Apr 1, 2020
0d7f48b
More feedback
Apr 1, 2020
84e2f59
yml syntax in runtime official
Apr 1, 2020
db8b257
Last bit of nits
Apr 1, 2020
d0dafc3
Disabled useOfficialAllConfigurations and buildFullPlatformManifest o…
Apr 2, 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
1 change: 1 addition & 0 deletions src/installer/pkg/projects/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<PropertyGroup>
<PackagePlatform>AnyCPU</PackagePlatform>

<SkipBuildOnRuntimePackOnlyOS>false</SkipBuildOnRuntimePackOnlyOS>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. -->
<OutputPath>$(PackageOutputPath)</OutputPath>
Expand Down
11 changes: 11 additions & 0 deletions src/installer/pkg/projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
<StableVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' != 'true'">$(Version)</StableVersion>
</PropertyGroup>

<!--
For mobile targets, we do not need the host, so allow depproj's to opt
in in order to skip building.
steveisok marked this conversation as resolved.
Show resolved Hide resolved
-->
<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps"
Condition="'$(SkipBuildOnRuntimePackOnlyOS)' and '$(TargetOS)' == 'iOS'">
steveisok marked this conversation as resolved.
Show resolved Hide resolved
steveisok marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

<!--
For any Dependency items with a VersionProp, set it to the property by that name given by the
version generation target. For any with a VersionFromProject, query the ProductVersion from that
Expand Down
8 changes: 1 addition & 7 deletions ...ller/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionProp>AppHostVersion</VersionProp>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>

<Import Project="$(MSBuildProjectName).props" Condition="'$(TargetOS)' != 'iOS'" />

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

</Project>
7 changes: 1 addition & 6 deletions src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<InstallerName>dotnet-host</InstallerName>
<GenerateSharedFrameworkPart>true</GenerateSharedFrameworkPart>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>

<Target Name="SetupHostSpecificWixBuild"
Expand Down Expand Up @@ -47,12 +48,6 @@
</ItemGroup>
</Target>

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

<Import Condition="'$(PackageTargetRuntime)' != '' and '$(TargetOS)' != 'iOS'" Project="$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildProjectName).props" />

</Project>
8 changes: 1 addition & 7 deletions ...kg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@

<PropertyGroup>
<VersionProp>HostPolicyVersion</VersionProp>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>

<ItemGroup>
<Dependency Include="Microsoft.NETCore.DotNetHostResolver" VersionProp="HostResolverVersion" />
</ItemGroup>

<Import Project="$(MSBuildProjectName).props" Condition="'$(TargetOS)' != 'iOS'" />
steveisok marked this conversation as resolved.
Show resolved Hide resolved

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

</Project>
7 changes: 1 addition & 6 deletions ...rojects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<InstallerName>dotnet-hostfxr</InstallerName>
<GenerateSharedFrameworkPart>true</GenerateSharedFrameworkPart>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -45,12 +46,6 @@
</ItemGroup>
</Target>

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

<Import Project="$(MSBuildProjectName).props" Condition="'$(TargetOS)' != 'iOS'" />

</Project>
7 changes: 1 addition & 6 deletions src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<PropertyGroup>
<FrameworkPackType>crossgen2</FrameworkPackType>
<BuildRidSpecificPacks>true</BuildRidSpecificPacks>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -87,12 +88,6 @@

</Target>

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

</Project>
8 changes: 3 additions & 5 deletions src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
<CrossArchSdkMsiInstallerArch Include="x64;x86" />
</ItemGroup>

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>
<PropertyGroup>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>
</Project>
9 changes: 3 additions & 6 deletions src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
<File Include="PackageOverrides.txt" TargetPath="data/" />
</ItemGroup>

<Target Name="MobileSkipBuildProps" BeforeTargets="GetSkipBuildProps" Condition="'$(TargetOS)' == 'iOS'">
<PropertyGroup>
<SkipBuild>true</SkipBuild>
</PropertyGroup>
</Target>

<PropertyGroup>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>
</Project>