projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6458745 5c0cf06)
Merge branch 'master' of https://github.com/dotnet/coreclr into refactor_packaging
authorChristopher Costa <chcosta@microsoft.com>
Tue, 14 Feb 2017 01:24:26 +0000 (17:24 -0800)
committerChristopher Costa <chcosta@microsoft.com>
Tue, 14 Feb 2017 01:24:26 +0000 (17:24 -0800)
1  2 
build.sh patch | diff1 | diff2 | blob | history
src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj patch | diff1 | diff2 | blob | history
src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj patch | diff1 | diff2 | blob | history
src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj patch | diff1 | diff2 | blob | history
src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj patch | diff1 | diff2 | blob | history
src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj patch | diff1 | diff2 | blob | history

diff --cc build.sh
Simple merge
diff --cc src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
index bfa4bd8,4a5b1ad..cf5d909
--- 1/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
--- 2/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
@@@ -1,20 -1,75 +1,20 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 -  <PropertyGroup>
 -    <SkipPackageFileCheck>true</SkipPackageFileCheck>
 -    <SkipValidatePackage>true</SkipValidatePackage>
 -    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>
 -    <OutputPath>$(PackagesOutputPath)</OutputPath>
 -    <IncludeRuntimeJson>true</IncludeRuntimeJson>
 +
 +  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-     <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>  
++    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>  
 +    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
    </PropertyGroup>
 -  <ItemGroup>
 -    <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" />
 -    <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>arm64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>x86</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="linux\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\23\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\24\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="rhel\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="tizen\4.0.0\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj">
 -      <Platform>amd64</Platform>
 +
 +  <ItemGroup Condition="'$(IsLineupPackage)' == 'true'">
 +    <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" >
 +      <!-- we should look at moving this into packaging.targets instead of having to carry this around for every pkgproj project reference -->
 +      <AdditionalProperties>%(ProjectReference.AdditionalProperties);IsLineupPackage=false</AdditionalProperties>
      </ProjectReference>
    </ItemGroup>
 -  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 +  
 +  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
 +
 +  <Import Project="$(MSBuildThisFileDirectory)..\..\..\dir.targets" />
  </Project>
diff --cc src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
index 4236e31,cdfee45..73c27ae
--- 1/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
--- 2/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
@@@ -1,19 -1,75 +1,19 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 -  <PropertyGroup>
 -    <SkipPackageFileCheck>true</SkipPackageFileCheck>
 -    <SkipValidatePackage>true</SkipValidatePackage>
 -    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>
 -    <OutputPath>$(PackagesOutputPath)</OutputPath>
 -    <IncludeRuntimeJson>true</IncludeRuntimeJson>
 +
 +  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-     <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>  
++    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>  
 +    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
    </PropertyGroup>
 -  <ItemGroup>
 -    <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" />
 -    <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>arm64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>x86</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="linux\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\23\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\24\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="rhel\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="tizen\4.0.0\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj">
 -      <Platform>amd64</Platform>
 +
 +  <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
 +    <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 +      <AdditionalProperties>%(ProjectReference.AdditionalProperties);IsLineupPackage=false</AdditionalProperties>
      </ProjectReference>
    </ItemGroup>
 -  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 +
 +  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
 +
 +  <Import Project="$(MSBuildThisFileDirectory)..\..\..\dir.targets" />
  </Project>
diff --cc src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
index 5ed709e,dd39f77..a0ef5c9
--- 1/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
--- 2/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
@@@ -1,22 -1,74 +1,22 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-     <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>  
 +
 +  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
++    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>  
 +    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
 +  </PropertyGroup>
 +
    <PropertyGroup>
 -    <SkipPackageFileCheck>true</SkipPackageFileCheck>
 -    <SkipValidatePackage>true</SkipValidatePackage>
 -    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>
 -    <OutputPath>$(PackagesOutputPath)</OutputPath>
 -    <IncludeRuntimeJson>true</IncludeRuntimeJson>
 +    <LongNamePlatform>$(PackagePlatform)</LongNamePlatform>
 +    <LongNamePlatform Condition="'$(LongNamePlatform)'=='x64'">amd64</LongNamePlatform>
 +    <CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform>
 +    <CrossTargetPlatform Condition="'$(CrossTargetPlatform)'=='x64'">amd64</CrossTargetPlatform>
 +    <LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</LongNameSuffix>
 +    <CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</CrossTargetLongNameSuffix>
    </PropertyGroup>
 -  <ItemGroup>
 -    <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>arm64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>x86</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="linux\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\23\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\24\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="rhel\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="tizen\4.0.0\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="osx\Microsoft.NETCore.Jit.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -  </ItemGroup>
 -  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 +
 +  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
 +
 +  <Import Project="$(MSBuildThisFileDirectory)..\..\..\dir.targets" />
  </Project>
diff --cc src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
index bf3177b,bc4b862..5c933c1
--- 1/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
--- 2/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
@@@ -1,19 -1,75 +1,19 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 -  <PropertyGroup>
 -    <SkipPackageFileCheck>true</SkipPackageFileCheck>
 -    <SkipValidatePackage>true</SkipValidatePackage>
 -    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>
 -    <OutputPath>$(PackagesOutputPath)</OutputPath>
 -    <IncludeRuntimeJson>true</IncludeRuntimeJson>
 +
 +  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-     <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>  
++    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>  
 +    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
    </PropertyGroup>
 -  <ItemGroup>
 -    <ProjectReference Include="..\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.pkgproj" />
 -    <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>arm64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>x86</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="linux\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\23\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\24\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="rhel\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="tizen\4.0.0\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
 -      <Platform>amd64</Platform>
 +  
 +  <ItemGroup Condition="'$(IsLineupPackage)' == 'true'">
 +    <ProjectReference Include="..\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.pkgproj">
 +      <AdditionalProperties>%(ProjectReference.AdditionalProperties);IsLineupPackage=false</AdditionalProperties>
      </ProjectReference>
    </ItemGroup>
 -  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 +
 +  <Import Condition="'$(_packageTargetOSGroup)' != ''"  Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
 +  
 +  <Import Project="$(MSBuildThisFileDirectory)..\..\..\dir.targets" />
  </Project>
diff --cc src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
index 991d762,ee8f6a9..d65f0ec
--- 1/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
--- 2/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
@@@ -1,13 -1,74 +1,13 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 -  <PropertyGroup>
 -    <SkipPackageFileCheck>true</SkipPackageFileCheck>
 -    <SkipValidatePackage>true</SkipValidatePackage>
 -    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>
 -    <OutputPath>$(PackagesOutputPath)</OutputPath>
 -    <IncludeRuntimeJson>true</IncludeRuntimeJson>
 +
 +  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-     <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>  
++    <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms>  
 +    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
    </PropertyGroup>
 -  <ItemGroup>
 -    <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>arm64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>x86</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="linux\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="debian\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\23\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="fedora\24\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="rhel\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>arm</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="tizen\4.0.0\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>armel</Platform>
 -    </ProjectReference>
 -    <ProjectReference Include="osx\Microsoft.NETCore.TestHost.pkgproj">
 -      <Platform>amd64</Platform>
 -    </ProjectReference>
 -  </ItemGroup>
 -  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 +
 +  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
 +
 +  <Import Project="$(MSBuildThisFileDirectory)..\..\..\dir.targets" />
  </Project>
Domain: Dotnet / Core;