Merge branch 'main' into efcore-dotnet-10

Author: olavloite

.github/CODEOWNERS

@@ -4,5 +4,4 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-spanner is the default owner for changes in this repo
-*               @googleapis/api-spanner
+*               @googleapis/spanner-team @googleapis/cloud-sdk-dotnet-team

.github/workflows/ado-net-tests.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
       - name: Checkout go-sql-spanner
         uses: actions/checkout@v6
         with:
@@ -45,9 +45,10 @@ jobs:
         working-directory: spanner-ado-net/spanner-ado-net-samples-tests
         run: dotnet test --verbosity normal
         shell: bash
+        if: matrix.os != 'ubuntu-24.04-arm'
       - name: dotnet run sample
         working-directory: spanner-ado-net/spanner-ado-net-samples
         run: dotnet run HelloWorld
         shell: bash
         # Docker is only supported on Linux on GitHub Actions
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && matrix.os != 'ubuntu-24.04-arm'

.github/workflows/build-and-test.yml

@@ -9,7 +9,10 @@ on:
 
 jobs:
   unit-tests:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v6
     - name: Setup .NET

.github/workflows/samples.yml

@@ -21,3 +21,9 @@ jobs:
     - name: Run samples
       working-directory: ./Google.Cloud.EntityFrameworkCore.Spanner.Samples
       run: dotnet run All
+    - name: Compile sample model
+      working-directory: ./Google.Cloud.EntityFrameworkCore.Spanner.Samples
+      run: |
+        dotnet tool install --global dotnet-ef
+        dotnet tool restore
+        ./optimize.sh

.github/workflows/sync-spannerlib-code.yml

@@ -25,11 +25,12 @@ jobs:
         shell: bash
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "chore: sync SpannerLib code"
           branch: automated-spanner-lib-code-update
           title: "chore: sync SpannerLib code"
           body: "Update the ADO.NET driver with the latest SpannerLib code."
           base: main
+          committer: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>

.release-please-manifest.json

@@ -1,3 +1,4 @@
 {
-  ".": "3.8.0"
+  ".": "3.10.0",
+  "spanner-ado-net/spanner-ado-net": "0.2.3"
 }

Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests/Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests.csproj

@@ -24,11 +24,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4" />
+    <PackageReference Include="coverlet.collector" Version="8.0.0" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.5.61" />
   </ItemGroup>
 

Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests/Model/JsonPropertiesWithSpecialNames.cs

@@ -0,0 +1,54 @@
+// Copyright 2026 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
+//
+//     https://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.
+
+using System.Text.Json.Serialization;
+
+namespace Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests.Model;
+
+/// <summary>
+/// JSON type with property names containing special characters that require bracket notation
+/// in JSON path expressions. This is used to test that VisitJsonScalar correctly handles
+/// property names containing dots, spaces, quotes, and backslashes.
+/// </summary>
+public class JsonPropertiesWithSpecialNames
+{
+    /// <summary>
+    /// Property with a dot in the JSON name - requires bracket notation $["property.with.dot"]
+    /// </summary>
+    [JsonPropertyName("property.with.dot")]
+    public string PropertyWithDot { get; set; }
+
+    /// <summary>
+    /// Property with a space in the JSON name - requires bracket notation $["property with space"]
+    /// </summary>
+    [JsonPropertyName("property with space")]
+    public string PropertyWithSpace { get; set; }
+
+    /// <summary>
+    /// Property with a single quote in the JSON name - requires bracket notation and quote escaping $["it's"]
+    /// </summary>
+    [JsonPropertyName("it's")]
+    public string PropertyWithSingleQuote { get; set; }
+
+    /// <summary>
+    /// Property with double quotes in the JSON name - requires bracket notation and escaping $["say \"hello\""]
+    /// </summary>
+    [JsonPropertyName("say \"hello\"")]
+    public string PropertyWithDoubleQuote { get; set; }
+
+    /// <summary>
+    /// Normal property without special characters - uses dot notation $.NormalProperty
+    /// </summary>
+    public string NormalProperty { get; set; }
+}

Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests/Model/Receipt.cs

@@ -2,7 +2,7 @@
 
 namespace Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests.Model;
 
-public struct Receipt
+public class Receipt
 {
     public DateOnly Date { get; set; }
 

Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests/Model/SpannerSampleDbContext.cs

@@ -38,6 +38,7 @@ public SpannerSampleDbContext(DbContextOptions<SpannerSampleDbContext> options)
         public virtual DbSet<Tracks> Tracks { get; set; }
         public virtual DbSet<Venues> Venues { get; set; }
         public virtual DbSet<TicketSales> TicketSales { get; set; }
+        public virtual DbSet<TestEntityWithSpecialJsonProperties> TestEntityWithSpecialJsonProperties { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -218,11 +219,29 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<TicketSales>(entity =>
             {
-                entity.Property(e => e.Receipt)
-                    .HasConversion<string>(
-                        v => v == null ? null : JsonConvert.SerializeObject(v),
-                        v => v == null ? null : JsonConvert.DeserializeObject<Receipt>(v))
-                    .HasColumnType("JSON");
+                // Use EF Core 8+ JSON column support with owned entities
+                // This allows EF Core to generate JsonScalarExpression nodes for property access
+                // which our VisitJsonScalar implementation translates to JSON_VALUE calls
+                entity.OwnsOne(e => e.Receipt, ownedBuilder =>
+                {
+                    ownedBuilder.ToJson();
+                    ownedBuilder.Property(r => r.Date).IsRequired();
+                    ownedBuilder.Property(r => r.Number).IsRequired();
+                });
+            });
+            
+            modelBuilder.Entity<TestEntityWithSpecialJsonProperties>(entity =>
+            {
+                entity.HasKey(e => e.Id);
+                entity.Property(e => e.Id).ValueGeneratedNever();
+                
+                // Use EF Core 8+ JSON column support with owned entity
+                // The JsonPropertiesWithSpecialNames class has properties with [JsonPropertyName]
+                // attributes that contain special characters (dots, spaces, quotes)
+                entity.OwnsOne(e => e.JsonData, ownedBuilder =>
+                {
+                    ownedBuilder.ToJson();
+                });
             });
         }
     }