Skip to content

Commit bd09eed

Browse files
mgravellmgravell
authored
Update package refs (#339)
* warnings * update package refs and compensate * explicitly enable legacy BinaryFormatter in tests
1 parent b92259d commit bd09eed

File tree

53 files changed

+216
-195
lines changed

Some content is hidden

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

53 files changed

+216
-195
lines changed

‎Directory.Build.props

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,54 @@
11
<Project>
2-
<PropertyGroup>
3-
<RootNamespace>ProtoBuf.Grpc</RootNamespace>
4-
<Authors>Marc Gravell</Authors>
5-
<OutputType>Library</OutputType>
6-
<SignAssembly>true</SignAssembly>
7-
<DelaySign>False</DelaySign>
8-
<NoWarn>NU5105;CS1701;BC42016;MSB3884;NETSDK1057;CS8632;IDE0090;IDE0057;xUnit1004</NoWarn>
9-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)ProtoBuf.snk</AssemblyOriginatorKeyFile>
10-
<Copyright>Marc Gravell, 2019-</Copyright>
11-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
12-
<PackageProjectUrl>https://github.com/protobuf-net/protobuf-net.Grpc</PackageProjectUrl>
13-
<RepositoryUrl>https://github.com/protobuf-net/protobuf-net.Grpc</RepositoryUrl>
14-
<RepositoryType>git</RepositoryType>
15-
<Product>protobuf-net.Grpc ($(TargetFramework))</Product>
16-
<PackageReleaseNotes>https://protobuf-net.github.io/protobuf-net.Grpc/releasenotes#$(VersionPrefix)</PackageReleaseNotes>
2+
<PropertyGroup>
3+
<DefaultTFM>net8.0</DefaultTFM>
4+
<RootNamespace>ProtoBuf.Grpc</RootNamespace>
5+
<Authors>Marc Gravell</Authors>
6+
<OutputType>Library</OutputType>
7+
<SignAssembly>true</SignAssembly>
8+
<DelaySign>False</DelaySign>
9+
<NoWarn>NU5105;CS1701;BC42016;MSB3884;NETSDK1057;CS8632;IDE0090;IDE0057;xUnit1004</NoWarn>
10+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)ProtoBuf.snk</AssemblyOriginatorKeyFile>
11+
<Copyright>Marc Gravell, 2019-</Copyright>
12+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
13+
<PackageProjectUrl>https://github.com/protobuf-net/protobuf-net.Grpc</PackageProjectUrl>
14+
<RepositoryUrl>https://github.com/protobuf-net/protobuf-net.Grpc</RepositoryUrl>
15+
<RepositoryType>git</RepositoryType>
16+
<Product>protobuf-net.Grpc ($(TargetFramework))</Product>
17+
<PackageReleaseNotes>https://protobuf-net.github.io/protobuf-net.Grpc/releasenotes#$(VersionPrefix)</PackageReleaseNotes>
1718

18-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
19-
<PackageTags>grpc</PackageTags>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>embedded</DebugType>
22-
<DefaultLanguage>en-US</DefaultLanguage>
23-
<IncludeSymbols>false</IncludeSymbols>
24-
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
25-
<Nullable>enable</Nullable>
26-
<LangVersion>latest</LangVersion>
27-
<!--<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Shared.ruleset</CodeAnalysisRuleset>-->
19+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
20+
<PackageTags>grpc</PackageTags>
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>embedded</DebugType>
23+
<DefaultLanguage>en-US</DefaultLanguage>
24+
<IncludeSymbols>false</IncludeSymbols>
25+
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
26+
<Nullable>enable</Nullable>
27+
<LangVersion>latest</LangVersion>
28+
<!--<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Shared.ruleset</CodeAnalysisRuleset>-->
2829

29-
<ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
30+
<ExampleRefs>local</ExampleRefs>
31+
<!-- local or nuget-->
3032

31-
<ProtoBufNet2Version>2.4.8</ProtoBufNet2Version>
32-
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='VS'">
34-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
35-
<Optimize>true</Optimize>
36-
</PropertyGroup>
33+
<ProtoBufNet2Version>2.4.8</ProtoBufNet2Version>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='VS'">
36+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
37+
<Optimize>true</Optimize>
38+
</PropertyGroup>
3739

38-
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
39-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
40-
<Deterministic>true</Deterministic>
41-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
42-
</PropertyGroup>
43-
<ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)'==''">
44-
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
45-
</ItemGroup>
46-
47-
<ItemGroup>
48-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
49-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
50-
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
51-
</ItemGroup>
40+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
41+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
42+
<Deterministic>true</Deterministic>
43+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
44+
</PropertyGroup>
45+
<ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)'==''">
46+
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
47+
</ItemGroup>
48+
49+
<ItemGroup>
50+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
51+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
52+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
53+
</ItemGroup>
5254
</Project>

‎Directory.Packages.props

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="protobuf-net" Version="3.2.26" />
4-
<PackageVersion Include="protobuf-net.BuildTools" Version="3.2.27" />
5-
<PackageVersion Include="protobuf-net.Core" Version="3.2.26" />
3+
<PackageVersion Include="protobuf-net" Version="3.2.30" />
4+
<PackageVersion Include="protobuf-net.BuildTools" Version="3.2.33" />
5+
<PackageVersion Include="protobuf-net.Core" Version="3.2.30" />
66
<PackageVersion Include="protobuf-net.Grpc" Version="1.1.1" />
77
<PackageVersion Include="protobuf-net.Reflection" Version="3.2.12" />
8-
9-
<PackageVersion Include="Google.Protobuf" Version="3.23.4" />
10-
8+
<PackageVersion Include="Google.Protobuf" Version="3.28.2" />
119
<PackageVersion Include="Grpc" Version="2.46.6" />
1210
<PackageVersion Include="Grpc.Core" Version="2.46.6" />
13-
14-
<PackageVersion Include="Grpc.Tools" Version="2.56.2" />
15-
<PackageVersion Include="Grpc.Net.Client" Version="2.55.0" />
16-
<PackageVersion Include="Grpc.Core.Api" Version="2.55.0" />
17-
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.55.0" />
18-
<PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
19-
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.55.0" />
20-
21-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
22-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
23-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
24-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
11+
<PackageVersion Include="Grpc.Tools" Version="2.67.0" />
12+
<PackageVersion Include="Grpc.Net.Client" Version="2.66.0" />
13+
<PackageVersion Include="Grpc.Core.Api" Version="2.66.0" />
14+
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.66.0" />
15+
<PackageVersion Include="Grpc.AspNetCore" Version="2.66.0" />
16+
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.66.0" />
17+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
18+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
19+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
20+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2521
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
26-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
27-
28-
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
29-
30-
<PackageVersion Include="System.Reactive" Version="6.0.0" />
31-
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
32-
<PackageVersion Include="System.ServiceModel.Primitives" Version="4.10.2" />
33-
<PackageVersion Include="xunit" Version="2.5.0" />
34-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
22+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
23+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.143" />
24+
<PackageVersion Include="System.Reactive" Version="6.0.1" />
25+
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
26+
<PackageVersion Include="System.ServiceModel.Primitives" Version="8.0.0" />
27+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
28+
<PackageVersion Include="xunit" Version="2.9.2" />
29+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
3530
<PackageVersion Include="TaskBuilder.fs" Version="2.1.0" />
31+
<PackageVersion Include="FSharp.Core" Version="8.0.401" />
3632
</ItemGroup>
3733
</Project>

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ install:
44
- cmd: >-
55
choco install dotnet-6.0-sdk
66
7-
choco install dotnet-7.0-sdk
7+
choco install dotnet-8.0-sdk
88
99
skip_branch_with_pr: true
1010
skip_tags: true
@@ -25,7 +25,7 @@ build_script:
2525
- cmd: dotnet test Build.csproj -c Release /p:CI=true
2626
- cmd: dotnet pack Build.csproj --no-build -c Release /p:Packing=true /p:PackageOutputPath=%CD%\.nupkgs /p:CI=true
2727

28-
test: off
28+
test: false
2929
artifacts:
3030
- path: .\.nupkgs\*.nupkg
3131

‎docs/gettingstarted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 `net7.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 `net8.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 console application targeting `net7.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 `net8.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

‎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>net7.0</TargetFramework>
5+
<TargetFramework>$(DefaultTFM)</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>net7.0</TargetFramework>
4+
<TargetFramework>$(DefaultTFM)</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>net7.0</TargetFramework>
5+
<TargetFramework>$(DefaultTFM)</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>net7.0</TargetFramework>
5+
<TargetFramework>$(DefaultTFM)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎examples/grpc/Shared/Shared.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">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>$(DefaultTFM)</TargetFramework>
55
</PropertyGroup>
66

77
<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-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>$(DefaultTFM)</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

0 commit comments

Comments
 (0)