Skip to content

Commit

Permalink
chore: Update to latest GAX
Browse files Browse the repository at this point in the history
The direct Google.Protobuf dependency is no longer needed as the one in GAX is the latest.
  • Loading branch information
jskeet committed Sep 26, 2024
1 parent af308ff commit cd17e47
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
<PackageVersion Include="NSubstitute" Version="5.1.0" />

<!-- Google/gRPC packages -->
<PackageVersion Include="Google.Api.Gax" Version="4.8.0" />
<PackageVersion Include="Google.Api.Gax.Grpc" Version="4.8.0" />
<PackageVersion Include="Google.Api.Gax.Testing" Version="4.8.0" />
<PackageVersion Include="Google.Api.Gax" Version="4.9.0" />
<PackageVersion Include="Google.Api.Gax.Grpc" Version="4.9.0" />
<PackageVersion Include="Google.Api.Gax.Testing" Version="4.9.0" />
<PackageVersion Include="Google.Apis" Version="1.68.0" />
<PackageVersion Include="Google.Cloud.Iam.V1" Version="3.3.0" />
<PackageVersion Include="Google.Cloud.Location" Version="2.3.0" />
<PackageVersion Include="Google.LongRunning" Version="3.3.0" />
<PackageVersion Include="Google.Protobuf" Version="3.28.2" />

<!-- Microsoft/System packages -->
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.8.0, 5.0.0)" />
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.9.0, 5.0.0)" />
<PackageReference Include="Grpc.Core" Version="[2.46.6, 3.0.0)" Condition="'$(TargetFramework)'=='net462'" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.8.0, 5.0.0)" />
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.9.0, 5.0.0)" />
<PackageReference Include="Grpc.Core" Version="[2.46.6, 3.0.0)" Condition="'$(TargetFramework)'=='net462'" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="Google.LongRunning" Version="[3.3.0, 4.0.0)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.8.0, 5.0.0)" />
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.9.0, 5.0.0)" />
<PackageReference Include="Grpc.Core" Version="[2.46.6, 3.0.0)" Condition="'$(TargetFramework)'=='net462'" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="Google.Cloud.Location" Version="[2.3.0, 3.0.0)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.8.0, 5.0.0)" />
<PackageReference Include="Google.Api.Gax.Grpc" Version="[4.9.0, 5.0.0)" />
<PackageReference Include="Grpc.Core" Version="[2.46.6, 3.0.0)" Condition="'$(TargetFramework)'=='net462'" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="Google.Cloud.Location" Version="[2.3.0, 3.0.0)" />
Expand Down
2 changes: 1 addition & 1 deletion Google.Api.Generator/Generation/CsProjGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Google.Api.Generator.Generation
{
internal static class CsProjGenerator
{
private const string GaxGrpcVersion = "[4.8.0, 5.0.0)";
private const string GaxGrpcVersion = "[4.9.0, 5.0.0)";
private const string GrpcCoreVersion = "[2.46.6, 3.0.0)";
private const string LroVersion = "[3.3.0, 4.0.0)";
private const string IamVersion = "[3.3.0, 4.0.0)";
Expand Down
1 change: 0 additions & 1 deletion Google.Api.Generator/Google.Api.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<PackageReference Include="Google.Cloud.Iam.V1" />
<PackageReference Include="Google.Cloud.Location" />
<PackageReference Include="Google.LongRunning" />
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="YamlDotNet" />
Expand Down

0 comments on commit cd17e47

Please sign in to comment.