From 6ed1cc729e3ea8fd4a8d1eb2321f8a8b90e2e65f Mon Sep 17 00:00:00 2001 From: Adam Liddell Date: Sun, 4 Jun 2023 23:57:23 +0100 Subject: [PATCH] Update grpc --- csharp/nuget/nuget.bzl | 220 ++++++++++++++-------------- csharp/nuget/regenerate_packages.sh | 2 +- fsharp/nuget/nuget.bzl | 220 ++++++++++++++-------------- fsharp/nuget/nuget2config.json | 38 ++--- fsharp/nuget/regenerate_packages.sh | 2 +- go/repositories.bzl | 2 +- repositories.bzl | 6 +- ruby/Gemfile | 2 +- ruby/Gemfile.lock | 4 +- 9 files changed, 248 insertions(+), 248 deletions(-) diff --git a/csharp/nuget/nuget.bzl b/csharp/nuget/nuget.bzl index aae513f6..35330cba 100644 --- a/csharp/nuget/nuget.bzl +++ b/csharp/nuget/nuget.bzl @@ -105,85 +105,11 @@ def nuget_rules_proto_grpc_packages(): ], }, ) - nuget_package( - name = "google.protobuf", - package = "google.protobuf", - version = "3.21.9", - sha256 = "cf66c5d4b2eba4f2d2be0ea3d87058aa0ed2710374c88e447b0445e55859ef74", - core_lib = { - "netcoreapp2.0": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp2.1": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp2.2": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp3.0": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp3.1": "lib/netstandard2.0/Google.Protobuf.dll", - "net5.0": "lib/net5.0/Google.Protobuf.dll", - "net6.0": "lib/net5.0/Google.Protobuf.dll", - }, - core_deps = { - "netcoreapp2.0": [ - "@system.memory//:netcoreapp2.0_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp2.0_core", - ], - "netcoreapp2.1": [ - "@system.memory//:netcoreapp2.1_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp2.1_core", - ], - "netcoreapp2.2": [ - "@system.memory//:netcoreapp2.2_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp2.2_core", - ], - "netcoreapp3.0": [ - "@system.memory//:netcoreapp3.0_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp3.0_core", - ], - "netcoreapp3.1": [ - "@system.memory//:netcoreapp3.1_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp3.1_core", - ], - }, - core_files = { - "netcoreapp2.0": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp2.1": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp2.2": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp3.0": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp3.1": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "net5.0": [ - "lib/net5.0/Google.Protobuf.dll", - "lib/net5.0/Google.Protobuf.pdb", - "lib/net5.0/Google.Protobuf.xml", - ], - "net6.0": [ - "lib/net5.0/Google.Protobuf.dll", - "lib/net5.0/Google.Protobuf.pdb", - "lib/net5.0/Google.Protobuf.xml", - ], - }, - ) nuget_package( name = "microsoft.extensions.logging.abstractions", package = "microsoft.extensions.logging.abstractions", - version = "3.1.31", - sha256 = "9ec6e8d4dbaf458c024ae061e1522d416c5b11e336d9de35f958772c5cfb0374", + version = "3.1.32", + sha256 = "e02b4df8bd38f93d6d44d1a6b3387f541b999fda5fa547fda00809f76d60a5b0", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", @@ -227,8 +153,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.core.api", package = "grpc.core.api", - version = "2.50.0", - sha256 = "24eaa1503748d28c442eb476749acbbc5c75077f46354fc53bb9f6ca2740fa9f", + version = "2.53.0", + sha256 = "79f5b7e366a804ec14a309fe3bad98039f2d31c3f93d56481539b29ba26b691a", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Core.Api.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Core.Api.dll", @@ -302,8 +228,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.net.common", package = "grpc.net.common", - version = "2.50.0", - sha256 = "3129061e180a48aa84f59164d516eece2c06957c6c06947d2deab78a46ed7355", + version = "2.53.0", + sha256 = "96621b5d39eba3bab36f3b6dd6c9902dc664e69255d5760bb0779611faeb131a", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Net.Common.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Net.Common.dll", @@ -377,8 +303,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.net.client", package = "grpc.net.client", - version = "2.50.0", - sha256 = "7bdcbdcf6317c5a844613da764e37027e6cb5556e5895010ed7f818ce963876b", + version = "2.53.0", + sha256 = "ce4b850218859a8324d4f0764ddba469b7dd5670520b69d00b581ba9eb7f525d", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Net.Client.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Net.Client.dll", @@ -459,8 +385,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.tools", package = "grpc.tools", - version = "2.50.0", - sha256 = "eedfe928f8126d0d31c6f1fbc50ed7b76a993143cdbef1c61bb6e3856549611e", + version = "2.54.0", + sha256 = "8b0e16464943289c6b607f30f9ee3a79e70815ff19c41560ae5764e563437b78", core_files = { "netcoreapp2.0": [ "tools/linux_arm64/grpc_csharp_plugin", @@ -649,8 +575,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.dependencyinjection.abstractions", package = "microsoft.extensions.dependencyinjection.abstractions", - version = "3.1.31", - sha256 = "4f80b8e0b4f94429fb7d001c328f2f182af1b012126ce6ae790c7e8be650c07e", + version = "3.1.32", + sha256 = "c50b63c5f7710c1ba8522400f6640f22a332d848689a25d480425c86f161b320", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", @@ -694,8 +620,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.primitives", package = "microsoft.extensions.primitives", - version = "3.1.31", - sha256 = "826d3e1cbc7fa53c8f3b92447b555e5dbe34235192bebe984ffbb2dd83cd6a4a", + version = "3.1.32", + sha256 = "0bb4a7e3d1e180650437ef4caf694555d13a70c410879b18f51295dab3325bf8", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", @@ -757,8 +683,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.configuration.abstractions", package = "microsoft.extensions.configuration.abstractions", - version = "3.1.31", - sha256 = "6f4bb148fffb14d323bcd427c8f99b47927e5fd7f8cb09171805ef47be0d7a74", + version = "3.1.32", + sha256 = "b0c2e2812a1ef34ab832b974188ced644270febc61411d0f0e4ca8e03e7ebf4d", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", @@ -825,8 +751,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.configuration", package = "microsoft.extensions.configuration", - version = "3.1.31", - sha256 = "d6a57636e38e96ba8bb89316d7022da8a4f54969f2d787667e6ba4d1454cf9d9", + version = "3.1.32", + sha256 = "c76cf43f2470508643ef77f4b9a98bd0953ccc190468114746fc024bd0268c71", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll", @@ -893,8 +819,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.configuration.binder", package = "microsoft.extensions.configuration.binder", - version = "3.1.31", - sha256 = "642a3bd8031b6cd22755566a075bcfde608bf4457388f90db784059344d6265c", + version = "3.1.32", + sha256 = "d326a4f57073aba69c88df3323b32d94881102813ab355117d773cbfbdfc9ae7", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", @@ -961,8 +887,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.options", package = "microsoft.extensions.options", - version = "3.1.31", - sha256 = "4ec67385c3b166652d28ccc64b670b9c4a471e0b506405c20f751af0e7dc9463", + version = "3.1.32", + sha256 = "bcb06b879d725b305625c7048851af0c69965c8929313d510b042e851135c52f", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Options.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Options.dll", @@ -1033,11 +959,85 @@ def nuget_rules_proto_grpc_packages(): ], }, ) + nuget_package( + name = "google.protobuf", + package = "google.protobuf", + version = "3.23.2", + sha256 = "07f4db745e49b96c5bab7258443d75d7ac6d40356196c442bb80eacafb598933", + core_lib = { + "netcoreapp2.0": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp2.1": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp2.2": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp3.0": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp3.1": "lib/netstandard2.0/Google.Protobuf.dll", + "net5.0": "lib/net5.0/Google.Protobuf.dll", + "net6.0": "lib/net5.0/Google.Protobuf.dll", + }, + core_deps = { + "netcoreapp2.0": [ + "@system.memory//:netcoreapp2.0_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp2.0_core", + ], + "netcoreapp2.1": [ + "@system.memory//:netcoreapp2.1_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp2.1_core", + ], + "netcoreapp2.2": [ + "@system.memory//:netcoreapp2.2_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp2.2_core", + ], + "netcoreapp3.0": [ + "@system.memory//:netcoreapp3.0_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp3.0_core", + ], + "netcoreapp3.1": [ + "@system.memory//:netcoreapp3.1_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp3.1_core", + ], + }, + core_files = { + "netcoreapp2.0": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp2.1": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp2.2": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp3.0": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp3.1": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "net5.0": [ + "lib/net5.0/Google.Protobuf.dll", + "lib/net5.0/Google.Protobuf.pdb", + "lib/net5.0/Google.Protobuf.xml", + ], + "net6.0": [ + "lib/net5.0/Google.Protobuf.dll", + "lib/net5.0/Google.Protobuf.pdb", + "lib/net5.0/Google.Protobuf.xml", + ], + }, + ) nuget_package( name = "grpc.aspnetcore.server", package = "grpc.aspnetcore.server", - version = "2.50.0", - sha256 = "3f4c4d014b30a9ae5d9efd43c41858db85e8cc0dd6aea938c1a4671ad48d329d", + version = "2.53.0", + sha256 = "f4ff5cd4f522d2bd291ac740aefc40b73ab4f1e3efca884335e8351193e9a567", core_lib = { "netcoreapp3.0": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.dll", "netcoreapp3.1": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.dll", @@ -1163,8 +1163,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.dependencyinjection", package = "microsoft.extensions.dependencyinjection", - version = "3.1.31", - sha256 = "bacf458d060eac74f0879df4cc0418dc9b731a0fdc070900b7980146af27e7dc", + version = "3.1.32", + sha256 = "628192ecc095c03ca6bf9054f44ab2050292c9f31d3f7a6f93ffbfa15345e550", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll", @@ -1234,8 +1234,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.logging", package = "microsoft.extensions.logging", - version = "3.1.31", - sha256 = "2f8a8fa8137f3aff3ea503e3323536fadc8d0996f78736c2e8bb59dce7089280", + version = "3.1.32", + sha256 = "e111d03913601ffd8cec409634ddec450b6f3f85cf3b2003f9eb3067d3f493aa", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Logging.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Logging.dll", @@ -1323,8 +1323,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.http", package = "microsoft.extensions.http", - version = "3.1.31", - sha256 = "e4fc433a02b61cb17770db68756e5e203049bd1147d1538af21097ef9411828b", + version = "3.1.32", + sha256 = "a7d443f86842d76eace077cddb898cf357b79de426e7a0e0872768dd2db4eac5", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Http.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Http.dll", @@ -1405,8 +1405,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.net.clientfactory", package = "grpc.net.clientfactory", - version = "2.50.0", - sha256 = "3850ede74723cabbe6e3ec25d673b061859ae90cda4511e2d6823553d9bb4ae1", + version = "2.53.0", + sha256 = "ab0bbd19b695e10f81c7e1c0be2e4785d1d704043cf7ba005995750e2b9ed66d", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Net.ClientFactory.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Net.ClientFactory.dll", @@ -1487,8 +1487,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.aspnetcore.server.clientfactory", package = "grpc.aspnetcore.server.clientfactory", - version = "2.50.0", - sha256 = "88ecd2a2de632f6ccb5fcf1a3a177f090ab6a04a044fc3c5ae4fbe0beea52474", + version = "2.53.0", + sha256 = "9aee4387a48e69ee734041bb5e3577349e82a054af1fce6d6a92011f49aa5a59", core_lib = { "netcoreapp3.0": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.ClientFactory.dll", "netcoreapp3.1": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.ClientFactory.dll", @@ -1539,8 +1539,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.aspnetcore", package = "grpc.aspnetcore", - version = "2.50.0", - sha256 = "3778e85f4de610fdee7311e38d5f90b0536b7731deef5ffc03fecfacd74ce928", + version = "2.53.0", + sha256 = "2a3fc4b3553d3c6401c305b888c364ece47d3ff273ab5e98b62c11606b705906", core_deps = { "netcoreapp3.0": [ "@grpc.aspnetcore.server.clientfactory//:netcoreapp3.0_core", diff --git a/csharp/nuget/regenerate_packages.sh b/csharp/nuget/regenerate_packages.sh index 7b6c6c80..56f9d09a 100755 --- a/csharp/nuget/regenerate_packages.sh +++ b/csharp/nuget/regenerate_packages.sh @@ -8,7 +8,7 @@ set -o pipefail set -x PROTOBUF_VERSION="3.21.9" -GRPC_VERSION="2.50.0" +GRPC_VERSION="2.53.0" OUTPUT_DIR="$(pwd)/csharp/nuget" FILE_NAME="nuget.bzl" diff --git a/fsharp/nuget/nuget.bzl b/fsharp/nuget/nuget.bzl index a365c638..e8eab345 100644 --- a/fsharp/nuget/nuget.bzl +++ b/fsharp/nuget/nuget.bzl @@ -105,85 +105,11 @@ def nuget_rules_proto_grpc_packages(): ], }, ) - nuget_package( - name = "google.protobuf", - package = "google.protobuf", - version = "3.21.9", - sha256 = "cf66c5d4b2eba4f2d2be0ea3d87058aa0ed2710374c88e447b0445e55859ef74", - core_lib = { - "netcoreapp2.0": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp2.1": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp2.2": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp3.0": "lib/netstandard2.0/Google.Protobuf.dll", - "netcoreapp3.1": "lib/netstandard2.0/Google.Protobuf.dll", - "net5.0": "lib/net5.0/Google.Protobuf.dll", - "net6.0": "lib/net5.0/Google.Protobuf.dll", - }, - core_deps = { - "netcoreapp2.0": [ - "@system.memory//:netcoreapp2.0_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp2.0_core", - ], - "netcoreapp2.1": [ - "@system.memory//:netcoreapp2.1_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp2.1_core", - ], - "netcoreapp2.2": [ - "@system.memory//:netcoreapp2.2_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp2.2_core", - ], - "netcoreapp3.0": [ - "@system.memory//:netcoreapp3.0_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp3.0_core", - ], - "netcoreapp3.1": [ - "@system.memory//:netcoreapp3.1_core", - "@system.runtime.compilerservices.unsafe//:netcoreapp3.1_core", - ], - }, - core_files = { - "netcoreapp2.0": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp2.1": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp2.2": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp3.0": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "netcoreapp3.1": [ - "lib/netstandard2.0/Google.Protobuf.dll", - "lib/netstandard2.0/Google.Protobuf.pdb", - "lib/netstandard2.0/Google.Protobuf.xml", - ], - "net5.0": [ - "lib/net5.0/Google.Protobuf.dll", - "lib/net5.0/Google.Protobuf.pdb", - "lib/net5.0/Google.Protobuf.xml", - ], - "net6.0": [ - "lib/net5.0/Google.Protobuf.dll", - "lib/net5.0/Google.Protobuf.pdb", - "lib/net5.0/Google.Protobuf.xml", - ], - }, - ) nuget_package( name = "microsoft.extensions.logging.abstractions", package = "microsoft.extensions.logging.abstractions", - version = "3.1.31", - sha256 = "9ec6e8d4dbaf458c024ae061e1522d416c5b11e336d9de35f958772c5cfb0374", + version = "3.1.32", + sha256 = "e02b4df8bd38f93d6d44d1a6b3387f541b999fda5fa547fda00809f76d60a5b0", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", @@ -227,8 +153,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.core.api", package = "grpc.core.api", - version = "2.50.0", - sha256 = "24eaa1503748d28c442eb476749acbbc5c75077f46354fc53bb9f6ca2740fa9f", + version = "2.53.0", + sha256 = "79f5b7e366a804ec14a309fe3bad98039f2d31c3f93d56481539b29ba26b691a", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Core.Api.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Core.Api.dll", @@ -302,8 +228,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.net.common", package = "grpc.net.common", - version = "2.50.0", - sha256 = "3129061e180a48aa84f59164d516eece2c06957c6c06947d2deab78a46ed7355", + version = "2.53.0", + sha256 = "96621b5d39eba3bab36f3b6dd6c9902dc664e69255d5760bb0779611faeb131a", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Net.Common.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Net.Common.dll", @@ -377,8 +303,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.net.client", package = "grpc.net.client", - version = "2.50.0", - sha256 = "7bdcbdcf6317c5a844613da764e37027e6cb5556e5895010ed7f818ce963876b", + version = "2.53.0", + sha256 = "ce4b850218859a8324d4f0764ddba469b7dd5670520b69d00b581ba9eb7f525d", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Net.Client.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Net.Client.dll", @@ -459,8 +385,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.tools", package = "grpc.tools", - version = "2.50.0", - sha256 = "eedfe928f8126d0d31c6f1fbc50ed7b76a993143cdbef1c61bb6e3856549611e", + version = "2.54.0", + sha256 = "8b0e16464943289c6b607f30f9ee3a79e70815ff19c41560ae5764e563437b78", core_files = { "netcoreapp2.0": [ "tools/linux_arm64/grpc_csharp_plugin", @@ -649,8 +575,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.dependencyinjection.abstractions", package = "microsoft.extensions.dependencyinjection.abstractions", - version = "3.1.31", - sha256 = "4f80b8e0b4f94429fb7d001c328f2f182af1b012126ce6ae790c7e8be650c07e", + version = "3.1.32", + sha256 = "c50b63c5f7710c1ba8522400f6640f22a332d848689a25d480425c86f161b320", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", @@ -694,8 +620,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.primitives", package = "microsoft.extensions.primitives", - version = "3.1.31", - sha256 = "826d3e1cbc7fa53c8f3b92447b555e5dbe34235192bebe984ffbb2dd83cd6a4a", + version = "3.1.32", + sha256 = "0bb4a7e3d1e180650437ef4caf694555d13a70c410879b18f51295dab3325bf8", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", @@ -757,8 +683,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.configuration.abstractions", package = "microsoft.extensions.configuration.abstractions", - version = "3.1.31", - sha256 = "6f4bb148fffb14d323bcd427c8f99b47927e5fd7f8cb09171805ef47be0d7a74", + version = "3.1.32", + sha256 = "b0c2e2812a1ef34ab832b974188ced644270febc61411d0f0e4ca8e03e7ebf4d", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", @@ -825,8 +751,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.configuration", package = "microsoft.extensions.configuration", - version = "3.1.31", - sha256 = "d6a57636e38e96ba8bb89316d7022da8a4f54969f2d787667e6ba4d1454cf9d9", + version = "3.1.32", + sha256 = "c76cf43f2470508643ef77f4b9a98bd0953ccc190468114746fc024bd0268c71", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll", @@ -893,8 +819,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.configuration.binder", package = "microsoft.extensions.configuration.binder", - version = "3.1.31", - sha256 = "642a3bd8031b6cd22755566a075bcfde608bf4457388f90db784059344d6265c", + version = "3.1.32", + sha256 = "d326a4f57073aba69c88df3323b32d94881102813ab355117d773cbfbdfc9ae7", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", @@ -961,8 +887,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.options", package = "microsoft.extensions.options", - version = "3.1.31", - sha256 = "4ec67385c3b166652d28ccc64b670b9c4a471e0b506405c20f751af0e7dc9463", + version = "3.1.32", + sha256 = "bcb06b879d725b305625c7048851af0c69965c8929313d510b042e851135c52f", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Options.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Options.dll", @@ -1033,11 +959,85 @@ def nuget_rules_proto_grpc_packages(): ], }, ) + nuget_package( + name = "google.protobuf", + package = "google.protobuf", + version = "3.23.2", + sha256 = "07f4db745e49b96c5bab7258443d75d7ac6d40356196c442bb80eacafb598933", + core_lib = { + "netcoreapp2.0": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp2.1": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp2.2": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp3.0": "lib/netstandard2.0/Google.Protobuf.dll", + "netcoreapp3.1": "lib/netstandard2.0/Google.Protobuf.dll", + "net5.0": "lib/net5.0/Google.Protobuf.dll", + "net6.0": "lib/net5.0/Google.Protobuf.dll", + }, + core_deps = { + "netcoreapp2.0": [ + "@system.memory//:netcoreapp2.0_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp2.0_core", + ], + "netcoreapp2.1": [ + "@system.memory//:netcoreapp2.1_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp2.1_core", + ], + "netcoreapp2.2": [ + "@system.memory//:netcoreapp2.2_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp2.2_core", + ], + "netcoreapp3.0": [ + "@system.memory//:netcoreapp3.0_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp3.0_core", + ], + "netcoreapp3.1": [ + "@system.memory//:netcoreapp3.1_core", + "@system.runtime.compilerservices.unsafe//:netcoreapp3.1_core", + ], + }, + core_files = { + "netcoreapp2.0": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp2.1": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp2.2": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp3.0": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "netcoreapp3.1": [ + "lib/netstandard2.0/Google.Protobuf.dll", + "lib/netstandard2.0/Google.Protobuf.pdb", + "lib/netstandard2.0/Google.Protobuf.xml", + ], + "net5.0": [ + "lib/net5.0/Google.Protobuf.dll", + "lib/net5.0/Google.Protobuf.pdb", + "lib/net5.0/Google.Protobuf.xml", + ], + "net6.0": [ + "lib/net5.0/Google.Protobuf.dll", + "lib/net5.0/Google.Protobuf.pdb", + "lib/net5.0/Google.Protobuf.xml", + ], + }, + ) nuget_package( name = "grpc.aspnetcore.server", package = "grpc.aspnetcore.server", - version = "2.50.0", - sha256 = "3f4c4d014b30a9ae5d9efd43c41858db85e8cc0dd6aea938c1a4671ad48d329d", + version = "2.53.0", + sha256 = "f4ff5cd4f522d2bd291ac740aefc40b73ab4f1e3efca884335e8351193e9a567", core_lib = { "netcoreapp3.0": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.dll", "netcoreapp3.1": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.dll", @@ -1163,8 +1163,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.dependencyinjection", package = "microsoft.extensions.dependencyinjection", - version = "3.1.31", - sha256 = "bacf458d060eac74f0879df4cc0418dc9b731a0fdc070900b7980146af27e7dc", + version = "3.1.32", + sha256 = "628192ecc095c03ca6bf9054f44ab2050292c9f31d3f7a6f93ffbfa15345e550", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll", @@ -1234,8 +1234,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.logging", package = "microsoft.extensions.logging", - version = "3.1.31", - sha256 = "2f8a8fa8137f3aff3ea503e3323536fadc8d0996f78736c2e8bb59dce7089280", + version = "3.1.32", + sha256 = "e111d03913601ffd8cec409634ddec450b6f3f85cf3b2003f9eb3067d3f493aa", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Logging.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Logging.dll", @@ -1323,8 +1323,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "microsoft.extensions.http", package = "microsoft.extensions.http", - version = "3.1.31", - sha256 = "e4fc433a02b61cb17770db68756e5e203049bd1147d1538af21097ef9411828b", + version = "3.1.32", + sha256 = "a7d443f86842d76eace077cddb898cf357b79de426e7a0e0872768dd2db4eac5", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Microsoft.Extensions.Http.dll", "netcoreapp2.1": "lib/netstandard2.0/Microsoft.Extensions.Http.dll", @@ -1405,8 +1405,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.net.clientfactory", package = "grpc.net.clientfactory", - version = "2.50.0", - sha256 = "3850ede74723cabbe6e3ec25d673b061859ae90cda4511e2d6823553d9bb4ae1", + version = "2.53.0", + sha256 = "ab0bbd19b695e10f81c7e1c0be2e4785d1d704043cf7ba005995750e2b9ed66d", core_lib = { "netcoreapp2.0": "lib/netstandard2.0/Grpc.Net.ClientFactory.dll", "netcoreapp2.1": "lib/netstandard2.0/Grpc.Net.ClientFactory.dll", @@ -1487,8 +1487,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.aspnetcore.server.clientfactory", package = "grpc.aspnetcore.server.clientfactory", - version = "2.50.0", - sha256 = "88ecd2a2de632f6ccb5fcf1a3a177f090ab6a04a044fc3c5ae4fbe0beea52474", + version = "2.53.0", + sha256 = "9aee4387a48e69ee734041bb5e3577349e82a054af1fce6d6a92011f49aa5a59", core_lib = { "netcoreapp3.0": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.ClientFactory.dll", "netcoreapp3.1": "lib/netcoreapp3.0/Grpc.AspNetCore.Server.ClientFactory.dll", @@ -1539,8 +1539,8 @@ def nuget_rules_proto_grpc_packages(): nuget_package( name = "grpc.aspnetcore", package = "grpc.aspnetcore", - version = "2.50.0", - sha256 = "3778e85f4de610fdee7311e38d5f90b0536b7731deef5ffc03fecfacd74ce928", + version = "2.53.0", + sha256 = "2a3fc4b3553d3c6401c305b888c364ece47d3ff273ab5e98b62c11606b705906", core_deps = { "netcoreapp3.0": [ "@grpc.aspnetcore.server.clientfactory//:netcoreapp3.0_core", diff --git a/fsharp/nuget/nuget2config.json b/fsharp/nuget/nuget2config.json index 1132e8c9..fe8f31d1 100644 --- a/fsharp/nuget/nuget2config.json +++ b/fsharp/nuget/nuget2config.json @@ -5,27 +5,27 @@ "System.Numerics.Vectors": "4.5.0", "System.Runtime.CompilerServices.Unsafe": "4.7.1", "System.Memory": "4.5.5", - "Google.Protobuf": "3.21.9", - "Microsoft.Extensions.Logging.Abstractions": "3.1.31", - "Grpc.Core.Api": "2.50.0", - "Grpc.Net.Common": "2.50.0", - "Grpc.Net.Client": "2.50.0", - "Grpc.Tools": "2.50.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.31", - "Microsoft.Extensions.Primitives": "3.1.31", - "Microsoft.Extensions.Configuration.Abstractions": "3.1.31", - "Microsoft.Extensions.Configuration": "3.1.31", - "Microsoft.Extensions.Configuration.Binder": "3.1.31", - "Microsoft.Extensions.Options": "3.1.31", - "Grpc.AspNetCore.Server": "2.50.0", + "Microsoft.Extensions.Logging.Abstractions": "3.1.32", + "Grpc.Core.Api": "2.53.0", + "Grpc.Net.Common": "2.53.0", + "Grpc.Net.Client": "2.53.0", + "Grpc.Tools": "2.54.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.32", + "Microsoft.Extensions.Primitives": "3.1.32", + "Microsoft.Extensions.Configuration.Abstractions": "3.1.32", + "Microsoft.Extensions.Configuration": "3.1.32", + "Microsoft.Extensions.Configuration.Binder": "3.1.32", + "Microsoft.Extensions.Options": "3.1.32", + "Google.Protobuf": "3.23.2", + "Grpc.AspNetCore.Server": "2.53.0", "System.Threading.Tasks.Extensions": "4.5.4", "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "3.1.31", - "Microsoft.Extensions.Logging": "3.1.31", - "Microsoft.Extensions.Http": "3.1.31", - "Grpc.Net.ClientFactory": "2.50.0", - "Grpc.AspNetCore.Server.ClientFactory": "2.50.0", - "Grpc.AspNetCore": "2.50.0", + "Microsoft.Extensions.DependencyInjection": "3.1.32", + "Microsoft.Extensions.Logging": "3.1.32", + "Microsoft.Extensions.Http": "3.1.32", + "Grpc.Net.ClientFactory": "2.53.0", + "Grpc.AspNetCore.Server.ClientFactory": "2.53.0", + "Grpc.AspNetCore": "2.53.0", "FSharp.Core": "6.0.7", "Protobuf.FSharp": "0.2.0" } diff --git a/fsharp/nuget/regenerate_packages.sh b/fsharp/nuget/regenerate_packages.sh index 53862b34..9045cf54 100755 --- a/fsharp/nuget/regenerate_packages.sh +++ b/fsharp/nuget/regenerate_packages.sh @@ -8,7 +8,7 @@ set -o pipefail set -x PROTOBUF_VERSION="3.21.9" -GRPC_VERSION="2.50.0" +GRPC_VERSION="2.53.0" PROTOBUF_FSHARP_VERSION="0.2.0" GRPC_FSHARP_VERSION="0.2.0" diff --git a/go/repositories.bzl b/go/repositories.bzl index e6ba744c..60b84fa1 100644 --- a/go/repositories.bzl +++ b/go/repositories.bzl @@ -22,7 +22,7 @@ def go_repos(**kwargs): # buildifier: disable=function-docstring name = "org_golang_google_grpc", build_file_proto_mode = "disable", importpath = "google.golang.org/grpc", - sum = "h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=", + sum = "h1:zQZQNqQZU9cHv2vLdDhB2mFeDZ2hGpgYM1A0PKjFsSM=", version = "v{}".format(GRPC_VERSION), ) diff --git a/repositories.bzl b/repositories.bzl index b517d9aa..b7e0dfc0 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -7,7 +7,7 @@ load("//internal:common.bzl", "check_bazel_minimum_version") MINIMUM_BAZEL_VERSION = "5.3.0" ENABLE_VERSION_NAGS = False PROTOBUF_VERSION = "21.10" # When updating, also update protobuf-javascript, JS requirements, JS rulegen in js.go, Ruby requirements and C#/F# requirements -GRPC_VERSION = "1.51.0" # When updating, also update grpc hash, grpc-java hash, Go repositories.bzl, Ruby requirements and C#/F# requirements +GRPC_VERSION = "1.54.1" # When updating, also update grpc hash, grpc-java hash, Go repositories.bzl, Ruby requirements and C#/F# requirements BUF_VERSION = "v1.9.0" VERSIONS = { # Core @@ -30,7 +30,7 @@ VERSIONS = { "org": "grpc", "repo": "grpc", "ref": "v{}".format(GRPC_VERSION), - "sha256": "7f42363711eb483a0501239fd5522467b31d8fe98d70d7867c6ca7b52440d828", + "sha256": "79e3ff93f7fa3c8433e2165f2550fa14889fce147c15d9828531cbfc7ad11e01", }, "zlib": { "type": "http", @@ -194,7 +194,7 @@ VERSIONS = { "org": "grpc", "repo": "grpc-java", "ref": "v{}".format(GRPC_VERSION), - "sha256": "3762fd9a1045aa83d9a967840da142a1558565b76b470860282a1126e162799b", + "sha256": "98c32df8a878cbca5a6799922d28e9df93a4d5607316e0e3f8269a5886d9e429", }, "rules_jvm_external": { "type": "github", diff --git a/ruby/Gemfile b/ruby/Gemfile index b19c4a2e..6ba01b16 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } -gem 'grpc', '1.50.0' +gem 'grpc', '1.54.2' gem 'multi_json', '1.15.0' gem "google-protobuf", "3.21.9" diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 0f8caccc..8fa5f388 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -4,7 +4,7 @@ GEM google-protobuf (3.21.9) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) - grpc (1.50.0) + grpc (1.54.2) google-protobuf (~> 3.21) googleapis-common-protos-types (~> 1.0) multi_json (1.15.0) @@ -14,5 +14,5 @@ PLATFORMS DEPENDENCIES google-protobuf (= 3.21.9) - grpc (= 1.50.0) + grpc (= 1.54.2) multi_json (= 1.15.0)