Skip to content

Commit 6bbbf36

Browse files
jtattermuschjtattermusch
authored
Use GrpcToolsPackageVersion property for Grpc.Tools dependencies (#1785)
* introduce new GrpcToolsPackageVersion property * use GrpcToolsPackageVersion in dotnet-grpc.csproj * update release_process.md * update GrpcPackageVersion
1 parent 58cd9dc commit 6bbbf36

File tree

41 files changed

+42
-41
lines changed

Some content is hidden

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

41 files changed

+42
-41
lines changed

‎build/dependencies.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<GoogleApisAuthPackageVersion>1.46.0</GoogleApisAuthPackageVersion>
55
<GoogleProtobufPackageVersion>3.19.4</GoogleProtobufPackageVersion>
66
<GrpcDotNetPackageVersion>2.44.0</GrpcDotNetPackageVersion> <!-- Used by example projects -->
7-
<GrpcPackageVersion>2.45.0</GrpcPackageVersion>
7+
<GrpcPackageVersion>2.46.3</GrpcPackageVersion>
8+
<GrpcToolsPackageVersion>2.47.0</GrpcToolsPackageVersion>
89
<MicrosoftAspNetCoreAppPackageVersion>6.0.0</MicrosoftAspNetCoreAppPackageVersion>
910
<MicrosoftAspNetCoreApp5PackageVersion>5.0.3</MicrosoftAspNetCoreApp5PackageVersion>
1011
<MicrosoftAspNetCoreApp31PackageVersion>3.1.3</MicrosoftAspNetCoreApp31PackageVersion>

‎doc/release_process.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ release that the new release depends on.
1010
## Releasing a new version of grpc-dotnet (every 6 weeks)
1111

1212
- Before cutting the release branch
13-
- If needed, on the master branch update the `<GrpcPackageVersion>` dependency version in [dependencies.props](https://github.com/grpc/grpc-dotnet/blob/master/build/dependencies.props)
13+
- If needed, on the master branch update the `<GrpcToolsPackageVersion>` and `<GrpcPackageVersion>` dependency versions in [dependencies.props](https://github.com/grpc/grpc-dotnet/blob/master/build/dependencies.props)
1414
to the latest pre-release of `Grpc.Core.Api` (that was just released as part of the grpc/grpc release process)
1515
- Make sure that any patches/bugfixes from the last released branch have been applied to the master branch as well.
1616

‎examples/Aggregator/Client/Client.csproj‎

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

1313
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1414
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
15-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
15+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1616
</ItemGroup>
1717

1818
</Project>

‎examples/Blazor/Client/Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="all" />
1010

1111
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
12-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
12+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1313
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
1414
<PackageReference Include="Grpc.Net.Client.Web" Version="$(GrpcDotNetPackageVersion)" />
1515

‎examples/Certifier/Client/Client.csproj‎

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

1111
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1212
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
13-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1414

1515
<None Update="Certs\client.pfx">
1616
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎examples/Compressor/Client/Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1212
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
13-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1414
</ItemGroup>
1515
</Project>

‎examples/Container/Frontend/Frontend.csproj‎

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

77
<ItemGroup>
88
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
9-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
9+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1010
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
1111

1212
<Protobuf Include="..\Proto\weather.proto" GrpcServices="Client" Link="Protos\weather.proto" Access="Internal" />

‎examples/Counter/Client/Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1212
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
13-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1414
</ItemGroup>
1515
</Project>

‎examples/Downloader/Client/Client.csproj‎

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

1111
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1212
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
13-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1414
</ItemGroup>
1515

1616
</Project>

‎examples/Frameworker/Client/Client.csproj‎

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

1111
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1212
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
13-
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
1414

1515
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
1616
</ItemGroup>

0 commit comments

Comments
 (0)