diff options
Diffstat (limited to 'src/.nuget/dir.props')
| -rw-r--r-- | src/.nuget/dir.props | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 59b94f75b2..2ff88d9bcf 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -26,8 +26,12 @@ <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Linux</SupportedPackageOSGroups> <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups> + <!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or + portable (e.g. osx). + --> <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex> <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily> + <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' == '-1'">$(RuntimeOS)</_runtimeOSFamily> <_isSupportedOSGroup>true</_isSupportedOSGroup> </PropertyGroup> @@ -66,7 +70,7 @@ <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> + <RIDPlatform Condition="'$(PortableBuild)' == 'true'">win</RIDPlatform> <PackageRID>$(RIDPlatform)-$(ArchGroup)</PackageRID> </PropertyGroup> </When> @@ -74,21 +78,21 @@ <PropertyGroup> <PackageRID>osx.10.12-$(ArchGroup)</PackageRID> <!-- Set the platform part of the RID if we are doing a portable build --> - <PackageRID Condition="'$(PortableBuild)' == '1'">osx-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(PortableBuild)' == 'true'">osx-$(ArchGroup)</PackageRID> </PropertyGroup> </When> <When Condition="'$(_runtimeOSFamily)' == 'rhel'"> <PropertyGroup> <PackageRID>rhel.7-$(ArchGroup)</PackageRID> <!-- Set the platform part of the RID if we are doing a portable build --> - <PackageRID Condition="'$(PortableBuild)' == '1'">linux-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(PortableBuild)' == 'true'">linux-$(ArchGroup)</PackageRID> </PropertyGroup> </When> <Otherwise> <PropertyGroup> <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID> <!-- Set the platform part of the RID if we are doing a portable build --> - <PackageRID Condition="'$(PortableBuild)' == '1'">linux-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(PortableBuild)' == 'true'">linux-$(ArchGroup)</PackageRID> </PropertyGroup> </Otherwise> </Choose> @@ -111,51 +115,22 @@ </Choose> <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))"> - <OfficialBuildRID Include="alpine.3.4.3-x64" /> - <OfficialBuildRID Include="debian.8-armel"> - <Platform>armel</Platform> - </OfficialBuildRID> - <OfficialBuildRID Include="debian.8-x64" /> - <OfficialBuildRID Include="fedora.23-x64" /> - <OfficialBuildRID Include="fedora.24-x64" /> <OfficialBuildRID Include="linux-x64" /> <OfficialBuildRID Include="linux-arm"> <Platform>arm</Platform> </OfficialBuildRID> - <OfficialBuildRID Include="opensuse.42.1-x64" /> - <OfficialBuildRID Include="rhel.7-x64" /> <OfficialBuildRID Include="tizen.4.0.0-armel"> <Platform>armel</Platform> </OfficialBuildRID> - <OfficialBuildRID Include="ubuntu.14.04-arm"> - <Platform>arm</Platform> - </OfficialBuildRID> - <OfficialBuildRID Include="ubuntu.14.04-x64" /> - <OfficialBuildRID Include="ubuntu.16.04-arm"> - <Platform>arm</Platform> - </OfficialBuildRID> - <OfficialBuildRID Include="ubuntu.16.04-x64" /> - <OfficialBuildRID Include="ubuntu.16.10-x64" /> </ItemGroup> <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';OSX;'))"> - <OfficialBuildRID Include="osx.10.12-x64" /> <OfficialBuildRID Include="osx-x64" /> </ItemGroup> <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Windows_NT;'))"> - <OfficialBuildRID Include="win7-x86"> - <Platform>x86</Platform> - </OfficialBuildRID> <OfficialBuildRID Include="win-x86"> <Platform>x86</Platform> </OfficialBuildRID> - <OfficialBuildRID Include="win7-x64" /> <OfficialBuildRID Include="win-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> |