Merge branch 'main' into spanner-non-blocking-ddl

Author: olavloite

.config/dotnet-tools.json

@@ -3,25 +3,19 @@
   "isRoot": true,
   "tools": {
     "docfx": {
-      "version": "2.77.0",
+      "version": "2.78.4",
       "commands": [
         "docfx"
       ]
     },
     "Google.Cloud.Tools.DocUploader": {
-      "version": "0.2.2",
+      "version": "0.3.0",
       "commands": [
         "docuploader"
       ]
     },
-    "Google.Cloud.Tools.ReleaseProgressReporter": {
-      "version": "0.4.2",
-      "commands": [
-        "release-progress-reporter"
-      ]
-    },
     "Google.Cloud.Tools.SbomGenerator": {
-      "version": "0.4.0",
+      "version": "0.5.0",
       "commands": [
         "generate-sbom"
       ]

.editorconfig

@@ -195,7 +195,7 @@ csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
 
 # License header
-file_header_template = Copyright 2024 Google LLC\n\nLicensed under the Apache License, Version 2.0 (the "License"):\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    https://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.
+file_header_template = Copyright 2025 Google LLC\n\nLicensed under the Apache License, Version 2.0 (the "License"):\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    https://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.
 csharp_style_namespace_declarations = file_scoped:suggestion
 csharp_style_prefer_null_check_over_type_check = true:suggestion
 csharp_style_prefer_local_over_anonymous_function = true:suggestion

.github/.OwlBot.lock.yaml

@@ -9,13 +9,15 @@
   "ignorePaths": [
     "issues/**",
     "apis/Google.Ads.AdManager.V1/Google.Ads.AdManager.V1/**",
+    "apis/Google.Ads.DataManager.V1/Google.Ads.DataManager.V1/**",
     "apis/Google.Ads.MarketingPlatform.Admin.V1Alpha/Google.Ads.MarketingPlatform.Admin.V1Alpha/**",
     "apis/Google.Analytics.Admin.V1Alpha/Google.Analytics.Admin.V1Alpha/**",
     "apis/Google.Analytics.Admin.V1Beta/Google.Analytics.Admin.V1Beta/**",
     "apis/Google.Analytics.Data.V1Beta/Google.Analytics.Data.V1Beta/**",
     "apis/Google.Apps.Card.V1/Google.Apps.Card.V1/**",
     "apis/Google.Apps.Chat.V1/Google.Apps.Chat.V1/**",
     "apis/Google.Apps.Events.Subscriptions.V1/Google.Apps.Events.Subscriptions.V1/**",
+    "apis/Google.Apps.Events.Subscriptions.V1Beta/Google.Apps.Events.Subscriptions.V1Beta/**",
     "apis/Google.Apps.Meet.V2/Google.Apps.Meet.V2/**",
     "apis/Google.Apps.Meet.V2Beta/Google.Apps.Meet.V2Beta/**",
     "apis/Google.Apps.Script.Type/Google.Apps.Script.Type/**",
@@ -69,6 +71,7 @@
     "apis/Google.Cloud.Billing.V1/Google.Cloud.Billing.V1/**",
     "apis/Google.Cloud.BinaryAuthorization.V1/Google.Cloud.BinaryAuthorization.V1/**",
     "apis/Google.Cloud.BinaryAuthorization.V1Beta1/Google.Cloud.BinaryAuthorization.V1Beta1/**",
+    "apis/Google.Cloud.CapacityPlanner.V1Beta/Google.Cloud.CapacityPlanner.V1Beta/**",
     "apis/Google.Cloud.CertificateManager.V1/Google.Cloud.CertificateManager.V1/**",
     "apis/Google.Cloud.Channel.V1/Google.Cloud.Channel.V1/**",
     "apis/Google.Cloud.Chronicle.V1/Google.Cloud.Chronicle.V1/**",
@@ -79,19 +82,24 @@
     "apis/Google.Cloud.CloudDms.V1/Google.Cloud.CloudDms.V1/**",
     "apis/Google.Cloud.CloudQuotas.V1/Google.Cloud.CloudQuotas.V1/**",
     "apis/Google.Cloud.CloudQuotas.V1Beta/Google.Cloud.CloudQuotas.V1Beta/**",
+    "apis/Google.Cloud.CloudSecurityCompliance.V1/Google.Cloud.CloudSecurityCompliance.V1/**",
     "apis/Google.Cloud.Commerce.Consumer.Procurement.V1/Google.Cloud.Commerce.Consumer.Procurement.V1/**",
     "apis/Google.Cloud.Common/Google.Cloud.Common/**",
     "apis/Google.Cloud.Compute.V1/Google.Cloud.Compute.V1/**",
     "apis/Google.Cloud.ConfidentialComputing.V1/Google.Cloud.ConfidentialComputing.V1/**",
     "apis/Google.Cloud.ConfidentialComputing.V1Alpha1/Google.Cloud.ConfidentialComputing.V1Alpha1/**",
     "apis/Google.Cloud.Config.V1/Google.Cloud.Config.V1/**",
+    "apis/Google.Cloud.ConfigDelivery.V1/Google.Cloud.ConfigDelivery.V1/**",
+    "apis/Google.Cloud.ConfigDelivery.V1Beta/Google.Cloud.ConfigDelivery.V1Beta/**",
     "apis/Google.Cloud.Connectors.V1/Google.Cloud.Connectors.V1/**",
     "apis/Google.Cloud.ContactCenterInsights.V1/Google.Cloud.ContactCenterInsights.V1/**",
     "apis/Google.Cloud.Container.V1/Google.Cloud.Container.V1/**",
     "apis/Google.Cloud.DataCatalog.Lineage.V1/Google.Cloud.DataCatalog.Lineage.V1/**",
     "apis/Google.Cloud.DataCatalog.V1/Google.Cloud.DataCatalog.V1/**",
     "apis/Google.Cloud.DataFusion.V1/Google.Cloud.DataFusion.V1/**",
+    "apis/Google.Cloud.DatabaseCenter.V1Beta/Google.Cloud.DatabaseCenter.V1Beta/**",
     "apis/Google.Cloud.Dataflow.V1Beta3/Google.Cloud.Dataflow.V1Beta3/**",
+    "apis/Google.Cloud.Dataform.V1/Google.Cloud.Dataform.V1/**",
     "apis/Google.Cloud.Dataform.V1Beta1/Google.Cloud.Dataform.V1Beta1/**",
     "apis/Google.Cloud.Dataplex.V1/Google.Cloud.Dataplex.V1/**",
     "apis/Google.Cloud.Dataproc.V1/Google.Cloud.Dataproc.V1/**",
@@ -132,11 +140,13 @@
     "apis/Google.Cloud.Functions.V2Beta/Google.Cloud.Functions.V2Beta/**",
     "apis/Google.Cloud.GSuiteAddOns.V1/Google.Cloud.GSuiteAddOns.V1/**",
     "apis/Google.Cloud.GdcHardwareManagement.V1Alpha/Google.Cloud.GdcHardwareManagement.V1Alpha/**",
+    "apis/Google.Cloud.GeminiDataAnalytics.V1Beta/Google.Cloud.GeminiDataAnalytics.V1Beta/**",
     "apis/Google.Cloud.GkeBackup.V1/Google.Cloud.GkeBackup.V1/**",
     "apis/Google.Cloud.GkeConnect.Gateway.V1/Google.Cloud.GkeConnect.Gateway.V1/**",
     "apis/Google.Cloud.GkeHub.V1Beta1/Google.Cloud.GkeHub.V1Beta1/**",
     "apis/Google.Cloud.GkeHub.V1/Google.Cloud.GkeHub.V1/**",
     "apis/Google.Cloud.GkeMultiCloud.V1/Google.Cloud.GkeMultiCloud.V1/**",
+    "apis/Google.Cloud.GkeRecommender.V1/Google.Cloud.GkeRecommender.V1/**",
     "apis/Google.Cloud.Iam.Admin.V1/Google.Cloud.Iam.Admin.V1/**",
     "apis/Google.Cloud.Iam.Credentials.V1/Google.Cloud.Iam.Credentials.V1/**",
     "apis/Google.Cloud.Iam.V1/Google.Cloud.Iam.V1/**",
@@ -149,14 +159,17 @@
     "apis/Google.Cloud.Kms.V1/Google.Cloud.Kms.V1/**",
     "apis/Google.Cloud.Language.V1/Google.Cloud.Language.V1/**",
     "apis/Google.Cloud.Language.V2/Google.Cloud.Language.V2/**",
+    "apis/Google.Cloud.LicenseManager.V1/Google.Cloud.LicenseManager.V1/**",
     "apis/Google.Cloud.LifeSciences.V2Beta/Google.Cloud.LifeSciences.V2Beta/**",
     "apis/Google.Cloud.Location/Google.Cloud.Location/**",
+    "apis/Google.Cloud.LocationFinder.V1/Google.Cloud.LocationFinder.V1/**",
     "apis/Google.Cloud.Logging.Log4Net/Google.Cloud.Logging.Log4Net/**",
     "apis/Google.Cloud.Logging.Console/Google.Cloud.Logging.Console/**",
     "apis/Google.Cloud.Logging.NLog/Google.Cloud.Logging.NLog/**",
     "apis/Google.Cloud.Logging.Type/Google.Cloud.Logging.Type/**",
     "apis/Google.Cloud.Logging.V2/Google.Cloud.Logging.V2/**",
     "apis/Google.Cloud.Lustre.V1/Google.Cloud.Lustre.V1/**",
+    "apis/Google.Cloud.Maintenance.Api.V1Beta/Google.Cloud.Maintenance.Api.V1Beta/**",
     "apis/Google.Cloud.ManagedIdentities.V1/Google.Cloud.ManagedIdentities.V1/**",
     "apis/Google.Cloud.ManagedKafka.V1/Google.Cloud.ManagedKafka.V1/**",
     "apis/Google.Cloud.MediaTranslation.V1Beta1/Google.Cloud.MediaTranslation.V1Beta1/**",
@@ -168,6 +181,8 @@
     "apis/Google.Cloud.Metastore.V1Alpha/Google.Cloud.Metastore.V1Alpha/**",
     "apis/Google.Cloud.Metastore.V1Beta/Google.Cloud.Metastore.V1Beta/**",
     "apis/Google.Cloud.MigrationCenter.V1/Google.Cloud.MigrationCenter.V1/**",
+    "apis/Google.Cloud.ModelArmor.V1/Google.Cloud.ModelArmor.V1/**",
+    "apis/Google.Cloud.ModelArmor.V1Beta/Google.Cloud.ModelArmor.V1Beta/**",
     "apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3/**",
     "apis/Google.Cloud.NetApp.V1/Google.Cloud.NetApp.V1/**",
     "apis/Google.Cloud.NetworkConnectivity.V1/Google.Cloud.NetworkConnectivity.V1/**",
@@ -210,11 +225,11 @@
     "apis/Google.Cloud.ResourceManager.V3/Google.Cloud.ResourceManager.V3/**",
     "apis/Google.Cloud.Retail.V2/Google.Cloud.Retail.V2/**",
     "apis/Google.Cloud.Run.V2/Google.Cloud.Run.V2/**",
+    "apis/Google.Cloud.SaasPlatform.SaasServiceMgmt.V1Beta1/Google.Cloud.SaasPlatform.SaasServiceMgmt.V1Beta1/**",
     "apis/Google.Cloud.Scheduler.V1/Google.Cloud.Scheduler.V1/**",
     "apis/Google.Cloud.SecretManager.V1/Google.Cloud.SecretManager.V1/**",
     "apis/Google.Cloud.SecretManager.V1Beta2/Google.Cloud.SecretManager.V1Beta2/**",
     "apis/Google.Cloud.SecretManager.V1Beta1/Google.Cloud.SecretManager.V1Beta1/**",
-    "apis/Google.Cloud.SecureSourceManager.V1/Google.Cloud.SecureSourceManager.V1/**",
     "apis/Google.Cloud.Security.PrivateCA.V1/Google.Cloud.Security.PrivateCA.V1/**",
     "apis/Google.Cloud.Security.PublicCA.V1/Google.Cloud.Security.PublicCA.V1/**",
     "apis/Google.Cloud.Security.PublicCA.V1Beta1/Google.Cloud.Security.PublicCA.V1Beta1/**",
@@ -240,11 +255,11 @@
     "apis/Google.Cloud.Speech.V2/Google.Cloud.Speech.V2/**",
     "apis/Google.Cloud.Storage.Control.V2/Google.Cloud.Storage.Control.V2/**",
     "apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1/**",
-    "apis/Google.Cloud.Storage.V2/Google.Cloud.Storage.V2/**",
     "apis/Google.Cloud.StorageBatchOperations.V1/Google.Cloud.StorageBatchOperations.V1/**",
     "apis/Google.Cloud.StorageInsights.V1/Google.Cloud.StorageInsights.V1/**",
     "apis/Google.Cloud.StorageTransfer.V1/Google.Cloud.StorageTransfer.V1/**",
     "apis/Google.Cloud.Support.V2/Google.Cloud.Support.V2/**",
+    "apis/Google.Cloud.Support.V2Beta/Google.Cloud.Support.V2Beta/**",
     "apis/Google.Cloud.Talent.V4/Google.Cloud.Talent.V4/**",
     "apis/Google.Cloud.Talent.V4Beta1/Google.Cloud.Talent.V4Beta1/**",
     "apis/Google.Cloud.Tasks.V2/Google.Cloud.Tasks.V2/**",
@@ -257,6 +272,7 @@
     "apis/Google.Cloud.Trace.V2/Google.Cloud.Trace.V2/**",
     "apis/Google.Cloud.Translate.V3/Google.Cloud.Translate.V3/**",
     "apis/Google.Cloud.Translation.V2/Google.Cloud.Translation.V2/**",
+    "apis/Google.Cloud.VertexAI.Extensions/Google.Cloud.VertexAI.Extensions/**",
     "apis/Google.Cloud.VMMigration.V1/Google.Cloud.VMMigration.V1/**",
     "apis/Google.Cloud.Video.LiveStream.V1/Google.Cloud.Video.LiveStream.V1/**",
     "apis/Google.Cloud.Video.Stitcher.V1/Google.Cloud.Video.Stitcher.V1/**",
@@ -277,7 +293,6 @@
     "apis/Google.Cloud.Workflows.V1Beta/Google.Cloud.Workflows.V1Beta/**",
     "apis/Google.Cloud.Workstations.V1/Google.Cloud.Workstations.V1/**",
     "apis/Google.Geo.Type/Google.Geo.Type/**",
-    "apis/Google.Geo.Weather.V1/Google.Geo.Weather.V1/**",
     "apis/Google.Identity.AccessContextManager.Type/Google.Identity.AccessContextManager.Type/**",
     "apis/Google.Identity.AccessContextManager.V1/Google.Identity.AccessContextManager.V1/**",
     "apis/Google.LongRunning/Google.LongRunning/**",
@@ -291,40 +306,51 @@
     "apis/Google.Maps.RouteOptimization.V1/Google.Maps.RouteOptimization.V1/**",
     "apis/Google.Maps.Routing.V2/Google.Maps.Routing.V2/**",
     "apis/Google.Shopping.Css.V1/Google.Shopping.Css.V1/**",
+    "apis/Google.Shopping.Merchant.Accounts.V1/Google.Shopping.Merchant.Accounts.V1/**",
     "apis/Google.Shopping.Merchant.Accounts.V1Beta/Google.Shopping.Merchant.Accounts.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Conversions.V1/Google.Shopping.Merchant.Conversions.V1/**",
     "apis/Google.Shopping.Merchant.Conversions.V1Beta/Google.Shopping.Merchant.Conversions.V1Beta/**",
+    "apis/Google.Shopping.Merchant.DataSources.V1/Google.Shopping.Merchant.DataSources.V1/**",
     "apis/Google.Shopping.Merchant.DataSources.V1Beta/Google.Shopping.Merchant.DataSources.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Inventories.V1/Google.Shopping.Merchant.Inventories.V1/**",
     "apis/Google.Shopping.Merchant.Inventories.V1Beta/Google.Shopping.Merchant.Inventories.V1Beta/**",
+    "apis/Google.Shopping.Merchant.IssueResolution.V1/Google.Shopping.Merchant.IssueResolution.V1/**",
+    "apis/Google.Shopping.Merchant.IssueResolution.V1Beta/Google.Shopping.Merchant.IssueResolution.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Lfp.V1/Google.Shopping.Merchant.Lfp.V1/**",
     "apis/Google.Shopping.Merchant.Lfp.V1Beta/Google.Shopping.Merchant.Lfp.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Notifications.V1/Google.Shopping.Merchant.Notifications.V1/**",
     "apis/Google.Shopping.Merchant.Notifications.V1Beta/Google.Shopping.Merchant.Notifications.V1Beta/**",
+    "apis/Google.Shopping.Merchant.OrderTracking.V1/Google.Shopping.Merchant.OrderTracking.V1/**",
+    "apis/Google.Shopping.Merchant.OrderTracking.V1Beta/Google.Shopping.Merchant.OrderTracking.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Products.V1/Google.Shopping.Merchant.Products.V1/**",
     "apis/Google.Shopping.Merchant.Products.V1Beta/Google.Shopping.Merchant.Products.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Promotions.V1/Google.Shopping.Merchant.Promotions.V1/**",
     "apis/Google.Shopping.Merchant.Promotions.V1Beta/Google.Shopping.Merchant.Promotions.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Quota.V1/Google.Shopping.Merchant.Quota.V1/**",
     "apis/Google.Shopping.Merchant.Quota.V1Beta/Google.Shopping.Merchant.Quota.V1Beta/**",
+    "apis/Google.Shopping.Merchant.Reports.V1/Google.Shopping.Merchant.Reports.V1/**",
     "apis/Google.Shopping.Merchant.Reports.V1Beta/Google.Shopping.Merchant.Reports.V1Beta/**",
     "apis/Google.Shopping.Merchant.Reviews.V1Beta/Google.Shopping.Merchant.Reviews.V1Beta/**",
     "apis/Google.Shopping.Type/Google.Shopping.Type/**",
     "apis/Grafeas.V1/Grafeas.V1/**"
   ],
   "ignoreDeps": [
-    "Grpc.Core",
-    "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "Microsoft.CodeAnalysis.Workspaces.MSBuild",
-    "dotnet-sdk"
+    "Grpc.Core"
   ],
   "packageRules": [
     {
       "matchPackagePrefixes": [
         "Microsoft.Extensions.",
         "mcr.microsoft.com/dotnet/"
       ],
-      "allowedVersions": "<7.0.0"
+      "allowedVersions": "<9.0.0"
     },
     {
       "matchPackageNames": [
         "System.Collections.Immutable",
         "dotnet-sdk"
       ],
-      "allowedVersions": "<7.0.0"
+      "allowedVersions": "<9.0.0"
     },
     {
       "matchPaths": [

.github/.OwlBot.yaml

@@ -0,0 +1,46 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    paths:
+    - '**[Bb]ig[Tt]able**'
+name: bigtable-conformance
+jobs:
+  conformance:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: true
+    - uses: actions/checkout@v5
+      with:
+        repository: googleapis/cloud-bigtable-clients-test
+        ref: main
+        path: cloud-bigtable-clients-test
+    - uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: |
+          6.0.x
+          8.0.x
+    - uses: actions/setup-go@v6
+      with:
+        go-version: '>=1.20.2'
+    - run: dotnet --version
+    - run: go version
+    - run: bash apis/Google.Cloud.Bigtable.V2/Google.Cloud.Bigtable.V2.ConformanceTests/bigtable-conformance.sh

.github/release-trigger.yml

@@ -13,15 +13,17 @@ jobs:
         regex: ["'Google\\.Cloud\\.[A-L].*'", "'Google\\.Cloud\\.[M-Z].*'", "'!Google\\.Cloud'"]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: true
         fetch-depth: 100
 
-    - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
 
     # The GitHub checkout action leaves the repo in a slightly awkward
     # state. This tidies it up.

.github/renovate.json

@@ -13,14 +13,16 @@ jobs:
       DOTNET_NOLOGO: true
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: true
 
-    - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
 
     - name: Build and test
       run: |

.github/workflows/bigtable-conformance.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Validate API catalog
       run: python -c 'import json; json.load(open("generator-input/apis.json", "r"))'