Use __distrorid, distrorid is not set on osx

EgorBo · Feb 1, 2017 · 12a37e3 · 12a37e3
1 parent 91dafc4
commit 12a37e3
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props
@@ -3,8 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <RuntimeOS Condition="'$(RuntimeOS)' == '' and '$(DistroRid)' != ''">$(DistroRid)</RuntimeOS>
-    <RuntimeOS Condition="'$(RuntimeOS)' == '' and '$(OS)' == 'OSX'">osx.10.10</RuntimeOS>
+    <RuntimeOS Condition="'$(RuntimeOS)' == '' and '$(__DistroRid)' != ''">$(__DistroRid)</RuntimeOS>
     <RuntimeOS Condition="'$(RuntimeOS)' == ''">win10</RuntimeOS>
 
     <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Linux</SupportedPackageOSGroups>
@@ -13,7 +12,6 @@
     <ArchGroup Condition="'$(Platform)' != ''">$(Platform)</ArchGroup>
     <ArchGroup Condition="'$(ArchGroup)' == ''">$(BuildArch)</ArchGroup>
 
-
     <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
     <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
     <_isSupportedOSGroup>true</_isSupportedOSGroup>