diff options
| author | Christopher Costa <chcosta@microsoft.com> | 2017-02-01 15:00:56 -0800 |
|---|---|---|
| committer | Christopher Costa <chcosta@microsoft.com> | 2017-02-01 15:00:56 -0800 |
| commit | 9d8b1f445076ec7bb33bf7d9a47c67f0a33f197b (patch) | |
| tree | 67c2bed47405b6393d53f9612a7086e681a6f179 | |
| parent | f20878d20d313623ef7babbe29494d80aafdadae (diff) | |
| download | coreclr-9d8b1f445076ec7bb33bf7d9a47c67f0a33f197b.tar.gz coreclr-9d8b1f445076ec7bb33bf7d9a47c67f0a33f197b.tar.bz2 coreclr-9d8b1f445076ec7bb33bf7d9a47c67f0a33f197b.zip | |
Add missing dependency to ilasm / ildasm packages, parse distrorid
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj | 4 | ||||
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj | 4 | ||||
| -rw-r--r-- | src/.nuget/packaging.props | 12 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index f863619c9c..8f62076f23 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -7,6 +7,10 @@ <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> + <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" /> + </ItemGroup> + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index f863619c9c..a133a155db 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -7,6 +7,10 @@ <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> + <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" /> + </ItemGroup> + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props index a4ecf56417..5eef888da8 100644 --- a/src/.nuget/packaging.props +++ b/src/.nuget/packaging.props @@ -3,13 +3,19 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <RuntimeOS Condition="'$(RuntimeOS)' == '' and '$(__DistroRid)' != ''">$(__DistroRid)</RuntimeOS> - <RuntimeOS Condition="'$(RuntimeOS)' == ''">win10</RuntimeOS> + <!-- Distro rid is passed as runtimeos-arch--> + <OSRid>win10</OSRid> + <_distroRidIndex>$(__DistroRid.IndexOfAny("-"))</_distroRidIndex> + <OSRid Condition="'$(_distroRidIndex)' != '-1'">$(__DistroRid.SubString(0, $(_distroRidIndex)))</OSRid> + <ArchGroup Condition="'$(ArchGroup)' == '' and '$(_distroRidIndex)' != '-1'">$(__DistroRid.SubString($(_distroRidIndex) + 1))</ArchGroup> + </PropertyGroup> + <PropertyGroup> + <RuntimeOS Condition="'$(RuntimeOS)' == ''">$(OSRid)</RuntimeOS> <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Linux</SupportedPackageOSGroups> <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups> - <ArchGroup Condition="'$(Platform)' != ''">$(Platform)</ArchGroup> + <ArchGroup Condition="'$(ArchGroup)' == '' and '$(Platform)' != ''">$(Platform)</ArchGroup> <ArchGroup Condition="'$(ArchGroup)' == ''">$(BuildArch)</ArchGroup> <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex> |