From 50f2d6e04e8323119d4dd31506827ee398d6b8e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:08:03 -0800
Subject: [PATCH] MINOR: [C#] Bump Google.Protobuf and System.Memory in /csharp
(#44908)
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) and System.Memory. These dependencies needed to be updated together.
Updates `Google.Protobuf` from 3.28.3 to 3.29.0
Commits
2d4414f
Updating version.json and repo version numbers to: 29.0
870e599
Revert upgrade to rules_java 8.3.1. This is a partial roll-back of fb8ee79 (#...
02cffa4
Fix typo in BCR maintainer name config for acozzette@ (#19307)
7537b03
Remove Bazel 6 in BCR presubmits (#19309)
325aa80
Merge pull request #19305 from protocolbuffers/29.x-202411182222
c13eb62
Updating version.json and repo version numbers to: 29.0-dev
71c2594
Updating version.json and repo version numbers to: 29.0-rc3
b69ea96
Fixed non-conformance in JSON parsing for empty strings in numeric fields. (#...
fb8ee79
Upgrade rules_cc 0.0.15 and rules_java 8.3.1 (#19215)
6f310d5
Add missing line to docstring after Args (#19213)
- Additional commits viewable in compare view
Updates `System.Memory` from 4.6.0 to 4.5.3
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@ dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@ dependabot rebase` will rebase this PR
- `@ dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@ dependabot merge` will merge this PR after your CI passes on it
- `@ dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@ dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@ dependabot reopen` will reopen this PR if it is closed
- `@ dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@ dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency
- `@ dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@ dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@ dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Curt Hagenlocher
---
csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj | 2 +-
.../Apache.Arrow.Flight.TestWeb.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj b/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj
index 944a5add28d7b..39508df593a39 100644
--- a/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj
+++ b/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj b/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj
index 44312cd1b8420..2bca7701cd0f2 100644
--- a/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj
+++ b/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj
@@ -5,7 +5,7 @@
-
+