diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-02-03 04:10:01 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-02-03 19:32:14 +0300 |
| commit | d549c08d12f32c6c8bead3a98cfce9d0fe9dd10d (patch) | |
| tree | a9fe5952380ff65cca5b7a556b745e878c5748f4 /external/runtime | |
| parent | 843cc24cf013c49c998f24eb43d5f32185a416b2 (diff) | |
System.Private.CoreLib is OSGroup-specific
Make sure that we represent System.PrivateCoreLib as OSGroup specific
since it exposes different types on Windows vs Unix.
Diffstat (limited to 'external/runtime')
| -rw-r--r-- | external/runtime/Configurations.props | 3 | ||||
| -rw-r--r-- | external/runtime/runtime.depproj | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props index 38f4dab7aa..6ea99618b9 100644 --- a/external/runtime/Configurations.props +++ b/external/runtime/Configurations.props @@ -2,7 +2,8 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netcoreapp; + netcoreapp-Windows_NT; + netcoreapp-Unix; uap; uapaot; </BuildConfigurations> diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index bad70c9c81..fd50c9cfe5 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -2,6 +2,9 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> + <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for --> + <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT' AND '$(OSEnvironment)' != 'Windows_NT'">win7-x64</NugetRuntimeIdentifier> + <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Unix' AND '$(OSEnvironment)' == 'Windows_NT'">ubuntu.14.04-x64</NugetRuntimeIdentifier> <!-- WORKAROUND: Force external packages to be restored for x64 until arm packages are fully broughtup--> <NugetRuntimeIdentifier Condition="'$(ArchGroup)' == 'arm'">$(RuntimeOS)-x64</NugetRuntimeIdentifier> </PropertyGroup> |