diff options
| author | Martin Baulig <mabaul@microsoft.com> | 2018-12-04 02:11:46 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-12-13 16:36:58 +0300 |
| commit | 916aafffe56940b402617d24352335ab24547015 (patch) | |
| tree | b3e3d9c16a0816cf76ae15e3b137f17e2dd8b116 /src/shims/manual/mscorlib.csproj | |
| parent | 089ffdc490ef4cd652179fca27f04754bc512edd (diff) | |
Merged with dotnet/release/2.2.
Diffstat (limited to 'src/shims/manual/mscorlib.csproj')
| -rw-r--r-- | src/shims/manual/mscorlib.csproj | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/shims/manual/mscorlib.csproj b/src/shims/manual/mscorlib.csproj index 040aaffc68..673f81abce 100644 --- a/src/shims/manual/mscorlib.csproj +++ b/src/shims/manual/mscorlib.csproj @@ -8,9 +8,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <Compile Include="mscorlib.forwards.cs" /> + <ExcludedReferencePaths Include="$(_RuntimePath)Microsoft.Diagnostics.Tracing.TraceEvent.dll;$(_RuntimePath)Microsoft.DiaSymReader.Native.*.dll" /> + + <!-- System.ValueTuple is typeforwarded manually, and in netcoreapp2.0 it picks the netstandard configuration, therefore it is binplaced in the runtime path, so we don't need to reference it's implementation for netcoreapp2.0. --> + <ExcludedReferencePaths Condition="'$(TargetGroup)' == 'netcoreapp2.0'" Include="$(_RuntimePath)System.ValueTuple.dll" /> <ReferencePath - Include="$(RuntimePath)System.*.dll;$(RuntimePath)Microsoft.*.dll" - Exclude="$(RuntimePath)Microsoft.Diagnostics.Tracing.TraceEvent.dll;$(RuntimePath)Microsoft.DiaSymReader.Native.*.dll" /> + Include="$(_RuntimePath)System.*.dll;$(_RuntimePath)Microsoft.*.dll" + Exclude="@(ExcludedReferencePaths)" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file |