Fix #16712 Convert exceptions messages to resource strings

dotnet · Feb 27, 2020 · 51f09aa · 51f09aa
1 parent 233856f
commit 51f09aa
Show file tree

Hide file tree

Showing 62 changed files with 676 additions and 250 deletions.
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
@@ -156,4 +156,16 @@
   <data name="UpdateConflict" xml:space="preserve">
     <value>Conflicts were detected for item with id '{itemId}'.</value>
   </data>
+  <data name="NonEmbeddedIncludeNotSupported" xml:space="preserve">
+    <value>Non-embedded IncludeExpression is not supported: {expression}</value>
+  </data>
+  <data name="NavigationPropertyIsNotAnEmbeddedEntity" xml:space="preserve">
+    <value>Navigation '{entityType}.{navigationName}' doesn't point to an embedded entity.</value>
+  </data>
+  <data name="OffsetRequiresLimit" xml:space="preserve">
+    <value>Offset is not supported without Limit.</value>
+  </data>
+  <data name="ReverseRequiresOffsetOrLimit" xml:space="preserve">
+    <value>Reverse is not supported without Limit or Offset.</value>
+  </data>
 </root>
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs
@@ -7,6 +7,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -452,8 +453,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
 
                     if (!includeExpression.Navigation.IsEmbedded())
                     {
-                        throw new InvalidOperationException(
-                            "Non-embedded IncludeExpression is not supported: " + includeExpression.Print());
+                        throw new InvalidOperationException(CosmosStrings.NonEmbeddedIncludeNotSupported(includeExpression.Print()));
                     }
 
                     _includedNavigations.Push(includeExpression.Navigation);

diff --git a/...ShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitor.cs b/...ShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitor.cs
@@ -9,6 +9,7 @@
 using System.Reflection;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -217,8 +218,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                         if (includeExpression.Navigation.IsOnDependent
                             || includeExpression.Navigation.ForeignKey.DeclaringEntityType.IsDocumentRoot())
                         {
-                            throw new InvalidOperationException(
-                                "Non-embedded IncludeExpression is not supported: " + includeExpression.Print());
+                            throw new InvalidOperationException(CosmosStrings.NonEmbeddedIncludeNotSupported(includeExpression.Print()));
                         }
 
                         _pendingIncludes.Add(includeExpression);
@@ -298,8 +298,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                         if (includeExpression.Navigation.IsOnDependent
                             || includeExpression.Navigation.ForeignKey.DeclaringEntityType.IsDocumentRoot())
                         {
-                            throw new InvalidOperationException(
-                                "Non-embedded IncludeExpression is not supported: " + includeExpression.Print());
+                            throw new InvalidOperationException(CosmosStrings.NonEmbeddedIncludeNotSupported(includeExpression.Print()));
                         }
 
                         var isFirstInclude = _pendingIncludes.Count == 0;

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
@@ -83,7 +84,7 @@ protected override Expression VisitExtension(Expression node)
                 if (node is SqlExpression sqlExpression
                     && sqlExpression.TypeMapping == null)
                 {
-                    throw new InvalidOperationException("Null TypeMapping in Sql Tree");
+                    throw new InvalidOperationException(CoreStrings.NullTypeMappingInSqlTree);
                 }
 
                 return base.VisitExtension(node);

diff --git a/src/EFCore.Cosmos/Query/Internal/EntityProjectionExpression.cs b/src/EFCore.Cosmos/Query/Internal/EntityProjectionExpression.cs
@@ -7,6 +7,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -116,7 +117,8 @@ public virtual Expression BindProperty([NotNull] IProperty property, bool client
                 && !property.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    $"Called EntityProjectionExpression.GetProperty() with incorrect IProperty. EntityType:{EntityType.DisplayName()}, Property:{property.Name}");
+                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
+                        "GetProperty", nameof(IProperty), EntityType.DisplayName(), $"Property:{property.Name}"));
             }
 
             if (!_propertyExpressionsCache.TryGetValue(property, out var expression))
@@ -147,7 +149,8 @@ public virtual Expression BindNavigation([NotNull] INavigation navigation, bool
                 && !navigation.DeclaringEntityType.IsAssignableFrom(EntityType))
             {
                 throw new InvalidOperationException(
-                    $"Called EntityProjectionExpression.GetNavigation() with incorrect INavigation. EntityType:{EntityType.DisplayName()}, Navigation:{navigation.Name}");
+                    CoreStrings.EntityProjectionExpressionCalledWithIncorrectInterface(
+                        "GetNavigation", nameof(INavigation), EntityType.DisplayName(), $"Navigation:{navigation.Name}"));
             }
 
             if (!_navigationExpressionsCache.TryGetValue(navigation, out var expression))

diff --git a/src/EFCore.Cosmos/Query/Internal/ObjectAccessExpression.cs b/src/EFCore.Cosmos/Query/Internal/ObjectAccessExpression.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -30,7 +32,8 @@ public ObjectAccessExpression([NotNull] INavigation navigation, [NotNull] Expres
             if (Name == null)
             {
                 throw new InvalidOperationException(
-                    $"Navigation '{navigation.DeclaringEntityType.DisplayName()}.{navigation.Name}' doesn't point to an embedded entity.");
+                    CosmosStrings.NavigationPropertyIsNotAnEmbeddedEntity(
+                        navigation.DeclaringEntityType.DisplayName(), navigation.Name));
             }
 
             Navigation = navigation;

diff --git a/src/EFCore.Cosmos/Query/Internal/ObjectArrayProjectionExpression.cs b/src/EFCore.Cosmos/Query/Internal/ObjectArrayProjectionExpression.cs
@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -37,7 +39,8 @@ public ObjectArrayProjectionExpression(
             if (Name == null)
             {
                 throw new InvalidOperationException(
-                    $"Navigation '{navigation.DeclaringEntityType.DisplayName()}.{navigation.Name}' doesn't point to an embedded entity.");
+                    CosmosStrings.NavigationPropertyIsNotAnEmbeddedEntity(
+                        navigation.DeclaringEntityType.DisplayName(), navigation.Name));
             }
 
             Navigation = navigation;

diff --git a/src/EFCore.Cosmos/Query/Internal/QuerySqlGenerator.cs b/src/EFCore.Cosmos/Query/Internal/QuerySqlGenerator.cs
@@ -7,6 +7,7 @@
 using System.Linq.Expressions;
 using System.Text;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -243,7 +244,7 @@ protected override Expression VisitSelect(SelectExpression selectExpression)
                 else
                 {
                     // TODO: See Issue#18923
-                    throw new InvalidOperationException("Cosmos Sql API does not support Offset without Limit.");
+                    throw new InvalidOperationException(CosmosStrings.OffsetRequiresLimit);
                 }
             }
 

diff --git a/src/EFCore.Cosmos/Query/Internal/SelectExpression.cs b/src/EFCore.Cosmos/Query/Internal/SelectExpression.cs
@@ -6,6 +6,8 @@
 using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -343,7 +345,7 @@ public virtual void ReverseOrderings()
             if (Limit != null
                 || Offset != null)
             {
-                throw new InvalidOperationException("Cosmos: Reverse without Limit or Offset.");
+                throw new InvalidOperationException(CosmosStrings.ReverseRequiresOffsetOrLimit);
             }
 
             var existingOrderings = _orderings.ToArray();

diff --git a/src/EFCore.Cosmos/Query/Internal/SqlBinaryExpression.cs b/src/EFCore.Cosmos/Query/Internal/SqlBinaryExpression.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -44,7 +45,7 @@ public class SqlBinaryExpression : SqlExpression
         private static ExpressionType VerifyOperator(ExpressionType operatorType)
             => _allowedOperators.Contains(operatorType)
                 ? operatorType
-                : throw new InvalidOperationException("Unsupported Binary operator type specified.");
+                : throw new InvalidOperationException(CoreStrings.UnsupportedBinaryOperator);
 
         /// <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.Diagnostics;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 
@@ -52,7 +53,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("VisitChildren must be overridden in class deriving from SqlExpression");
+            => throw new InvalidOperationException(CoreStrings.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
@@ -192,7 +192,7 @@ private SqlExpression ApplyTypeMappingOnSqlBinary(
                     break;
 
                 default:
-                    throw new InvalidOperationException("Incorrect operatorType for SqlBinaryExpression");
+                    throw new InvalidOperationException(CoreStrings.IncorrectOperatorType);
             }
 
             return new SqlBinaryExpression(

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

diff --git a/src/EFCore.Design/Properties/DesignStrings.Designer.cs b/src/EFCore.Design/Properties/DesignStrings.Designer.cs
diff --git a/src/EFCore.Design/Properties/DesignStrings.resx b/src/EFCore.Design/Properties/DesignStrings.resx
@@ -333,9 +333,6 @@ Change your target project to the migrations project by using the Package Manage
   <data name="NoLanguageService" xml:space="preserve">
     <value>The project language '{language}' isn't supported by the built-in {service} service. You can try looking for an additional NuGet package which supports this language; moving your DbContext type to a C# class library referenced by this project; or manually implementing and registering the design-time service for programming language.</value>
   </data>
-  <data name="RevertingMigration" xml:space="preserve">
-    <value>Reverting migration '{name}'.</value>
-  </data>
   <data name="FindingReferencedServices" xml:space="preserve">
     <value>Finding design-time services referenced by assembly '{startupAssembly}'.</value>
   </data>
@@ -363,4 +360,7 @@ Change your target project to the migrations project by using the Package Manage
   <data name="UsingHostingServices" xml:space="preserve">
     <value>Using application service provider from Microsoft.Extensions.Hosting.</value>
   </data>
+  <data name="UnhandledEnumValue" xml:space="preserve">
+    <value>Unhandled enum value '{enumValue}'.</value>
+  </data>
 </root>
diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs
@@ -7,6 +7,7 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -746,7 +747,7 @@ private void GenerateProperty(IProperty property, bool useDataAnnotations)
                         : nameof(PropertyBuilder.ValueGeneratedOnAddOrUpdate),
                     ValueGenerated.OnUpdate => nameof(PropertyBuilder.ValueGeneratedOnUpdate),
                     ValueGenerated.Never => nameof(PropertyBuilder.ValueGeneratedNever),
-                    _ => throw new InvalidOperationException($"Unhandled enum value '{nameof(ValueGenerated)}.{valueGenerated}'")
+                    _ => throw new InvalidOperationException(DesignStrings.UnhandledEnumValue($"{nameof(ValueGenerated)}.{valueGenerated}"))
                 };
 
                 lines.Add($".{methodName}()");

diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpModelGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpModelGenerator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Utilities;
 
@@ -79,17 +80,17 @@ public override ScaffoldedModel GenerateModel(
 
             if (options.ContextName == null)
             {
-                throw new ArgumentException($"{nameof(options.ContextName)} cannot be null", nameof(options));
+                throw new ArgumentException(CoreStrings.ArgumentPropertyNull(nameof(options.ContextName), nameof(options)), nameof(options));
             }
 
             if (options.ConnectionString == null)
             {
-                throw new ArgumentException($"{nameof(options.ConnectionString)} cannot be null", nameof(options));
+                throw new ArgumentException(CoreStrings.ArgumentPropertyNull(nameof(options.ConnectionString), nameof(options)), nameof(options));
             }
 
             if (options.ModelNamespace == null)
             {
-                throw new ArgumentException($"{nameof(options.ModelNamespace)} cannot be null", nameof(options));
+                throw new ArgumentException(CoreStrings.ArgumentPropertyNull(nameof(options.ModelNamespace), nameof(options)), nameof(options));
             }
 
             var generatedCode = CSharpDbContextGenerator.WriteCode(

diff --git a/src/EFCore.InMemory/Properties/InMemoryStrings.Designer.cs b/src/EFCore.InMemory/Properties/InMemoryStrings.Designer.cs