diff options
| author | Christopher Costa <chcosta@microsoft.com> | 2017-02-13 17:24:26 -0800 |
|---|---|---|
| committer | Christopher Costa <chcosta@microsoft.com> | 2017-02-13 17:24:26 -0800 |
| commit | cdb472838f05256908ddda527133fda3a80a7e37 (patch) | |
| tree | ecc4ad4f8fe0dbaa25826bcb08df2c76ea48b1c7 /src/.nuget | |
| parent | 64587459f708914dd1088c794de39edf69a7e15e (diff) | |
| parent | 5c0cf068303c5bb9439d46cb7eafd5fdeb1a718a (diff) | |
| download | coreclr-cdb472838f05256908ddda527133fda3a80a7e37.tar.gz coreclr-cdb472838f05256908ddda527133fda3a80a7e37.tar.bz2 coreclr-cdb472838f05256908ddda527133fda3a80a7e37.zip | |
Merge branch 'master' of https://github.com/dotnet/coreclr into refactor_packaging
Diffstat (limited to 'src/.nuget')
6 files changed, 7 insertions, 7 deletions
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index bfa4bd833d..cf5d9094b3 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 4236e316ec..73c27ae8c2 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index 5ed709e2b3..a0ef5c99ac 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index bf3177bef6..5c933c167c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index 991d7621c2..d65f0ec714 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/descriptions.json b/src/.nuget/descriptions.json index ccb6af8bbd..a9038c0936 100644 --- a/src/.nuget/descriptions.json +++ b/src/.nuget/descriptions.json @@ -11,12 +11,12 @@ }, { "Name": "Microsoft.NETCore.Runtime.CoreCLR", - "Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.", + "Description": "The .NET Core runtime, called CoreCLR, and the base library, called System.Private.CoreLib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.", "CommonTypes": [ ] }, { "Name": "Microsoft.TargetingPack.Private.CoreCLR", - "Description": "Contains a private targeting pack which contains only the CoreCLR mscorlib reference assembly. Used for producing platform specific libraries such as facades.", + "Description": "Contains a private targeting pack which contains only the CoreCLR System.Private.CoreLib reference assembly. Used for producing platform specific libraries such as facades.", "CommonTypes": [ ] }, { |