Skip to content

Commit 8aadcc1

Browse files
mgravellmgravell
committed
update some lib versions and deal with change impact in tests
1 parent 96d8e67 commit 8aadcc1

File tree

9 files changed

+20
-19
lines changed

9 files changed

+20
-19
lines changed

‎Directory.Build.props

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@
2626
<!--<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Shared.ruleset</CodeAnalysisRuleset>-->
2727

2828
<ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
29-
<PBGRPCLibVersion>0.0.3-alpha.54</PBGRPCLibVersion>
29+
<PBGRPCLibVersion>1.0.110</PBGRPCLibVersion>
3030
<GrpcDotNetVersion>2.29.0</GrpcDotNetVersion>
3131
<GoogleProtobufVersion>3.12.3</GoogleProtobufVersion>
32-
<GrpcVersion>2.29.0</GrpcVersion>
32+
<GrpcVersion>2.30.0</GrpcVersion>
33+
34+
<ProtoBufNet2Version>2.4.6</ProtoBufNet2Version>
35+
<ProtoBufNet3Version>3.0.24</ProtoBufNet3Version>
3336
</PropertyGroup>
3437
<PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='VS'">
3538
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎examples/pb-net/JustProtos/JustProtos.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="protobuf-net.MSBuild" Version="2.3.17" />
15+
<PackageReference Include="protobuf-net.MSBuild" Version="$(ProtoBufNet3Version)" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/protobuf-net.Grpc.Reflection/protobuf-net.Grpc.Reflection.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<ItemGroup>
1010
<!-- note this uses v3 features that are not back-ported to v2 -->
11-
<PackageReference Include="protobuf-net.Reflection" Version="3.0.24" />
12-
<PackageReference Include="protobuf-net" Version="3.0.24" />
13-
<PackageReference Include="protobuf-net.Core" Version="3.0.24" />
11+
<PackageReference Include="protobuf-net.Reflection" Version="$(ProtoBufNet3Version)" />
12+
<PackageReference Include="protobuf-net" Version="$(ProtoBufNet3Version)" />
13+
<PackageReference Include="protobuf-net.Core" Version="$(ProtoBufNet3Version)" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/protobuf-net.Grpc/protobuf-net.Grpc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Grpc.Core.Api" Version="$(GrpcVersion)" />
1212
<PackageReference Include="System.Threading.Channels" Version="4.7.1" />
13-
<PackageReference Include="protobuf-net" Version="2.4.6" />
13+
<PackageReference Include="protobuf-net" Version="$(ProtoBufNet2Version)" />
1414
</ItemGroup>
1515
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
1616
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />

‎tests/protobuf-net.Grpc.Reflection.Test/protobuf-net.Grpc.Reflection.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
1313
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

‎tests/protobuf-net.Grpc.Test.Integration/Issues/Issue109.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Grpc.Core;
22
using System.Threading.Tasks;
3-
using ProtoBuf.Grpc.Server;
43
using Xunit;
54

65
namespace protobuf_net.Grpc.Test.Integration.Issues
@@ -22,7 +21,6 @@ public async Task Issue_109()
2221
await server.ShutdownAsync();
2322
// await server.KillAsync(); // kill also doesn't release, but can't Shutdown *and* Kill
2423
await server.ShutdownTask;
25-
2624

2725
var server2 = new Server()
2826
{

‎tests/protobuf-net.Grpc.Test.Integration/Issues/Issue75_Exceptions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public async Task UnmanagedClient_Intercepted_Fault()
8484
var ex = await Assert.ThrowsAsync<RpcException>(async () => await client.Fault());
8585
Assert.Equal(StatusCode.InvalidArgument, ex.StatusCode);
8686
Assert.Equal(s_ExpectedMessage, ex.Status.Detail);
87-
Assert.Equal($"Status(StatusCode=InvalidArgument, Detail=\"{s_ExpectedMessage}\")", ex.Message);
87+
Assert.StartsWith($"Status(StatusCode=\"InvalidArgument\", Detail=\"{s_ExpectedMessage}\"", ex.Message);
8888
}
8989
finally
9090
{
@@ -117,7 +117,7 @@ public async Task UnmanagedClient_Vanilla_Fault()
117117
var ex = await Assert.ThrowsAsync<RpcException>(async () => await client.VanillaFaultHanding_Fault());
118118
Assert.Equal(StatusCode.Unknown, ex.StatusCode);
119119
Assert.Equal("Exception was thrown by handler.", ex.Status.Detail);
120-
Assert.Equal("Status(StatusCode=Unknown, Detail=\"Exception was thrown by handler.\")", ex.Message);
120+
Assert.StartsWith("Status(StatusCode=\"Unknown\", Detail=\"Exception was thrown by handler.\"", ex.Message);
121121
}
122122
finally
123123
{
@@ -151,7 +151,7 @@ public async Task UnmanagedClient_Simplified_Fault()
151151
var ex = await Assert.ThrowsAsync<RpcException>(async () => await client.SimplifiedFaultHandling_Fault());
152152
Assert.Equal(StatusCode.InvalidArgument, ex.StatusCode);
153153
Assert.Equal(s_ExpectedMessage, ex.Status.Detail);
154-
Assert.Equal($"Status(StatusCode=InvalidArgument, Detail=\"{s_ExpectedMessage}\")", ex.Message);
154+
Assert.StartsWith($"Status(StatusCode=\"InvalidArgument\", Detail=\"{s_ExpectedMessage}\"", ex.Message);
155155
}
156156
finally
157157
{
@@ -183,7 +183,7 @@ public async Task ManagedClient_Vanilla_Fault()
183183
var ex = await Assert.ThrowsAsync<RpcException>(async () => await client.VanillaFaultHanding_Fault());
184184
Assert.Equal(StatusCode.Unknown, ex.StatusCode);
185185
Assert.Equal("Exception was thrown by handler.", ex.Status.Detail);
186-
Assert.Equal("Status(StatusCode=Unknown, Detail=\"Exception was thrown by handler.\")", ex.Message);
186+
Assert.StartsWith("Status(StatusCode=\"Unknown\", Detail=\"Exception was thrown by handler.\"", ex.Message);
187187
}
188188

189189
[Fact]
@@ -202,7 +202,7 @@ public async Task ManagedClient_Simplified_Fault()
202202
var ex = await Assert.ThrowsAsync<RpcException>(async () => await client.SimplifiedFaultHandling_Fault());
203203
Assert.Equal(StatusCode.InvalidArgument, ex.StatusCode);
204204
Assert.Equal(s_ExpectedMessage, ex.Status.Detail);
205-
Assert.Equal($"Status(StatusCode=InvalidArgument, Detail=\"{s_ExpectedMessage}\")", ex.Message);
205+
Assert.StartsWith($"Status(StatusCode=\"InvalidArgument\", Detail=\"{s_ExpectedMessage}\"", ex.Message);
206206
}
207207

208208
[Fact]
@@ -221,7 +221,7 @@ public async Task ManagedClient_Intercepted_Fault()
221221
var ex = await Assert.ThrowsAsync<RpcException>(async () => await client.Fault());
222222
Assert.Equal(StatusCode.InvalidArgument, ex.StatusCode);
223223
Assert.Equal(s_ExpectedMessage, ex.Status.Detail);
224-
Assert.Equal($"Status(StatusCode=InvalidArgument, Detail=\"{s_ExpectedMessage}\")", ex.Message);
224+
Assert.StartsWith($"Status(StatusCode=\"InvalidArgument\", Detail=\"{s_ExpectedMessage}\"", ex.Message);
225225
}
226226

227227
[Fact]

‎tests/protobuf-net.Grpc.Test.IntegrationUpLevel/protobuf-net.Grpc.Test.IntegrationUpLevel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
14-
<PackageReference Include="protobuf-net" Version="3.0.24" />
14+
<PackageReference Include="protobuf-net" Version="$(ProtoBufNet3Version)" />
1515
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">

‎tests/protobuf-net.Grpc.Test/protobuf-net.Grpc.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
2525
<ProjectReference Include="..\..\src\protobuf-net.Grpc.ClientFactory\protobuf-net.Grpc.ClientFactory.csproj" />
26-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
2727
</ItemGroup>
2828

2929
</Project>

0 commit comments

Comments
 (0)