Move RelationalStrings.NoElements exception message to core

Fixes #16164
dotnet · Jul 27, 2019 · 07eafb6 · 07eafb6
1 parent b9653e8
commit 07eafb6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -747,8 +748,7 @@ private ShapedQueryExpression AggregateResultShaper(
                             Expression.New(
                                 typeof(InvalidOperationException).GetConstructors()
                                     .Single(ci => ci.GetParameters().Length == 1),
-                                // TODO: See issue#16164
-                                Expression.Constant("Insert exception message here")),
+                                Expression.Constant(CoreStrings.NoElements)),
                             resultType),
                         resultType != resultVariable.Type
                             ? Expression.Convert(resultVariable, resultType)

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
@@ -402,9 +402,6 @@
   <data name="UnsupportedPropertyType" xml:space="preserve">
     <value>No mapping to a relational type can be found for property '{entity}.{property}' with the CLR type '{clrType}'.</value>
   </data>
-  <data name="NoElements" xml:space="preserve">
-    <value>Sequence contains no elements.</value>
-  </data>
   <data name="LogConnectionErrorAsDebug" xml:space="preserve">
     <value>An error occurred using the connection to database '{database}' on server '{server}'.</value>
     <comment>Debug RelationalEventId.ConnectionError string string</comment>

diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -1062,7 +1062,7 @@ private ShapedQueryExpression AggregateResultShaper(
                             Expression.New(
                                 typeof(InvalidOperationException).GetConstructors()
                                     .Single(ci => ci.GetParameters().Length == 1),
-                                Expression.Constant(RelationalStrings.NoElements)),
+                                Expression.Constant(CoreStrings.NoElements)),
                             resultType),
                         resultType != resultVariable.Type
                             ? Expression.Convert(resultVariable, resultType)

diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs
diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx
@@ -123,6 +123,9 @@
   <data name="ModelNotFinalized" xml:space="preserve">
     <value>The model must be finalized before '{method}' can be used. Ensure that either 'OnModelCreating' has completed or, if using a stand-alone 'ModelBuilder', that 'FinalizeModel' has been called.</value>
   </data>
+  <data name="NoElements" xml:space="preserve">
+    <value>Sequence contains no elements.</value>
+  </data>
   <data name="InvalidEnumValue" xml:space="preserve">
     <value>The value provided for argument '{argumentName}' must be a valid value of enum type '{enumType}'.</value>
   </data>