diff options
| author | Wes Haggard <weshaggard@users.noreply.github.com> | 2017-04-21 04:14:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 04:14:30 +0300 |
| commit | 755db753ef024230f25a9262d9397ce34b870698 (patch) | |
| tree | cfe6e2aa8c8b599ac6570bff8023f07567212ef2 /external | |
| parent | eade542a2fb54540499e34e4cf60651cf1d7b06a (diff) | |
Update apicompat baseline files (#18583)
Started copying netstandars shims for netfx under ref\netfx
Diffstat (limited to 'external')
| -rw-r--r-- | external/netfx/netfx.depproj | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj index db71e0bce9..b20ddac32c 100644 --- a/external/netfx/netfx.depproj +++ b/external/netfx/netfx.depproj @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <Import Project="$(SourceDir)\shims\netfxreference.props" /> <PropertyGroup> <BinPlaceRef>true</BinPlaceRef> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier> + <RefOutputPath>$(RefPath)</RefOutputPath> </PropertyGroup> <PropertyGroup Condition="'$(NuGetTargetMoniker)' == '.NETFramework,Version=v4.6.3'"> <!-- Missing 4.6.3 targeting pack, use 462 for now --> @@ -15,23 +17,48 @@ <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker> <NuGetTargetMonikerShort>net461</NuGetTargetMonikerShort> <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId> - <ForShims>true</ForShims> + <RefOutputPath>$(NetFxRefPath)</RefOutputPath> </PropertyGroup> <ItemGroup> <PackageReference Include="$(TargetingPackNugetPackageId)"> <Version Condition="'$(TargetGroup)' != 'net47'">1.0.1</Version> <Version Condition="'$(TargetGroup)' == 'net47'">1.0.0-prerelease</Version> </PackageReference> + <PackageReference Include="NETStandard.Library" Condition="'$(TargetGroup)' == 'netfx'"> + <Version>$(NETStandardPackageVersion)</Version> + </PackageReference> </ItemGroup> <ItemGroup> <BinPlaceConfiguration Include="$(Configuration)"> - <RefPath Condition="'$(ForShims)' != 'true'">$(RefPath)</RefPath> - <RefPath Condition="'$(ForShims)' == 'true'">$(NetFxRefPath)</RefPath> + <RefPath>$(RefOutputPath)</RefPath> </BinPlaceConfiguration> - + <FileToExclude Include="System.EnterpriseServices" /> <FileToExclude Include="System.EnterpriseServices.Thunk" /> <FileToExclude Include="System.EnterpriseServices.Wrapper" /> </ItemGroup> + + <Target Name="FilterNETStandardShims" BeforeTargets="FilterNugetPackages" + Condition="'$(RefOutputPath)' == '$(NetFxRefPath)'"> + <PropertyGroup> + <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard2.0\ref</_NETStandardRefFolder> + </PropertyGroup> + <ItemGroup> + <_excludeForNetFx Include="@(NetFxReference);netstandard" /> + <_netstandardShimAssemblies Include="$(_NETStandardRefFolder)\*.dll" Exclude="@(_excludeForNetFx->'$(_NETStandardRefFolder)\%(Identity).dll')" /> + <FileToExclude Include="@(_netstandardShimAssemblies->'%(FileName)')" /> + </ItemGroup> + </Target> + + <Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages" + Condition="'$(RefOutputPath)' == '$(NetFxRefPath)'"> + <ItemGroup> + <Reference Include="@(_netstandardShimAssemblies)"> + <Private>False</Private> + <NuGetPackageId>$(NETStandardPackageId)</NuGetPackageId> + <NuGetPackageVersion>$(NETStandardPackageVersion)</NuGetPackageVersion> + </Reference> + </ItemGroup> + </Target> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> |