diff options
| author |  Michael Lumish <mlumish@google.com> | 2015-02-27 15:17:53 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2015-02-27 15:17:53 -0800 |
| commit | e0c553ccf2012e9743a1c5e04f524e8e58d665f4 (patch) | |
| tree | 95aa6a081267309e955b589cc7cc01bf4fa32c45 | |
| parent | 5c5992554bc564be865a02b63e160b970eb67d7c (diff) | |
| parent | bd3df5f5f11714d0d9e5221dd51d4aae6151fa00 (diff) | |
Merge pull request #881 from jtattermusch/csharp_docker
Fix conditional inclusion of grpc_csharp_ext.dll
| -rw-r--r-- | src/csharp/Grpc.Core/Grpc.Core.csproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core/Grpc.Core.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj index de742f99ad..05d40d45a6 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.csproj +++ b/src/csharp/Grpc.Core/Grpc.Core.csproj @@ -67,9 +67,9 @@ <Compile Include="Utils\ExceptionHelper.cs" /> </ItemGroup> <Choose> - <!-- Under Windows, automatically copy the C core library to output dir. - Under Monodevelop it's not supported so it has no effect. --> - <When Condition=" '$(Platform)' == 'AnyCPU' "> + <!-- Under older versions of Monodevelop, Choose is not supported and is just + ignored, which gives us the desired effect. --> + <When Condition=" '$(OS)' != 'Unix' "> <ItemGroup> <Content Include="..\..\..\vsprojects\vs2013\Debug\grpc_csharp_ext.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |