Skip to content

Commit fc2761c

Browse files
mgravellmgravell
authored
Rev libs and TFMs (#270)
* update packaging - use central lib versions, update tfm (drop net5 and below) * rev remaining libs; drop net461 * stick with just LTS targets unless we need features
1 parent 8e89902 commit fc2761c

File tree

55 files changed

+190
-168
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

+190
-168
lines changed

‎Directory.Build.props

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<RepositoryType>git</RepositoryType>
1515
<Product>protobuf-net.Grpc ($(TargetFramework))</Product>
1616
<PackageReleaseNotes>https://protobuf-net.github.io/protobuf-net.Grpc/releasenotes#$(VersionPrefix)</PackageReleaseNotes>
17-
17+
18+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1819
<PackageTags>grpc</PackageTags>
1920
<DebugSymbols>true</DebugSymbols>
2021
<DebugType>embedded</DebugType>
@@ -26,13 +27,8 @@
2627
<!--<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Shared.ruleset</CodeAnalysisRuleset>-->
2728

2829
<ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
29-
<PBGRPCLibVersion>1.0.167</PBGRPCLibVersion>
30-
<GrpcDotNetVersion>2.44.0</GrpcDotNetVersion>
31-
<GoogleProtobufVersion>3.19.2</GoogleProtobufVersion>
32-
<GrpcVersion>2.44.0</GrpcVersion>
3330

34-
<ProtoBufNet2Version>2.4.6</ProtoBufNet2Version>
35-
<ProtoBufNet3Version>3.0.101</ProtoBufNet3Version>
31+
<ProtoBufNet2Version>2.4.8</ProtoBufNet2Version>
3632
</PropertyGroup>
3733
<PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='VS'">
3834
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -49,8 +45,8 @@
4945
</ItemGroup>
5046

5147
<ItemGroup>
52-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
53-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
54-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
48+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
49+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
50+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
5551
</ItemGroup>
5652
</Project>

‎Directory.Packages.props

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="protobuf-net" Version="3.1.33" />
4+
<PackageVersion Include="protobuf-net.Core" Version="3.1.33" />
5+
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.179" />
6+
<PackageVersion Include="protobuf-net.Reflection" Version="3.1.33" />
7+
<PackageVersion Include="protobuf-net.MSBuild" Version="3.1.33" />
8+
9+
<PackageVersion Include="Google.Protobuf" Version="3.21.12" />
10+
11+
<PackageVersion Include="Grpc" Version="2.46.6" />
12+
<PackageVersion Include="Grpc.Core" Version="2.46.6" />
13+
14+
<PackageVersion Include="Grpc.Tools" Version="2.51.0" />
15+
<PackageVersion Include="Grpc.Net.Client" Version="2.51.0" />
16+
<PackageVersion Include="Grpc.Core.Api" Version="2.51.0" />
17+
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.51.0" />
18+
<PackageVersion Include="Grpc.AspNetCore" Version="2.51.0" />
19+
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.51.0" />
20+
21+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.2" />
22+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
23+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
24+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
25+
26+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
27+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
28+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
29+
<PackageVersion Include="System.Reactive" Version="5.0.0" />
30+
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
31+
<PackageVersion Include="System.ServiceModel.Primitives" Version="4.10.0" />
32+
<PackageVersion Include="xunit" Version="2.4.2" />
33+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
34+
<PackageVersion Include="TaskBuilder.fs" Version="2.1.0" />
35+
</ItemGroup>
36+
</Project>

‎appveyor.yml

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

33
install:
44
- cmd: >-
5-
choco install dotnet-sdk --version 6.0.302
5+
choco install dotnet-sdk --version 7.0.102
66
77
skip_branch_with_pr: true
88
skip_tags: true

‎docs/gettingstarted.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ reports problems at build-time.
4343
### 1: define your data contracts and service contracts
4444

4545
Your service and data contracts can be placed directly in the client/server (see later), or can be in a separate class library. If you use
46-
a separate library, make sure you target `netcoreapp3.0` or above.
46+
a separate library, make sure you target `net6.0` or above.
4747

4848
As for what they look like: think "WCF". Data contracts are classes marked with either `[ProtoContract]` or `[DataContract]`, with individual members
4949
annotated with either `[ProtoMember]` or `[DataMember]`. The `[Proto*]` options are protobuf-net specific and offer fine-grained
@@ -200,7 +200,7 @@ introduction of `.google.protobuf.Timestamp`). It is recommended to use `DataFor
200200

201201
### 2: implement the server
202202

203-
1. Create an ASP.NET Core Web Application targeting `netcoreapp3.0`, and add a package references to [`protobuf-net.Grpc.AspNetCore`](https://www.nuget.org/packages/protobuf-net.Grpc.AspNetCore)
203+
1. Create an ASP.NET Core Web Application targeting `net7.0`, and add a package references to [`protobuf-net.Grpc.AspNetCore`](https://www.nuget.org/packages/protobuf-net.Grpc.AspNetCore)
204204
(and a project/package reference to your data/service contracts if necessary). Note that the gRPC tooling can run alongside other services/sites that your ASP.NET application is providing.
205205
2. in `CreateHostBuilder`, make sure you are using `WebHost`, and enable listening on `HttpProtocols.Http2`; see [`Program.cs`](https://github.com/protobuf-net/protobuf-net.Grpc/blob/main/examples/pb-net-grpc/Server_CS/Program.cs)
206206
3. in `ConfigureServices`, call `services.AddCodeFirstGrpc()`; see [`Startup.cs`](https://github.com/protobuf-net/protobuf-net.Grpc/blob/main/examples/pb-net-grpc/Server_CS/Startup.cs)
@@ -262,7 +262,7 @@ Now listening on: http://localhost:10042
262262

263263
### 2: implement the client
264264

265-
OK, we have a working server; now let's write a client. This is much easier, in fact. Let's create a .NET Core console application targeting `netcoreapp3.0`,
265+
OK, we have a working server; now let's write a client. This is much easier, in fact. Let's create a .NET console application targeting `net7.0`,
266266
and add a package reference to [`protobuf-net.Grpc`](https://www.nuget.org/packages/protobuf-net.Grpc). Note that by default, `HttpClient` only wants to talk HTTP/2 over TLS, so we first
267267
need to twist it's arm a little; then we can very easily create a client to our services at our base address; let's start by doing some maths:
268268

‎docs/releasenotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## unreleased
44

5+
- update library references
6+
- drop net461 (moving to net462 as lower bound); drop netcoreapp3.1 and net5.0 (moving to net6.0 as lower bound)
7+
58
## 1.0.177
69

710
- support sub`[SubService]` (imports one interface inside another top-level service interface) (#206 via meirkr; also protobuf-net #859)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

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

88
<ItemGroup>
99
<ProjectReference Include="..\..\grpc\Shared\Shared.csproj" />
10-
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetVersion)" />
10+
<PackageReference Include="Grpc.Net.Client" />
1111
</ItemGroup>
1212

1313
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Grpc.AspNetCore.Server" Version="$(GrpcDotNetVersion)" />
9+
<PackageReference Include="Grpc.AspNetCore.Server" />
1010
<ProjectReference Include="..\..\grpc\Shared\Shared.csproj" />
1111
</ItemGroup>
1212

‎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>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net7.0</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>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎examples/grpc/Shared/Shared.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
14-
<PackageReference Include="Grpc" Version="$(GrpcVersion)" />
15-
<PackageReference Include="Grpc.Tools" Version="$(GrpcVersion)">
13+
<PackageReference Include="Google.Protobuf" />
14+
<PackageReference Include="Grpc" />
15+
<PackageReference Include="Grpc.Tools">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

0 commit comments

Comments
 (0)