diff options
author | Eric St. John <ericstj@microsoft.com> | 2017-02-03 00:48:02 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2017-02-03 19:30:56 +0300 |
commit | 179336006d4e137d6f897ce041a408f63bbee631 (patch) | |
tree | 975b2e4f60e7847d8fe161362c82eae97bd330b7 /external | |
parent | 36c0d5a6724b43781fa1ab0581b030ea6420af45 (diff) |
Don't use IsReferenceAssembly for binplacing
IsReferenceAssembly has other side-effects, like trimming out any
packages that aren't directly referenced. Instead of using this
to control binplacing for ref, use BinPlaceRef property directly.
This fixes an issue where our netstandard1.x targeting pack folders
were missing all but System.Diagnostics.Contracts.
Diffstat (limited to 'external')
-rw-r--r-- | external/netfx/netfx.depproj | 2 | ||||
-rw-r--r-- | external/netstandard/netstandard.depproj | 2 | ||||
-rw-r--r-- | external/portable/portable.depproj | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj index 24f372cc2d..9401adafda 100644 --- a/external/netfx/netfx.depproj +++ b/external/netfx/netfx.depproj @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <IsReferenceAssembly>true</IsReferenceAssembly> + <BinPlaceRef>true</BinPlaceRef> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier> </PropertyGroup> diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj index c389c944bf..4553750dec 100644 --- a/external/netstandard/netstandard.depproj +++ b/external/netstandard/netstandard.depproj @@ -5,7 +5,7 @@ <IsNetFx Condition="$(NuGetTargetMoniker.StartsWith('.NETFramework,'))">true</IsNetFx> <IsNetFxVertical Condition="'$(_bc_TargetGroup)' == 'netfx' OR $(_bc_TargetGroup.StartsWith('net4'))">true</IsNetFxVertical> <IsNETStandard1x Condition="$(NuGetTargetMoniker.StartsWith('.NETStandard,Version=v1.'))">true</IsNETStandard1x> - <IsReferenceAssembly>true</IsReferenceAssembly> + <BinPlaceRef>true</BinPlaceRef> <!-- when building for any NetFx vertical, also place facades in runtime folder --> <IsRuntimeAndReferenceAssembly Condition="'$(IsNetFx)' == 'true' AND '$(IsNetFxVertical)' == 'true'">true</IsRuntimeAndReferenceAssembly> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> diff --git a/external/portable/portable.depproj b/external/portable/portable.depproj index e95580817f..3521f89523 100644 --- a/external/portable/portable.depproj +++ b/external/portable/portable.depproj @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <IsReferenceAssembly>true</IsReferenceAssembly> + <BinPlaceRef>true</BinPlaceRef> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier> </PropertyGroup> |