From 7e949660bae392f55f5ca83f3ee3ba144b9ea20f Mon Sep 17 00:00:00 2001
From: Andriy Svyryd <AndriySvyryd@users.noreply.github.com>
Date: Wed, 5 Jan 2022 13:03:23 -0800
Subject: [PATCH] Fix spelling in LoggingDefinitions.LogSaveChangesCanceled.

Add a sugar constructor to NonRetryingExecutionStrategy.
---
 src/EFCore/Diagnostics/LoggingDefinitions.cs  |  2 +-
 src/EFCore/Properties/CoreStrings.Designer.cs |  4 +-
 src/EFCore/Properties/CoreStrings.resx        | 58 +++++++++----------
 .../Storage/NonRetryingExecutionStrategy.cs   |  9 +++
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/EFCore/Diagnostics/LoggingDefinitions.cs b/src/EFCore/Diagnostics/LoggingDefinitions.cs
index c712851a7b2..c403eb9a3d6 100644
--- a/src/EFCore/Diagnostics/LoggingDefinitions.cs
+++ b/src/EFCore/Diagnostics/LoggingDefinitions.cs
@@ -167,7 +167,7 @@ public abstract class LoggingDefinitions
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     [EntityFrameworkInternal]
-    public EventDefinitionBase? LogSaveChangedCanceled;
+    public EventDefinitionBase? LogSaveChangesCanceled;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs
index 7badcc3dd29..ecebccc29e4 100644
--- a/src/EFCore/Properties/CoreStrings.Designer.cs
+++ b/src/EFCore/Properties/CoreStrings.Designer.cs
@@ -4189,11 +4189,11 @@ public static EventDefinition LogRowLimitingOperationWithoutOrderBy(IDiagnostics
         /// </summary>
         public static EventDefinition<Type?> LogSaveChangesCanceled(IDiagnosticsLogger logger)
         {
-            var definition = ((LoggingDefinitions)logger.Definitions).LogSaveChangedCanceled;
+            var definition = ((LoggingDefinitions)logger.Definitions).LogSaveChangesCanceled;
             if (definition == null)
             {
                 definition = NonCapturingLazyInitializer.EnsureInitialized(
-                    ref ((LoggingDefinitions)logger.Definitions).LogSaveChangedCanceled,
+                    ref ((LoggingDefinitions)logger.Definitions).LogSaveChangesCanceled,
                     logger,
                     static logger => new EventDefinition<Type?>(
                         logger.Options,
diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx
index 155b1bb1ce6..e2872bc118d 100644
--- a/src/EFCore/Properties/CoreStrings.resx
+++ b/src/EFCore/Properties/CoreStrings.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1278,7 +1278,7 @@
     <value>The maximum number of retries ({retryLimit}) was exceeded while executing database operations with '{strategy}'. See the inner exception for the most recent failure.</value>
   </data>
   <data name="RuntimeModelMissingData" xml:space="preserve">
-    <value>The requested configuration is not stored in the read-optimized model, please use 'DbContext.GetService&amp;lt;IDesignTimeModel&amp;gt;().Model'.</value>
+    <value>The requested configuration is not stored in the read-optimized model, please use 'DbContext.GetService&lt;IDesignTimeModel&gt;().Model'.</value>
   </data>
   <data name="RuntimeParameterMissingParameter" xml:space="preserve">
     <value>While registering a runtime parameter, the lambda expression must have only one parameter which must be same as 'QueryCompilationContext.QueryContextParameter' expression.</value>
@@ -1472,4 +1472,4 @@
   <data name="WrongStateManager" xml:space="preserve">
     <value>Cannot start tracking the entry for entity type '{entityType}' because it was created by a different StateManager instance.</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/EFCore/Storage/NonRetryingExecutionStrategy.cs b/src/EFCore/Storage/NonRetryingExecutionStrategy.cs
index 3cc9501d0cc..13c1bc8aa28 100644
--- a/src/EFCore/Storage/NonRetryingExecutionStrategy.cs
+++ b/src/EFCore/Storage/NonRetryingExecutionStrategy.cs
@@ -29,6 +29,15 @@ public NonRetryingExecutionStrategy(ExecutionStrategyDependencies dependencies)
         Dependencies = dependencies;
     }
 
+    /// <summary>
+    ///     Constructs a new <see cref="NonRetryingExecutionStrategy" /> with the given context.
+    /// </summary>
+    /// <param name="context">The context on which the operations will be invoked.</param>
+    public NonRetryingExecutionStrategy(DbContext context)
+    {
+        Dependencies = context.GetService<ExecutionStrategyDependencies>();
+    }
+
     private ExecutionStrategyDependencies Dependencies { get; }
 
     /// <summary>