Skip to content

Commit 83f5f96

Browse files
mgravellmgravell
authored
Net5 tweaks (#140)
* .NET 5.0; step 1 - rationalize TFMs * apply more TFM tweaks and fix some nullability warnings etc * dependency updates * fix test from lib update (schema imports now alphabetical) * make sure all the tests run on the right TFMs * fix tests to reflect grpc fixes; prefer ResponseHeadersAsync * update test expectations for more things now fixed in dotnet.grpc * TakeNothingBadProducer and FaultSuccessBadProducer are now much more reliable
1 parent f8e5978 commit 83f5f96

File tree

55 files changed

+238
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+238
-272
lines changed

‎Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>Library</OutputType>
66
<SignAssembly>true</SignAssembly>
77
<DelaySign>False</DelaySign>
8-
<NoWarn>NU5105;CS1701;BC42016;MSB3884;NETSDK1057;CS8632</NoWarn>
8+
<NoWarn>NU5105;CS1701;BC42016;MSB3884;NETSDK1057;CS8632;IDE0090;IDE0057;xUnit1004</NoWarn>
99
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)ProtoBuf.snk</AssemblyOriginatorKeyFile>
1010
<Copyright>Marc Gravell, 2019-</Copyright>
1111
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -27,12 +27,12 @@
2727

2828
<ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
2929
<PBGRPCLibVersion>1.0.110</PBGRPCLibVersion>
30-
<GrpcDotNetVersion>2.29.0</GrpcDotNetVersion>
31-
<GoogleProtobufVersion>3.12.3</GoogleProtobufVersion>
32-
<GrpcVersion>2.30.0</GrpcVersion>
30+
<GrpcDotNetVersion>2.33.1</GrpcDotNetVersion>
31+
<GoogleProtobufVersion>3.14.0</GoogleProtobufVersion>
32+
<GrpcVersion>2.33.1</GrpcVersion>
3333

3434
<ProtoBufNet2Version>2.4.6</ProtoBufNet2Version>
35-
<ProtoBufNet3Version>3.0.27</ProtoBufNet3Version>
35+
<ProtoBufNet3Version>3.0.62</ProtoBufNet3Version>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='VS'">
3838
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -51,6 +51,6 @@
5151
<ItemGroup>
5252
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
5353
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
54-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
54+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
5555
</ItemGroup>
5656
</Project>

‎examples/dotnet-grpc/DN_Client/DN_Client.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎examples/dotnet-grpc/DN_Server/DN_Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<GenerateDocumentationFile>false</GenerateDocumentationFile>
66
</PropertyGroup>
77

‎examples/grpc/Client/Client.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎examples/grpc/Server/Server.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎examples/pb-net-grpc/Client_CS/Client_CS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<GenerateDocumentationFile>false</GenerateDocumentationFile>
55
<OutputType>Exe</OutputType>
6-
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
77
</PropertyGroup>
88

99
<ItemGroup>

‎examples/pb-net-grpc/Client_FS/Client_FS.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<GenerateDocumentationFile>false</GenerateDocumentationFile>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<SignAssembly>false</SignAssembly>
88
<LangVersion>4.7</LangVersion>
99
</PropertyGroup>
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Update="FSharp.Core" Version="4.7.2" />
24+
<PackageReference Update="FSharp.Core" Version="5.0.0" />
2525
</ItemGroup>
2626

2727
</Project>

‎examples/pb-net-grpc/Client_VB/Client_VB.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<GenerateDocumentationFile>false</GenerateDocumentationFile>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>Client_VB</RootNamespace>
7-
<TargetFramework>netcoreapp3.0</TargetFramework>
7+
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<LangVersion>latest</LangVersion>
99
</PropertyGroup>
1010
<ItemGroup>

‎examples/pb-net-grpc/Server_CS/MyTimeService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class MyTimeService : ITimeService
1313
public IAsyncEnumerable<TimeResult> SubscribeAsync(CallContext context = default)
1414
=> SubscribeAsyncImpl(context.CancellationToken);
1515

16-
private async IAsyncEnumerable<TimeResult> SubscribeAsyncImpl([EnumeratorCancellation] CancellationToken cancel)
16+
private static async IAsyncEnumerable<TimeResult> SubscribeAsyncImpl([EnumeratorCancellation] CancellationToken cancel)
1717
{
1818
while (!cancel.IsCancellationRequested)
1919
{

‎examples/pb-net-grpc/Server_CS/Server_CS.csproj

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

33
<PropertyGroup>
44
<GenerateDocumentationFile>false</GenerateDocumentationFile>
5-
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
66
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
77
<RootNamespace>Server_CS</RootNamespace>
88
</PropertyGroup>

0 commit comments

Comments
 (0)