Skip to content

Commit

Permalink
Remove non-portable RIDs from netcoreapp package
Browse files Browse the repository at this point in the history
Keeping tizen for the time being until we have a better
way to connect their builds
  • Loading branch information
weshaggard committed May 30, 2017
1 parent b3a86e8 commit aaeff85
Showing 1 changed file with 20 additions and 69 deletions.
89 changes: 20 additions & 69 deletions pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
Original file line number Diff line number Diff line change
@@ -1,85 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition="'$(PackageRID)' != ''" />
<When Condition="'$(_runtimeOSFamily)' == 'win'">
<PropertyGroup>
<PackageRID Condition="'$(ArchGroup)' == 'x86' OR '$(ArchGroup)' == 'x64'">win7-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(ArchGroup)' == 'arm'">win8-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(ArchGroup)' == 'arm64'">win10-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(PortableBuild)' == 'true'">win-$(ArchGroup)</PackageRID>
</PropertyGroup>
</When>
<When Condition="'$(_runtimeOSFamily)' == 'osx'">
<PropertyGroup>
<PackageRID>osx.10.12-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(PortableBuild)' == 'true'">osx-$(ArchGroup)</PackageRID>
</PropertyGroup>
</When>
<When Condition="'$(_runtimeOSFamily)' == 'rhel'">
<PropertyGroup>
<PackageRID>rhel.7-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(PortableBuild)' == 'true'">linux-$(ArchGroup)</PackageRID>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(PortableBuild)' == 'true'">linux-$(ArchGroup)</PackageRID>
</PropertyGroup>
</Otherwise>
</Choose>
<PropertyGroup Condition="'$(PortableBuild)' == 'true'">
<PackageRID>win-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(OSGroup)' == 'OSX'">osx-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(OSGroup)' == 'Linux'">linux-$(ArchGroup)</PackageRID>
</PropertyGroup>
<PropertyGroup Condition="'$(PortableBuild)' != 'true'">
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
</PropertyGroup>

<ItemGroup>
<OfficialBuildRID Include="alpine.3.4.3-x64" />
<OfficialBuildRID Include="debian.8-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="debian.8-x64" />
<OfficialBuildRID Include="fedora.24-x64" />
<OfficialBuildRID Include="linux-x64" />
<OfficialBuildRID Include="opensuse.13.2-x64" />
<OfficialBuildRID Include="opensuse.42.1-x64" />
<OfficialBuildRID Include="osx.10.12-x64" />
<OfficialBuildRID Include="osx-x64" />
<OfficialBuildRID Include="rhel.7-x64" />
<OfficialBuildRID Include="tizen.4.0.0-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="linux-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.14.04-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.14.04-x64" />
<OfficialBuildRID Include="ubuntu.16.04-arm">
<OfficialBuildRID Include="linux-x64" />
<OfficialBuildRID Include="osx-x64" />
<OfficialBuildRID Include="win-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.16.04-x64" />
<OfficialBuildRID Include="ubuntu.16.10-arm">
<Platform>arm</Platform>
<OfficialBuildRID Include="win-arm64">
<Platform>arm64</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.16.10-x64" />
<OfficialBuildRID Include="win-x64" />
<OfficialBuildRID Include="win-x86">
<Platform>x86</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win7-x86">
<Platform>x86</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win-x64" />
<OfficialBuildRID Include="win7-x64" />
<OfficialBuildRID Include="win8-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win10-arm64">
<Platform>arm64</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win-arm64">
<Platform>arm64</Platform>

<!-- The following RIDs are not officically supported and are not
built during official builds, however we wish to include them
in our runtime.json to enable others to provide them. -->
<OfficialBuildRID Include="tizen.4.0.0-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
</ItemGroup>
</Project>

0 comments on commit aaeff85

Please sign in to comment.