diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-04-18 20:01:14 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-04-18 20:01:14 +0300 |
| commit | f7f1320d5aeb59db4a8f054be23d872c6f6aade1 (patch) | |
| tree | d06551a523966471617be7a7bea73f0e9ebe7290 /external | |
| parent | 52e657701f7846ca209fe4350df0175391b7aaed (diff) | |
Remove netfx asset copying from NETStandard.Library package
We are now building the netfx assets live in corefx and removed
them from the NETStandard.Library package so we need to adjust
the consumption of that package to account for it.
Diffstat (limited to 'external')
| -rw-r--r-- | external/netstandard/Configurations.props | 1 | ||||
| -rw-r--r-- | external/netstandard/netstandard.depproj | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/external/netstandard/Configurations.props b/external/netstandard/Configurations.props index d495fa4b2e..2e14c5a1f6 100644 --- a/external/netstandard/Configurations.props +++ b/external/netstandard/Configurations.props @@ -11,7 +11,6 @@ netstandard1.6; netstandard2.0; netstandard; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj index 54580889b7..00b0561c62 100644 --- a/external/netstandard/netstandard.depproj +++ b/external/netstandard/netstandard.depproj @@ -2,16 +2,11 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <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> <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> <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier> <_NETStandardTFMFolder Condition="'$(NuGetTargetMoniker)' == '.NETStandard,Version=v2.0'">netstandard2.0</_NETStandardTFMFolder> - <_NETStandardTFMFolder Condition="'$(IsNetFx)' == 'true'">net461</_NETStandardTFMFolder> </PropertyGroup> <ItemGroup> @@ -39,8 +34,6 @@ <!-- for all configurations this project provides refs for that configuration --> <BinPlaceConfiguration Include="$(Configuration)"> <RefPath>$(RefPath)</RefPath> - <!-- only for netfx verticals will this project provide runtime assets --> - <RuntimePath>$(RuntimePath)</RuntimePath> </BinPlaceConfiguration> <BinPlaceConfiguration Include="$(Configuration)"> <!-- copy shims to the testhost as well in order to be able to run the netfx tests --> |