diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2017-03-22 13:30:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 13:30:49 -0700 |
| commit | da1d8cd17a8ec2a78e8139d03be358d26acb503c (patch) | |
| tree | 46a3d6f201bb31f690dfd77ae9bb57667a7cc110 /src/.nuget/dir.props | |
| parent | 2e970d8c53b4750c46ea00ea4c044af57e6b53df (diff) | |
| download | coreclr-da1d8cd17a8ec2a78e8139d03be358d26acb503c.tar.gz coreclr-da1d8cd17a8ec2a78e8139d03be358d26acb503c.tar.bz2 coreclr-da1d8cd17a8ec2a78e8139d03be358d26acb503c.zip | |
Enable Portable Windows RID (#10365)
* Enable Portable RID support for Windows and OSX.
Diffstat (limited to 'src/.nuget/dir.props')
| -rw-r--r-- | src/.nuget/dir.props | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index eb1457160d..6f9e29cf27 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -61,9 +61,13 @@ <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> + <RIDPlatform>win7</RIDPlatform> + <RIDPlatform Condition="'$(ArchGroup)' == 'arm'">win8</RIDPlatform> + <RIDPlatform Condition="'$(ArchGroup)' == 'arm64'">win10</RIDPlatform> + + <!-- Set the platform part of the RID if we are doing a portable build --> + <RIDPlatform Condition="'$(PortableBuild)' == '1'">win</RIDPlatform> + <PackageRID>$(RIDPlatform)-$(ArchGroup)</PackageRID> </PropertyGroup> </When> <When Condition="'$(_runtimeOSFamily)' == 'osx'"> |