Merge branch 'main' into copilot/fix-invalid-property-name-compilation

Author: AndriySvyryd

.github/workflows/Build.yml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Restore
         if: runner.os != 'Windows'
@@ -91,7 +91,7 @@ jobs:
           Start-CosmosDbEmulator -Timeout 540 -NoUI -NoTelemetry -NoFirewall -EnablePreview
 
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Restore
         if: runner.os != 'Windows'
@@ -143,7 +143,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Restore
         run: ./restore.sh
@@ -177,7 +177,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Restore
         if: runner.os != 'Windows'
@@ -216,7 +216,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Restore
         if: runner.os != 'Windows'

.github/workflows/api-review-baselines.yml

@@ -113,7 +113,7 @@ jobs:
 
       - name: Check out selected commit
         if: steps.detect.outputs.has_baselines == 'true'
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
         with:
           ref: ${{ steps.detect.outputs.target_sha }}
           fetch-depth: 1

.github/workflows/copilot-setup-steps.yml

@@ -54,7 +54,7 @@ jobs:
           --health-timeout=5s
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Restore .NET SDK
         continue-on-error: true

.github/workflows/inter-branch-merge-flow.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@a6bacc00545c78b35c459f81331508e43d835d23
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@69bac0b76e58dc33ee3ee9740b6ae5b3e4c3b65a

eng/Versions.props

@@ -49,11 +49,11 @@
     <MicrosoftCodeAnalysisCSharpTestingVersion>1.1.4</MicrosoftCodeAnalysisCSharpTestingVersion>
     <AzureIdentityVersion>1.21.0</AzureIdentityVersion>
     <AzureResourceManagerCosmosDBVersion>1.4.1</AzureResourceManagerCosmosDBVersion>
-    <OpenTelemetryExporterInMemoryVersion>1.15.1</OpenTelemetryExporterInMemoryVersion>
+    <OpenTelemetryExporterInMemoryVersion>1.16.0</OpenTelemetryExporterInMemoryVersion>
     <SQLitePCLRawVersion>3.0.3</SQLitePCLRawVersion>
     <SQLite3MCPCLRawBundleVersion>2.3.5</SQLite3MCPCLRawBundleVersion>
     <XUnitV3Version>4.0.0-pre.108</XUnitV3Version>
-    <MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.26312.108</MicrosoftDotNetXUnitV3ExtensionsVersion>
+    <MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.26319.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
     <MicrosoftTestingPlatformVersion>2.2.2</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
 
@@ -64,7 +64,7 @@
 
   <PropertyGroup Label="Tooling dependencies">
     <ICSharpCodeDecompilerVersion>10.1.0.8386</ICSharpCodeDecompilerVersion>
-    <SystemCommandLineVersion>2.0.5</SystemCommandLineVersion>
+    <SystemCommandLineVersion>2.0.9</SystemCommandLineVersion>
   </PropertyGroup>
 
 </Project>

src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs

@@ -21,6 +21,7 @@ public class CosmosReadItemAndPartitionKeysExtractor : ExpressionVisitor
     private IEntityType _entityType = null!;
     private string _rootAlias = null!;
     private bool _isPredicateCompatibleWithReadItem;
+    private bool _partitionKeyValuesInPredicateConflictWithReadItem;
     private bool _nonRootDiscriminatorInJsonId;
     private string? _discriminatorJsonPropertyName;
     private Dictionary<IProperty, Expression?> _jsonIdPropertyValues = null!;
@@ -60,6 +61,7 @@ public virtual Expression ExtractPartitionKeysAndId(
         // from the tree (either constants or parameters).
         // We also want to ignore the discriminator property if it's compared to our entity type's discriminator value (see below).
         _isPredicateCompatibleWithReadItem = true;
+        _partitionKeyValuesInPredicateConflictWithReadItem = false;
         var jsonIdDefinition = _entityType.GetJsonIdDefinition();
 
         var jsonIdProperties = jsonIdDefinition?.Properties ?? [];
@@ -95,6 +97,33 @@ public virtual Expression ExtractPartitionKeysAndId(
         // this case, we skip lifting the predicate comparisons and leave the predicate exactly as it is (it may conflict with the values
         // given in WithPartitionKey and return zero results - that's the expected behavior).
         var liftPartitionKeys = queryCompilationContext.PartitionKeyPropertyValues.Count == 0;
+
+        if (!liftPartitionKeys) // partition key values provided via WithPartitionKey()
+        {
+            // WithPartitionKey() values are translated with applyDefaultTypeMapping:false (TypeMapping is null), so we apply the
+            // predicate value's TypeMapping before comparing. A literal WithPartitionKey argument is also parameterized by the
+            // funcletizer (outside a lambda) while the same literal in Where() stays a constant — when all PK properties are in
+            // the JSON ID, ReadItem is safe in that case: a wrong partition key returns null, not the wrong document.
+            var pkPropertiesInJsonId = partitionKeyProperties.All(p => jsonIdProperties.Contains(p));
+
+            for (var i = 0; i < partitionKeyProperties.Count; i++)
+            {
+                if (_partitionKeyPropertyValues[partitionKeyProperties[i]].ValueExpression is not SqlExpression predicateValue)
+                {
+                    continue;
+                }
+
+                if (i >= queryCompilationContext.PartitionKeyPropertyValues.Count
+                    || queryCompilationContext.PartitionKeyPropertyValues[i] is not SqlExpression withPkValue
+                    || (!predicateValue.Equals(_sqlExpressionFactory.ApplyTypeMapping(withPkValue, predicateValue.TypeMapping))
+                        && !(pkPropertiesInJsonId && withPkValue is SqlParameterExpression && predicateValue is SqlConstantExpression)))
+                {
+                    _partitionKeyValuesInPredicateConflictWithReadItem = true;
+                    break;
+                }
+            }
+        }
+
         foreach (var property in partitionKeyProperties)
         {
             if (liftPartitionKeys && _partitionKeyPropertyValues[property].ValueExpression is { } valueExpression)
@@ -115,6 +144,10 @@ public virtual Expression ExtractPartitionKeysAndId(
         // predicate, and *all* partition key values are specified(in the predicate or via WithPartitionKey)
         if (_isPredicateCompatibleWithReadItem
             && allIdPropertiesSpecified
+            // If partition key values were provided via WithPartitionKey() and the predicate specifies different values, we don't
+            // transform to ReadItem: that would silently ignore the predicate and return a result for the WithPartitionKey() value.
+            // Executing as a regular query instead correctly yields zero results on conflict (see #38238).
+            && !_partitionKeyValuesInPredicateConflictWithReadItem
             && queryCompilationContext.PartitionKeyPropertyValues.Count == partitionKeyProperties.Count
             && select is
             {
@@ -301,7 +334,7 @@ void ProcessPropertyComparison(string propertyName, SqlExpression propertyValue,
                     if (propertyName == property.GetJsonPropertyName())
                     {
                         if (_jsonIdPropertyValues.TryGetValue(property, out var previousValue)
-                            && (previousValue is null || previousValue.Equals(propertyValue)))
+                        && (previousValue is null || ExpressionEqualityComparer.Instance.Equals(previousValue, propertyValue)))
                         {
                             _jsonIdPropertyValues[property] = propertyValue;
                             isCompatibleComparisonForReadItem = true;
@@ -320,7 +353,8 @@ void ProcessPropertyComparison(string propertyName, SqlExpression propertyValue,
                 // call. Note that this is always considered a compatible comparison for ReadItem.
                 if (propertyName == property.GetJsonPropertyName()
                     && _partitionKeyPropertyValues.TryGetValue(property, out var previousValues)
-                    && (previousValues.ValueExpression is null || previousValues.Equals(propertyValue)))
+                    && (previousValues.ValueExpression is null
+                        || ExpressionEqualityComparer.Instance.Equals(previousValues.ValueExpression, propertyValue)))
                 {
                     _partitionKeyPropertyValues[property] = (ValueExpression: propertyValue, OriginalExpression: originalExpression);
                     return;

src/EFCore.Cosmos/Storage/Internal/CosmosTimeOnlyTypeMapping.cs

@@ -9,7 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
-public class CosmosTimeOnlyTypeMapping : CosmosTypeMapping
+public class CosmosTimeOnlyTypeMapping : CosmosTypeMapping<TimeOnly>
 {
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -25,7 +25,7 @@ public class CosmosTimeOnlyTypeMapping : CosmosTypeMapping
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public CosmosTimeOnlyTypeMapping() : base(typeof(TimeOnly), null, null, null, CosmosJsonTimeOnlyReaderWriter.Instance)
+    public CosmosTimeOnlyTypeMapping() : base(jsonValueReaderWriter: CosmosJsonTimeOnlyReaderWriter.Instance)
     {
     }
 

src/EFCore.Cosmos/Storage/Internal/CosmosTimeSpanTypeMapping.cs

@@ -9,7 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
-public class CosmosTimeSpanTypeMapping : CosmosTypeMapping
+public class CosmosTimeSpanTypeMapping : CosmosTypeMapping<TimeSpan>
 {
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -25,7 +25,7 @@ public class CosmosTimeSpanTypeMapping : CosmosTypeMapping
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public CosmosTimeSpanTypeMapping() : base(typeof(TimeSpan), null, null, null, CosmosJsonTimeSpanReaderWriter.Instance)
+    public CosmosTimeSpanTypeMapping() : base(jsonValueReaderWriter: CosmosJsonTimeSpanReaderWriter.Instance)
     {
     }
 

src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Frozen;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal;
@@ -36,7 +37,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                 { typeof(TimeOnly), CosmosTimeOnlyTypeMapping.Default },
                 { typeof(TimeSpan), CosmosTimeSpanTypeMapping.Default },
                 {
-                    typeof(JObject), new CosmosTypeMapping(
+                    typeof(JObject), CreateMapping(
                         typeof(JObject), jsonValueReaderWriter: dependencies.JsonValueReaderWriterSource.FindReaderWriter(typeof(JObject)))
                 }
             }.ToFrozenDictionary();
@@ -115,10 +116,10 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
             CoreTypeMapping? typeMapping = null;
             return !TryFindJsonCollectionMapping(elementMappingInfo, memoryType.MakeArrayType(), null, ref typeMapping, out var _, out var readerWriter)
                 ? null
-                : new CosmosTypeMapping(clrType, jsonValueReaderWriter: readerWriter)
-                .WithComposedConverter(
-                    (ValueConverter)Activator.CreateInstance(typeof(ReadOnlyMemoryConverter<>).MakeGenericType(memoryType))!,
-                    (ValueComparer)Activator.CreateInstance(typeof(ReadOnlyMemoryComparer<>).MakeGenericType(memoryType))!);
+                : CreateMapping(clrType, jsonValueReaderWriter: readerWriter)
+                    .WithComposedConverter(
+                        (ValueConverter)Activator.CreateInstance(typeof(ReadOnlyMemoryConverter<>).MakeGenericType(memoryType))!,
+                        (ValueComparer)Activator.CreateInstance(typeof(ReadOnlyMemoryComparer<>).MakeGenericType(memoryType))!);
         }
 
         return clrType.IsNumeric()
@@ -129,7 +130,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
             || clrType == typeof(DateTimeOffset)
             || clrType == typeof(TimeSpan)
             || clrType == typeof(string)
-                ? new CosmosTypeMapping(
+                ? CreateMapping(
                     clrType, jsonValueReaderWriter: Dependencies.JsonValueReaderWriterSource.FindReaderWriter(clrType))
                 : null;
     }
@@ -155,7 +156,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                 out var collectionReaderWriter)
             && elementMapping is not null)
         {
-            return new CosmosTypeMapping(
+            return CreateMapping(
                 clrType,
                 elementComparer,
                 elementMapping: elementMapping,
@@ -234,7 +235,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                         }
                     }
 
-                    return new CosmosTypeMapping(
+                    return CreateMapping(
                         clrType,
                         CreateStringDictionaryComparer(elementMapping, elementType, clrType),
                         jsonValueReaderWriter: jsonValueReaderWriter);
@@ -245,14 +246,67 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
         return null;
     }
 
+    private static CosmosTypeMapping CreateMapping(
+        Type clrType,
+        ValueComparer? comparer = null,
+        ValueComparer? keyComparer = null,
+        CoreTypeMapping? elementMapping = null,
+        JsonValueReaderWriter? jsonValueReaderWriter = null)
+        => clrType switch
+        {
+            _ when clrType == typeof(bool) => Create<bool>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(byte) => Create<byte>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(sbyte) => Create<sbyte>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(char) => Create<char>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(short) => Create<short>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(ushort) => Create<ushort>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(int) => Create<int>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(uint) => Create<uint>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(long) => Create<long>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(ulong) => Create<ulong>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(float) => Create<float>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(double) => Create<double>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(decimal) => Create<decimal>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(string) => Create<string>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(Guid) => Create<Guid>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(DateTime) => Create<DateTime>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(DateTimeOffset) => Create<DateTimeOffset>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ when clrType == typeof(DateOnly) => Create<DateOnly>(comparer, keyComparer, elementMapping, jsonValueReaderWriter),
+            _ => CreateMappingWithReflection(clrType, comparer, keyComparer, elementMapping, jsonValueReaderWriter)
+        };
+
+    private static CosmosTypeMapping Create<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicProperties)] T>(
+        ValueComparer? comparer,
+        ValueComparer? keyComparer,
+        CoreTypeMapping? elementMapping,
+        JsonValueReaderWriter? jsonValueReaderWriter)
+        => comparer is null && keyComparer is null && elementMapping is null && jsonValueReaderWriter is null
+            ? CosmosTypeMapping<T>.Default
+            : new CosmosTypeMapping<T>(comparer, keyComparer, elementMapping, jsonValueReaderWriter);
+
+    [UnconditionalSuppressMessage(
+        "AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.",
+        Justification = "The type mapping source is not used at runtime by NativeAOT applications, which use a compiled model instead.")]
+    private static CosmosTypeMapping CreateMappingWithReflection(
+        Type clrType,
+        ValueComparer? comparer,
+        ValueComparer? keyComparer,
+        CoreTypeMapping? elementMapping,
+        JsonValueReaderWriter? jsonValueReaderWriter)
+    {
+        var genericType = typeof(CosmosTypeMapping<>).MakeGenericType(clrType);
+        return comparer is null && keyComparer is null && elementMapping is null && jsonValueReaderWriter is null
+            ? (CosmosTypeMapping)genericType.GetAnyProperty(nameof(CosmosTypeMapping<object>.Default))!.GetValue(null)!
+            : (CosmosTypeMapping)Activator.CreateInstance(genericType, comparer, keyComparer, elementMapping, jsonValueReaderWriter)!;
+    }
+
     private static ValueComparer CreateStringDictionaryComparer(
         CoreTypeMapping elementMapping,
         Type elementType,
         Type dictType,
         bool readOnly = false)
     {
-        var unwrappedType = elementType.UnwrapNullableType();
-
         return (ValueComparer)Activator.CreateInstance(
             typeof(StringDictionaryComparer<,>).MakeGenericType(dictType, elementType),
 #pragma warning disable EF1001 // Internal EF Core API usage.