diff options
| author |  Mark D. Roth <roth@google.com> | 2017-09-25 12:36:30 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-09-25 12:36:30 -0700 |
| commit | b4c01f9e2982d61723014f76c42fc059c554b084 (patch) | |
| tree | 7ac46ab54a86744ae26317a2365e0f9fe8647812 /src/csharp/Grpc.Core/Grpc.Core.csproj | |
| parent | ad9208c07e74d90dd5110324fe9cb830e6e6f68b (diff) | |
| parent | 008a173a7e2ba1d5c0933aa7a77395945ba2024d (diff) | |
Merge remote-tracking branch 'upstream/master' into plugin_credentials_api_fix
Diffstat (limited to 'src/csharp/Grpc.Core/Grpc.Core.csproj')
| -rwxr-xr-x | src/csharp/Grpc.Core/Grpc.Core.csproj | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/csharp/Grpc.Core/Grpc.Core.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj index dde800aadd..d9950b2f20 100755 --- a/src/csharp/Grpc.Core/Grpc.Core.csproj +++ b/src/csharp/Grpc.Core/Grpc.Core.csproj @@ -14,7 +14,6 @@ <PackageTags>gRPC RPC Protocol HTTP/2</PackageTags> <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl> <PackageLicenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</PackageLicenseUrl> - <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion> <IncludeSymbols>true</IncludeSymbols> <IncludeSource>true</IncludeSource> <GenerateDocumentationFile>true</GenerateDocumentationFile> @@ -65,7 +64,7 @@ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' "> <PackageReference Include="System.Runtime.Loader" Version="4.0.0" /> <PackageReference Include="System.Threading.Thread" Version="4.0.0" /> - <PackageReference Include="System.Threading.ThreadPool" Version="4.0.0" /> + <PackageReference Include="System.Threading.ThreadPool" Version="4.0.10" /> </ItemGroup> <Import Project="NativeDeps.csproj.include" /> |