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 /src/shims/shims.proj | |
| 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 'src/shims/shims.proj')
| -rw-r--r-- | src/shims/shims.proj | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/shims/shims.proj b/src/shims/shims.proj index 121367d3e0..714053a426 100644 --- a/src/shims/shims.proj +++ b/src/shims/shims.proj @@ -14,10 +14,23 @@ <NetCoreAppRefPath>$(RefPath)</NetCoreAppRefPath> </PropertyGroup> + <ItemGroup> + <NetFxReference Include="mscorlib" /> + <NetFxReference Include="System" /> + <NetFxReference Include="System.Core" /> + <NetFxReference Include="System.Drawing" /> + <NetFxReference Include="System.Numerics" /> + <NetFxReference Include="System.Runtime.Serialization" /> + <NetFxReference Include="System.Web" /> + <NetFxReference Include="System.Xml" /> + <NetFxReference Include="System.Xml.Linq" /> + </ItemGroup> + <Target Name="GetGenFacadesInputs"> <ItemGroup> - <GenFacadesContracts Include="$(NetFxRefPath)*.dll" /> - <GenFacadesContracts Include="$(NetStandardRefPath)netstandard.dll" /> + <NetFxContracts Include="@(NetFxReference->'$(NetFxRefPath)%(Identity).dll')" /> + <NETStandardContracts Include="$(NetStandardRefPath)netstandard.dll" /> + <GenFacadesContracts Include="@(NetFxContracts);@(NETStandardContracts)" /> <GenFacadesSeeds Include="$(NetCoreAppRefPath)*.dll" Exclude="$(NetCoreAppRefPath)System.Private.CoreLib.dll" /> </ItemGroup> </Target> @@ -51,9 +64,9 @@ <GenFacadesCmd>$(ToolHostCmd) "$(ToolsDir)GenFacades.exe"</GenFacadesCmd> </PropertyGroup> - <Exec Command="$(GenFacadesCmd) -contracts:"$(NetFxRefPath)" @"$(GenFacadesResponseFile)"" WorkingDirectory="$(ToolRuntimePath)" /> + <Exec Command="$(GenFacadesCmd) -contracts:"@(NetFxContracts)" @"$(GenFacadesResponseFile)"" WorkingDirectory="$(ToolRuntimePath)" /> - <Exec Command="$(GenFacadesCmd) -contracts:$(NetStandardRefPath)netstandard.dll @"$(GenFacadesResponseFile)"" WorkingDirectory="$(ToolRuntimePath)" /> + <Exec Command="$(GenFacadesCmd) -contracts:"@(NETStandardContracts)" @"$(GenFacadesResponseFile)"" WorkingDirectory="$(ToolRuntimePath)" /> <!-- Copy the facades to the package ref and lib folders to be included in the packages --> <!-- TODO: replace with BinPlacing targets --> |