提交 7c00269d 编写于 作者: E Eric StJohn 提交者: GitHub

Merge pull request dotnet/core-setup#2185 from ericstj/excludeExternalBuildRIDs

Exclude debian and tizen from platform manifest

Commit migrated from https://github.com/dotnet/core-setup/commit/cb20622f7a19b0ac8e395227f5d7a8245b95a242
......@@ -65,7 +65,9 @@
<MSBuild Projects="@(ProjectReference)"
Condition="'%(ProjectReference.PackageTargetRuntime)' == '$(PackageRID)' OR
'%(ProjectReference.BuidOnRID)' == '$(PackageRID)' OR
('$(IncludeAllRuntimePackagesInPlatformManifest)' == 'true' AND '%(ProjectReference.PackageTargetRuntime)' != '')"
('$(IncludeAllRuntimePackagesInPlatformManifest)' == 'true' AND
'%(ProjectReference.PackageTargetRuntime)' != '' AND
'%(ProjectReference.ExcludeFromPlatformManifest)' != 'true')"
Targets="GetPackageFiles">
<Output TaskParameter="TargetOutputs" ItemName="SharedFrameworkRuntimeFiles" />
</MSBuild>
......
......@@ -63,6 +63,10 @@
<ItemGroup>
<!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set -->
<BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
<!-- Include Unofficial Build RIDs in runtime.json's but do not include in the platform manifest -->
<BuildRID Include="@(UnofficialBuildRID)" Exclude="$(PackageRID)">
<ExcludeFromPlatformManifest>true</ExcludeFromPlatformManifest>
</BuildRID>
<BuildRID Include="$(PackageRID)">
<Platform>$(Platform)</Platform>
</BuildRID>
......
......@@ -16,9 +16,6 @@
</PropertyGroup>
<ItemGroup>
<OfficialBuildRID Include="debian.8-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="linux-x64" />
<OfficialBuildRID Include="osx-x64" />
<OfficialBuildRID Include="win-x86">
......@@ -34,9 +31,15 @@
<OfficialBuildRID Include="linux-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="tizen.4.0.0-armel">
<!-- 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. -->
<UnofficialBuildRID Include="debian.8-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
</ItemGroup>
</UnofficialBuildRID>
<UnofficialBuildRID Include="tizen.4.0.0-armel">
<Platform>armel</Platform>
</UnofficialBuildRID>
</ItemGroup>
</Project>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册