diff options
author | kpayson64 <kpayson@google.com> | 2018-05-11 12:20:11 -0700 |
---|---|---|
committer | kpayson64 <kpayson@google.com> | 2018-05-11 12:20:11 -0700 |
commit | 4fad281ce8affe27fb7428f264d2c3b9dfc45f2f (patch) | |
tree | ca96c9efd69afec56aa2e5fe072a9f758247d0a3 /src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include | |
parent | ec445cc2bb270ed4acb1c710c3533fca14a50019 (diff) | |
parent | 61fdb46ac456027c79841949272ec540f66d2317 (diff) |
Merge remote-tracking branch 'upstream/master' into fork_exec_ctx_check
Diffstat (limited to 'src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include')
-rw-r--r-- | src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include b/src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include index f1b85c3730..309e33d47e 100644 --- a/src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include +++ b/src/csharp/Grpc.Core/NativeDeps.Mac.csproj.include @@ -1,13 +1,5 @@ <Project> <ItemGroup> - <!-- We are relying on run_tests.py to build grpc_csharp_ext with the right bitness - and we copy it as both x86 (needed by net45) and x64 (needed by netcoreapp1.0) as we don't - know which one will be needed to run the tests. --> - <Content Include="..\..\..\libs\$(NativeDependenciesConfigurationUnix)\libgrpc_csharp_ext.dylib"> - <Link>libgrpc_csharp_ext.x86.dylib</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <Pack>false</Pack> - </Content> <Content Include="..\..\..\libs\$(NativeDependenciesConfigurationUnix)\libgrpc_csharp_ext.dylib"> <Link>libgrpc_csharp_ext.x64.dylib</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |