Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #23995 from jtattermusch/csharp_distribtest_updgrade_protobuf3_13

Browse Source 
upgrade Google.Protobuf to 3.13.0 in C# distribtests
pull/24003/head
Jan Tattermusch 4 years ago committed by GitHub
parent ae16067f50 8d8152ed4e
commit c02c680074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      test/distrib/csharp/DistribTest/DistribTest.csproj
  2. 2
      test/distrib/csharp/DistribTest/DistribTestDotNet.csproj
  3. 2
      test/distrib/csharp/DistribTest/packages.config

12
test/distrib/csharp/DistribTest/DistribTest.csproj
Unescape View File

@ -56,6 +56,16 @@
<Prefer32Bit>true</Prefer32Bit>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<!-- this project is built with a legacy C# compiler, so ref structs are not supported.
Use GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE to still allow building the protobuf
generate code -->
<DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE</DefineConstants>
<!-- Create a binding redirect to avoid mismatch between different versions of System.Memory
being referenced by Grpc.Core and Google.Protobuf.
See http://go.microsoft.com/fwlink/?LinkId=294190 -->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="Grpc.Auth">
<HintPath>..\packages\Grpc.Auth.__GRPC_NUGET_VERSION__\lib\net45\Grpc.Auth.dll</HintPath>
@ -101,7 +111,7 @@
<HintPath>..\packages\Google.Apis.Auth.1.15.0\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Google.Protobuf">
<HintPath>..\packages\Google.Protobuf.3.12.2\lib\net45\Google.Protobuf.dll</HintPath>
<HintPath>..\packages\Google.Protobuf.3.13.0\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
test/distrib/csharp/DistribTest/DistribTestDotNet.csproj
Unescape View File

@ -16,7 +16,7 @@
<PackageReference Include="Grpc" Version="__GRPC_NUGET_VERSION__" />
<PackageReference Include="Grpc.Auth" Version="__GRPC_NUGET_VERSION__" />
<PackageReference Include="Grpc.Tools" Version="__GRPC_NUGET_VERSION__" />
<PackageReference Include="Google.Protobuf" Version="3.12.2" />
<PackageReference Include="Google.Protobuf" Version="3.13.0" />
</ItemGroup>
<ItemGroup>

2
test/distrib/csharp/DistribTest/packages.config
Unescape View File

@ -8,7 +8,7 @@
<package id="Grpc.Core" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
<package id="Grpc.Core.Api" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
<package id="Grpc.Tools" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
<package id="Google.Protobuf" version="3.12.2" targetFramework="net45" />
<package id="Google.Protobuf" version="3.13.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
<package id="System.Buffers" version="4.4.0" targetFramework="net45" />
<package id="System.Memory" version="4.5.3" targetFramework="net45" />

Write Preview
Loading…
Cancel
Save