diff options
author | 2017-09-18 11:55:52 -0700 | |
---|---|---|
committer | 2017-09-18 11:55:52 -0700 | |
commit | b352be025fcb117d2deca24ada9e90d94eba460c (patch) | |
tree | 7666446253d7cdbfa1b6c57a721329e32fef4a50 /src/csharp/Grpc.Microbenchmarks | |
parent | 63f31e8cd16b185fd735bd753afbc0375cd573aa (diff) | |
parent | a5b571e22d8e3d06fbdecfc1a6e67a3036be536e (diff) |
Upmerge from v1.6.x branch to master
Diffstat (limited to 'src/csharp/Grpc.Microbenchmarks')
-rw-r--r-- | src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj b/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj index 17797e1e1e..108357e4eb 100644 --- a/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj +++ b/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj @@ -8,8 +8,6 @@ <AssemblyName>Grpc.Microbenchmarks</AssemblyName> <OutputType>Exe</OutputType> <PackageId>Grpc.Microbenchmarks</PackageId> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45</PackageTargetFallback> - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> |