diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-02-03 00:45:25 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-02-03 19:30:56 +0300 |
| commit | 36c0d5a6724b43781fa1ab0581b030ea6420af45 (patch) | |
| tree | d9921c016b5a354d1df8d4e55823207afc9b9395 /external/runtime | |
| parent | e331a63ed617914f94bb976f4b9d55c0b7a8fd2d (diff) | |
Don't filter netfx targeting pack
Previously we'd filter the netfx targeting pack when we weren't building
for netfx vertical. This was because shims were using all the files in
this folder when generating shims to other frameworks (netcoreapp/uap).
This breaks in the Build-all scenario. We need the full targeting pack
in order to build netfx configurations, but the shims end up getting
more files then they need which was causing genfacades to regenerate
reference assemblies as facades with typeforwards to themselves.
To fix this I stopped filtering when building out the targeting pack,
and moved that filtering to the shims.proj.
Diffstat (limited to 'external/runtime')
| -rw-r--r-- | external/runtime/runtime.depproj | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 68ddad5f54..bad70c9c81 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -9,13 +9,5 @@ <ProjectJsonTemplate>$(MSBuildThisFileDirectory)NETNative/project.json.template</ProjectJsonTemplate> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> </PropertyGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'"> - <TargetingPackReference Include="System.Private.CoreLib" /> - <TargetingPackReference Include="System.Private.CoreLib.Augments" /> - <TargetingPackReference Include="System.Private.CoreLib.DynamicDelegate" /> - <TargetingPackReference Include="System.Private.CoreLib.WinRTInterop" /> - <TargetingPackReference Include="System.Private.Interop" /> - <TargetingPackReference Include="System.Private.Threading" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file |