Skip to content

Commit

Permalink
bumping grpc packages (#1719)
Browse files Browse the repository at this point in the history
  • Loading branch information
brettsam committed Jul 7, 2023
1 parent f3b4934 commit 68cb6ca
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ public static class GrpcHttpClientBuilderExtensions
/// Configures a <see cref="IHttpClientBuilder" /> to communicate with the functions host.
/// </summary>
/// <param name="builder">The original builder for call chaining.</param>
/// <remarks>
/// When using Grpc.Net.ClientFactory 2.54.0-pre1 or earlier, use a <see cref="GrpcClientFactoryOptions"/>
/// configure accepting overload of <c>AddGrpcClient</c>, such as
/// <see cref="GrpcClientServiceExtensions.AddGrpcClient{TClient}(IServiceCollection, Action{GrpcClientFactoryOptions})"/>.
/// </remarks>
public static IHttpClientBuilder ConfigureForFunctionsHostGrpc(this IHttpClientBuilder builder)
{
if (builder is null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
<PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.53.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.55.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

### Microsoft.Azure.Functions.Worker.Grpc <version>

- <entry>
- bumping grpc packages (#1719)
10 changes: 5 additions & 5 deletions src/DotNetWorker.Grpc/DotNetWorker.Grpc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AssemblyName>Microsoft.Azure.Functions.Worker.Grpc</AssemblyName>
<RootNamespace>Microsoft.Azure.Functions.Worker.Grpc</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<MinorProductVersion>11</MinorProductVersion>
<MinorProductVersion>12</MinorProductVersion>
<PatchProductVersion>0</PatchProductVersion>
<VersionSuffix></VersionSuffix>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -22,8 +22,8 @@

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.10.0" />
<PackageReference Include="Google.Protobuf" Version="3.21.7" />
<PackageReference Include="Grpc.Tools" Version="2.49.1">
<PackageReference Include="Google.Protobuf" Version="3.23.3" />
<PackageReference Include="Grpc.Tools" Version="2.56.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -32,8 +32,8 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
<PackageReference Include="Grpc.Net.Client" Version="2.49.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.49.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.55.0" />
</ItemGroup>

<!--For applications using the .NET Standard 2.0 target/.NET Framework apps
Expand Down
2 changes: 1 addition & 1 deletion src/DotNetWorker/DotNetWorker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AssemblyName>Microsoft.Azure.Functions.Worker</AssemblyName>
<RootNamespace>Microsoft.Azure.Functions.Worker</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<MinorProductVersion>16</MinorProductVersion>
<MinorProductVersion>17</MinorProductVersion>
<PatchProductVersion>0</PatchProductVersion>
<VersionSuffix></VersionSuffix>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,7 @@ public void ConfigureForFunctionsHostGrpc_Configure_SetsUri()

[Fact]
public void ConfigureForFunctionsHostGrpc_SetsUri()
{
// https://github.com/grpc/grpc-dotnet/issues/2158
// NOTE: when this test starts failing, it means the above issue was fixed.
// We should update this test and documentation to reflect as such.
InvalidOperationException exception = null;
try
{
ConfigureForFunctionsHostGrpc(s => s.AddGrpcClient<CallInvokerExtractor>());
}
catch (InvalidOperationException ex)
{
exception = ex;
}

Assert.NotNull(exception);
}
=> ConfigureForFunctionsHostGrpc(s => s.AddGrpcClient<CallInvokerExtractor>());

private void ConfigureForFunctionsHostGrpc(Func<IServiceCollection, IHttpClientBuilder> configure)
{
Expand Down

0 comments on commit 68cb6ca

Please sign in to comment.