dotnet · Aug 18, 2020 · Aug 17, 2020
diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs b/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.resx b/src/EFCore.Cosmos/Properties/CosmosStrings.resx
@@ -204,4 +204,16 @@
   <data name="MissingOrderingInSqlExpression" xml:space="preserve">
     <value>Reverse could not be translated to the server because there is no ordering on the server side.</value>
   </data>
+  <data name="NullTypeMappingInSqlTree" xml:space="preserve">
+    <value>Null TypeMapping in Sql Tree.</value>
+  </data>
+  <data name="UnableToBindMemberToEntityProjection" xml:space="preserve">
+    <value>Unable to bind '{memberType}' '{member}' to entity projection of '{entityType}'.</value>
+  </data>
+  <data name="UnsupportedOperatorForSqlExpression" xml:space="preserve">
+    <value>Unsupported operator '{nodeType}' specified for expression of type '{expressionType}'.</value>
+  </data>
+  <data name="VisitChildrenMustBeOverridden" xml:space="preserve">
+    <value>VisitChildren must be overridden in class deriving from SqlExpression.</value>
+  </data>
 </root>
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs
@@ -1214,7 +1214,7 @@ private ShapedQueryExpression AggregateResultShaper(
                         Expression.New(
                             typeof(InvalidOperationException).GetConstructors()
                                 .Single(ci => ci.GetParameters().Length == 1),
-                            Expression.Constant(CoreStrings.NoElements)),
+                            Expression.Constant(CoreStrings.SequenceContainsNoElements)),
                         resultType);
 
                 shaper = Expression.Block(

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
@@ -9,6 +9,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
@@ -963,7 +964,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                 if (extensionExpression is SqlExpression sqlExpression
                     && sqlExpression.TypeMapping == null)
                 {
-                    throw new InvalidOperationException(CoreStrings.NullTypeMappingInSqlTree);
+                    throw new InvalidOperationException(CosmosStrings.NullTypeMappingInSqlTree);
                 }
 
                 return base.VisitExtension(extensionExpression);

diff --git a/src/EFCore.Cosmos/Query/Internal/EntityProjectionExpression.cs b/src/EFCore.Cosmos/Query/Internal/EntityProjectionExpression.cs
@@ -118,8 +118,7 @@ public virtual Expression BindProperty([NotNull] IProperty property, bool client
                 && !property.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "GetProperty", nameof(IProperty), EntityType.DisplayName(), $"Property:{property.Name}"));
+                    CosmosStrings.UnableToBindMemberToEntityProjection("Property", property.Name, EntityType.DisplayName()));
             }
 
             if (!_propertyExpressionsMap.TryGetValue(property, out var expression))
@@ -150,8 +149,7 @@ public virtual Expression BindNavigation([NotNull] INavigation navigation, bool
                 && !navigation.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "GetNavigation", nameof(INavigation), EntityType.DisplayName(), $"Navigation:{navigation.Name}"));
+                    CosmosStrings.UnableToBindMemberToEntityProjection("Navigation", navigation.Name, EntityType.DisplayName()));
             }
 
             if (!_navigationExpressionsMap.TryGetValue(navigation, out var expression))

diff --git a/src/EFCore.Cosmos/Query/Internal/SqlBinaryExpression.cs b/src/EFCore.Cosmos/Query/Internal/SqlBinaryExpression.cs
@@ -5,7 +5,9 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -45,7 +47,8 @@ public class SqlBinaryExpression : SqlExpression
         private static ExpressionType VerifyOperator(ExpressionType operatorType)
             => _allowedOperators.Contains(operatorType)
                 ? operatorType
-                : throw new InvalidOperationException(CoreStrings.UnsupportedBinaryOperator);
+                : throw new InvalidOperationException(CosmosStrings.UnsupportedOperatorForSqlExpression(
+                    operatorType, typeof(SqlBinaryExpression).ShortDisplayName()));
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/src/EFCore.Cosmos/Query/Internal/SqlExpression.cs b/src/EFCore.Cosmos/Query/Internal/SqlExpression.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -53,7 +54,7 @@ protected SqlExpression([NotNull] Type type, [CanBeNull] CoreTypeMapping typeMap
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         protected override Expression VisitChildren(ExpressionVisitor visitor)
-            => throw new InvalidOperationException(CoreStrings.VisitChildrenMustBeOverridden);
+            => throw new InvalidOperationException(CosmosStrings.VisitChildrenMustBeOverridden);
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs b/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
@@ -137,7 +138,8 @@ when sqlUnaryExpression.IsLogicalNot():
                     break;
 
                 default:
-                    throw new InvalidOperationException(CoreStrings.TranslationFailed(sqlUnaryExpression.Print()));
+                    throw new InvalidOperationException(CosmosStrings.UnsupportedOperatorForSqlExpression(
+                        sqlUnaryExpression.OperatorType, typeof(SqlUnaryExpression).ShortDisplayName()));;
             }
 
             return new SqlUnaryExpression(sqlUnaryExpression.OperatorType, operand, resultType, resultTypeMapping);
@@ -197,7 +199,8 @@ private SqlExpression ApplyTypeMappingOnSqlBinary(
                 break;
 
                 default:
-                    throw new InvalidOperationException(CoreStrings.IncorrectOperatorType);
+                    throw new InvalidOperationException(CosmosStrings.UnsupportedOperatorForSqlExpression(
+                        sqlBinaryExpression.OperatorType, typeof(SqlBinaryExpression).ShortDisplayName()));
             }
 
             return new SqlBinaryExpression(

diff --git a/src/EFCore.Cosmos/Query/Internal/SqlUnaryExpression.cs b/src/EFCore.Cosmos/Query/Internal/SqlUnaryExpression.cs
@@ -5,7 +5,9 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -28,7 +30,8 @@ public class SqlUnaryExpression : SqlExpression
         private static ExpressionType VerifyOperator(ExpressionType operatorType)
             => _allowedOperators.Contains(operatorType)
                 ? operatorType
-                : throw new InvalidOperationException(CoreStrings.UnsupportedUnary);
+                : throw new InvalidOperationException(CosmosStrings.UnsupportedOperatorForSqlExpression(
+                    operatorType, typeof(SqlUnaryExpression).ShortDisplayName()));
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/src/EFCore.InMemory/Properties/InMemoryStrings.Designer.cs b/src/EFCore.InMemory/Properties/InMemoryStrings.Designer.cs
diff --git a/src/EFCore.InMemory/Properties/InMemoryStrings.resx b/src/EFCore.InMemory/Properties/InMemoryStrings.resx
@@ -146,4 +146,7 @@
   <data name="InvalidDerivedTypeInEntityProjection" xml:space="preserve">
     <value>'UpdateEntityType' called with '{derivedType}' which is not derived type of '{entityType}'.</value>
   </data>
+  <data name="UnableToBindMemberToEntityProjection" xml:space="preserve">
+    <value>Unable to bind '{memberType}' '{member}' to entity projection of '{entityType}'.</value>
+  </data>
 </root>
diff --git a/src/EFCore.InMemory/Query/Internal/EntityProjectionExpression.cs b/src/EFCore.InMemory/Query/Internal/EntityProjectionExpression.cs
@@ -102,8 +102,7 @@ public virtual Expression BindProperty([NotNull] IProperty property)
                 && !property.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "BindProperty", nameof(IProperty), EntityType.DisplayName(), $"Property:{property.Name}"));
+                    InMemoryStrings.UnableToBindMemberToEntityProjection("Property", property.Name, EntityType.DisplayName()));
             }
 
             return _readExpressionMap[property];
@@ -121,8 +120,7 @@ public virtual void AddNavigationBinding([NotNull] INavigation navigation, [NotN
                 && !navigation.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "AddNavigationBinding", nameof(INavigation), EntityType.DisplayName(), $"Property:{navigation.Name}"));
+                    InMemoryStrings.UnableToBindMemberToEntityProjection("Navigation", navigation.Name, EntityType.DisplayName()));
             }
 
             _navigationExpressionsCache[navigation] = entityShaper;
@@ -140,8 +138,7 @@ public virtual EntityShaperExpression BindNavigation([NotNull] INavigation navig
                 && !navigation.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "BindNavigation", nameof(INavigation), EntityType.DisplayName(), $"Property:{navigation.Name}"));
+                    InMemoryStrings.UnableToBindMemberToEntityProjection("Navigation", navigation.Name, EntityType.DisplayName()));
             }
 
             return _navigationExpressionsCache.TryGetValue(navigation, out var expression)

diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx
@@ -747,4 +747,19 @@
   <data name="TableNotMappedEntityType" xml:space="preserve">
     <value>The entity type '{entityType}' is not mapped to the store object '{table}'.</value>
   </data>
+  <data name="LastUsedWithoutOrderBy" xml:space="preserve">
+    <value>Queries performing '{method}' operation must have a deterministic sort order. Rewrite the query to apply an OrderBy clause on the sequence before calling '{method}'.</value>
+  </data>
+  <data name="NullTypeMappingInSqlTree" xml:space="preserve">
+    <value>Null TypeMapping in Sql Tree.</value>
+  </data>
+  <data name="UnableToBindMemberToEntityProjection" xml:space="preserve">
+    <value>Unable to bind '{memberType}' '{member}' to entity projection of '{entityType}'.</value>
+  </data>
+  <data name="UnsupportedOperatorForSqlExpression" xml:space="preserve">
+    <value>Unsupported operator '{nodeType}' specified for expression of type '{expressionType}'.</value>
+  </data>
+  <data name="VisitChildrenMustBeOverridden" xml:space="preserve">
+    <value>VisitChildren must be overridden in class deriving from SqlExpression.</value>
+  </data>
 </root>
diff --git a/src/EFCore.Relational/Query/EntityProjectionExpression.cs b/src/EFCore.Relational/Query/EntityProjectionExpression.cs
@@ -166,11 +166,7 @@ public virtual ColumnExpression BindProperty([NotNull] IProperty property)
                 && !property.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "BindProperty",
-                        "IProperty",
-                        EntityType.DisplayName(),
-                        property.Name));
+                    RelationalStrings.UnableToBindMemberToEntityProjection("Property", property.Name, EntityType.DisplayName()));
             }
 
             return _propertyExpressionMap[property];
@@ -190,11 +186,7 @@ public virtual void AddNavigationBinding([NotNull] INavigation navigation, [NotN
                 && !navigation.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "AddNavigationBinding",
-                        "INavigation",
-                        EntityType.DisplayName(),
-                        navigation.Name));
+                    RelationalStrings.UnableToBindMemberToEntityProjection("Navigation", navigation.Name, EntityType.DisplayName()));
             }
 
             _ownedNavigationMap[navigation] = entityShaper;
@@ -214,11 +206,7 @@ public virtual EntityShaperExpression BindNavigation([NotNull] INavigation navig
                 && !navigation.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
-                        "BindNavigation",
-                        "INavigation",
-                        EntityType.DisplayName(),
-                        navigation.Name));
+                    RelationalStrings.UnableToBindMemberToEntityProjection("Navigation", navigation.Name, EntityType.DisplayName()));
             }
 
             return _ownedNavigationMap.TryGetValue(navigation, out var expression)

diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -663,7 +663,7 @@ protected override ShapedQueryExpression TranslateLastOrDefault(
             if (selectExpression.Orderings.Count == 0)
             {
                 throw new InvalidOperationException(
-                    CoreStrings.LastUsedWithoutOrderBy(returnDefault ?
+                    RelationalStrings.LastUsedWithoutOrderBy(returnDefault ?
                         nameof(Queryable.LastOrDefault) : nameof(Queryable.Last)));
             }
 
@@ -1559,7 +1559,7 @@ private ShapedQueryExpression AggregateResultShaper(
                             Expression.New(
                                 typeof(InvalidOperationException).GetConstructors()
                                     .Single(ci => ci.GetParameters().Length == 1),
-                                Expression.Constant(CoreStrings.NoElements)),
+                                Expression.Constant(CoreStrings.SequenceContainsNoElements)),
                             resultType);
 
                 shaper = Expression.Block(

diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -1540,7 +1540,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                 {
                     if (sqlExpression.TypeMapping == null)
                     {
-                        throw new InvalidOperationException(CoreStrings.NullTypeMappingInSqlTree);
+                        throw new InvalidOperationException(RelationalStrings.NullTypeMappingInSqlTree);
                     }
                 }