diff options
| author | Wes Haggard <weshaggard@users.noreply.github.com> | 2018-02-23 21:59:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 21:59:16 +0300 |
| commit | a188af6251e307b9743dc745b797a89a0d5167d2 (patch) | |
| tree | 57fed259ebc52e85667ba92ca5990288b345f31c /external | |
| parent | c69e6e76f40ec752bb25ebbbdd440b5e6e70dad8 (diff) | |
| parent | 4749c431969f0ac07cae30b35f58dc71cf3b35c8 (diff) | |
Merge pull request #27337 from maryamariyan/typeforward-lazy
Adding missing typeforward for Lazy<T,TMetadata> to S.CM.Composition
Diffstat (limited to 'external')
| -rw-r--r-- | external/netcoreapp/netcoreapp.depproj | 2 | ||||
| -rw-r--r-- | external/netstandard/netstandard.depproj | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/external/netcoreapp/netcoreapp.depproj b/external/netcoreapp/netcoreapp.depproj index d4dcfcfa70..1e076c34ae 100644 --- a/external/netcoreapp/netcoreapp.depproj +++ b/external/netcoreapp/netcoreapp.depproj @@ -21,6 +21,8 @@ <BinPlaceConfiguration Include="$(Configuration)"> <RefPath>$(RefPath)</RefPath> </BinPlaceConfiguration> + + <FileToExclude Include="System.ComponentModel.Composition" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj index 44dab19787..ca80986109 100644 --- a/external/netstandard/netstandard.depproj +++ b/external/netstandard/netstandard.depproj @@ -55,8 +55,16 @@ <PropertyGroup> <_NETStandardRefFolder>$(PackagesDir)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder> </PropertyGroup> + + <ItemGroup> + <ExcludeNetStandardRefs Include="System.ComponentModel.Composition" /> + <NetStandardRefs + Include="$(_NETStandardRefFolder)\*.dll" + Exclude="@(ExcludeNetStandardRefs -> '$(_NETStandardRefFolder)\%(Identity).dll')" /> + </ItemGroup> + <ItemGroup> - <Reference Include="$(_NETStandardRefFolder)\*.dll"> + <Reference Include="@(NetStandardRefs)"> <Private>False</Private> <NuGetPackageId>$(NETStandardLibraryPackageId)</NuGetPackageId> <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion> |