Merge branch 'issue-7609-Use-curly-braces' into develop

# Conflicts:
#	src/Libraries/Nop.Data/Migrations/UpgradeTo470/AddIndexesMigration.cs

Author: skoshelev

src/Libraries/Nop.Core/Caching/DistributedCacheLocker.cs

@@ -127,10 +127,12 @@ public virtual async Task CancelTaskAsync(string key, TimeSpan expirationTime)
         var status = await _distributedCache.GetStringAsync(key);
         if (!string.IsNullOrEmpty(status) &&
             JsonConvert.DeserializeObject<TaskStatus>(status) != TaskStatus.Canceled)
+        {
             await _distributedCache.SetStringAsync(
                 key,
                 JsonConvert.SerializeObject(TaskStatus.Canceled),
                 new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = expirationTime });
+        }
     }
 
     /// <summary>

src/Libraries/Nop.Core/Caching/MemoryCacheManager.cs

@@ -246,10 +246,12 @@ public virtual async Task<object> GetAsync(CacheKey key)
     public virtual Task SetAsync<T>(CacheKey key, T data)
     {
         if (data != null && (key?.CacheTime ?? 0) > 0)
+        {
             _memoryCache.Set(
                 key.Key,
                 new Lazy<Task<T>>(() => Task.FromResult(data), true),
                 PrepareEntryOptions(key));
+        }
 
         return Task.CompletedTask;
     }

src/Libraries/Nop.Core/ComponentModel/ReaderWriteLockDisposable.cs

@@ -56,6 +56,7 @@ protected virtual void Dispose(bool disposing)
             return;
 
         if (disposing)
+        {
             switch (_readerWriteLockType)
             {
                 case ReaderWriteLockType.Read:
@@ -68,6 +69,7 @@ protected virtual void Dispose(bool disposing)
                     _rwLock.ExitUpgradeableReadLock();
                     break;
             }
+        }
 
         _disposed = true;
     }

src/Libraries/Nop.Core/Configuration/AppSettings.cs

@@ -47,10 +47,8 @@ public virtual TConfig Get<TConfig>() where TConfig : class, IConfig
     /// <param name="configurations">Configurations to update</param>
     public virtual void Update(IList<IConfig> configurations)
     {
-        foreach (var config in configurations)
-        {
+        foreach (var config in configurations) 
             _configurations[config.GetType()] = config;
-        }
     }
 
     #endregion

src/Libraries/Nop.Core/Configuration/AppSettingsHelper.cs

@@ -42,13 +42,13 @@ public static AppSettings SaveAppSettings(IList<IConfig> configurations, INopFil
         fileProvider.CreateFile(filePath);
 
         //get raw configuration parameters
-        var configuration = JsonConvert.DeserializeObject<AppSettings>(fileProvider.ReadAllText(filePath, Encoding.UTF8))
-                                ?.Configuration
-                            ?? new();
+        var configuration = JsonConvert
+                .DeserializeObject<AppSettings>(fileProvider.ReadAllText(filePath, Encoding.UTF8))
+                ?.Configuration
+            ?? new();
+
         foreach (var config in configurations)
-        {
             configuration[config.Name] = JToken.FromObject(config);
-        }
 
         //sort configurations for display by order (e.g. data configuration with 0 will be the first)
         appSettings.Configuration = configuration

src/Libraries/Nop.Core/Domain/Messages/AdditionalTokensAddedEvent.cs

@@ -16,10 +16,8 @@ public AdditionalTokensAddedEvent()
     /// <param name="additionalTokens">Additional tokens</param>
     public virtual void AddTokens(params string[] additionalTokens)
     {
-        foreach (var additionalToken in additionalTokens)
-        {
+        foreach (var additionalToken in additionalTokens) 
             AdditionalTokens.Add(additionalToken);
-        }
     }
 
     /// <summary>

src/Libraries/Nop.Core/Domain/Shipping/ShippingOptionListTypeConverter.cs

@@ -20,10 +20,8 @@ public partial class ShippingOptionListTypeConverter : TypeConverter
     /// <returns>Result</returns>
     public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
     {
-        if (sourceType == typeof(string))
-        {
+        if (sourceType == typeof(string)) 
             return true;
-        }
 
         return base.CanConvertFrom(context, sourceType);
     }

src/Libraries/Nop.Core/Domain/Shipping/ShippingOptionTypeConverter.cs

@@ -20,10 +20,8 @@ public partial class ShippingOptionTypeConverter : TypeConverter
     /// <returns>Result</returns>
     public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
     {
-        if (sourceType == typeof(string))
-        {
+        if (sourceType == typeof(string)) 
             return true;
-        }
 
         return base.CanConvertFrom(context, sourceType);
     }

src/Libraries/Nop.Core/Infrastructure/EngineContext.cs

@@ -40,10 +40,8 @@ public static IEngine Current
     {
         get
         {
-            if (Singleton<IEngine>.Instance == null)
-            {
+            if (Singleton<IEngine>.Instance == null) 
                 Create();
-            }
 
             return Singleton<IEngine>.Instance;
         }

src/Libraries/Nop.Core/Infrastructure/NopEngine.cs

@@ -197,6 +197,7 @@ public virtual object ResolveUnregistered(Type type)
     {
         Exception innerException = null;
         foreach (var constructor in type.GetConstructors())
+        {
             try
             {
                 //try to resolve constructor parameters
@@ -213,6 +214,7 @@ public virtual object ResolveUnregistered(Type type)
             {
                 innerException = ex;
             }
+        }
 
         throw new NopException("No constructor was found that had all the dependencies satisfied.", innerException);
     }