Default runtimeos, remove unused variables from jit pkgproj

diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
index 27b0bc8..4f8c70b 100644 (file)
--- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
@@ -29,10 +29,6 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFrameworkName>netcoreapp</TargetFrameworkName>
-    <TargetFrameworkVersion>2.0</TargetFrameworkVersion>
-    <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
-
     <LongNamePlatform>$(PackagePlatform)</LongNamePlatform>
     <LongNamePlatform Condition="'$(LongNamePlatform)'=='x64'">amd64</LongNamePlatform>
     <CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform>

diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props
index 7f1c5bc..d8c96aa 100644 (file)
--- a/src/.nuget/packaging.props
+++ b/src/.nuget/packaging.props
@@ -3,11 +3,17 @@
   <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)' == ''">win10</RuntimeOS>
+
     <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Linux</SupportedPackageOSGroups>
     <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups>
 
     <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>