Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bumping grpc packages #1719

Merged
merged 4 commits into from
Jul 7, 2023
Merged

bumping grpc packages #1719

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aacb3b9
bumping grpc packages
brettsam Jul 6, 2023
3035a4f
updating release notes
brettsam Jul 6, 2023
5bfe0df
grpc bug fixed; updating test and docs
brettsam Jul 6, 2023
316d758
removing grpc core
brettsam Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions extensions/Worker.Extensions.Rpc/src/GrpcHttpClientBuilderExtensions.cs
View file
Open in desktop
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>
brettsam marked this conversation as resolved.
Show resolved Hide resolved
public static IHttpClientBuilder ConfigureForFunctionsHostGrpc(this IHttpClientBuilder builder)
{
if (builder is null)
Expand Down
4 changes: 2 additions & 2 deletions extensions/Worker.Extensions.Rpc/src/Worker.Extensions.Rpc.csproj
View file
Open in desktop
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
View file
Open in desktop
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)
11 changes: 6 additions & 5 deletions src/DotNetWorker.Grpc/DotNetWorker.Grpc.csproj
View file
Open in desktop
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,9 @@

<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.Core" Version="2.46.6" />
brettsam marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Grpc.Tools" Version="2.56.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -32,8 +33,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
View file
Open in desktop
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>
liliankasem marked this conversation as resolved.
Show resolved Hide resolved
<PatchProductVersion>0</PatchProductVersion>
<VersionSuffix></VersionSuffix>
</PropertyGroup>
Expand Down
17 changes: 1 addition & 16 deletions test/Worker.Extensions.Rpc.Tests/GrpcHttpClientBuilderExtensionsTests.cs
View file
Open in desktop
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);
}
brettsam marked this conversation as resolved.
Show resolved Hide resolved
=> ConfigureForFunctionsHostGrpc(s => s.AddGrpcClient<CallInvokerExtractor>());

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