diff options
| author | Tom Deseyn <tom.deseyn@gmail.com> | 2017-07-17 20:01:20 +0300 |
|---|---|---|
| committer | Wes Haggard <weshaggard@users.noreply.github.com> | 2017-07-17 20:01:20 +0300 |
| commit | 99809cd3d01496af6fe973fd0364f06846769640 (patch) | |
| tree | 0f622939d72ca2bbfa8016f22976a10e3ff39927 /pkg/Microsoft.Private.CoreFx.UAP | |
| parent | 7ae10954114b90a0a1125a3720fde9e22e1913f0 (diff) | |
Move RID computations to dir.props
Move the RID calculation to the common dir.props file.
Compute a ToolRuntimeRID to be used for assets that need to run as part of the tools infrastructure to build things.
Compute PackageRID which will be used as the target RID for the assets that are being built.
Make sure both ToolRuntimeRID and PackageRID honor both a specific and a portable RID.
Diffstat (limited to 'pkg/Microsoft.Private.CoreFx.UAP')
| -rw-r--r-- | pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props b/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props index c92651a996..4dda2a8ff5 100644 --- a/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props +++ b/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props @@ -1,23 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <_aotSuffix Condition="'$(TargetGroup)' == 'uapaot'">-aot</_aotSuffix> - </PropertyGroup> - - <Choose> - <When Condition="'$(PackageRID)' != ''" /> - <When Condition="'$(_runtimeOSFamily)' == 'win'"> - <PropertyGroup> - <PackageRID>win10-$(ArchGroup)$(_aotSuffix)</PackageRID> - </PropertyGroup> - </When> - <Otherwise> - <PropertyGroup> - <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID> - </PropertyGroup> - </Otherwise> - </Choose> - <ItemGroup> <OfficialBuildRID Include="win10-x86"> <Platform>x86</Platform> |