Normalize provider annotations to handle JSON elements in complex index processing. Fixes invalid method annotation result in case of composite indexes.

Author: CaffeinatedCoder

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>2.0.0</Version>
+        <Version>2.0.2</Version>
         <Authors>CaffeinatedCoder</Authors>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>

EFCore.ComplexIndexes/CustomMigrationsModelDiffer.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -180,6 +181,8 @@ HashSet<IndexDescriptor> results
 
             var indexName = def.IndexName ?? $"IX_{tableName}_{string.Join("_", columnNames)}";
 
+            var normalized = NormalizeProviderAnnotations(def.ProviderAnnotations);
+
             results.Add(
                 new IndexDescriptor(
                     tableName,
@@ -188,12 +191,44 @@ HashSet<IndexDescriptor> results
                     indexName,
                     def.IsUnique,
                     def.Filter,
-                    def.ProviderAnnotations ?? []
+                    normalized
                 )
             );
         }
     }
 
+    private static Dictionary<string, object?> NormalizeProviderAnnotations(Dictionary<string, object?>? annotations)
+    {
+        if (annotations is null) return [];
+
+        var result = new Dictionary<string, object?>(annotations.Count);
+
+        foreach (var (key, value) in annotations)
+        {
+            result[key] = value is JsonElement je
+                              ? NormalizeJsonElement(je)
+                              : value;
+        }
+
+        return result;
+    }
+
+    private static object? NormalizeJsonElement(JsonElement je)
+    {
+        return je.ValueKind switch
+               {
+                   JsonValueKind.String => je.GetString(),
+                   JsonValueKind.True   => true,
+                   JsonValueKind.False  => false,
+                   JsonValueKind.Number => je.TryGetInt64(out var l) ? l : je.GetDouble(),
+                   JsonValueKind.Null   => null,
+                   JsonValueKind.Array => je.EnumerateArray()
+                                            .Select(e => e.ValueKind == JsonValueKind.String ? e.GetString() : e.ToString())
+                                            .ToArray(),
+                   _ => je.ToString()
+               };
+    }
+
     private static string? ResolveColumnName(IEntityType entityType, string dotPath)
     {
         var       parts   = dotPath.Split('.');