Merge pull request #173 from servicetitan/upstream_StringInterpolation

Convert string.Format() to string interpolation (#44)

Author: alex-kulakov

Extensions/Xtensive.Orm.BulkOperations.Tests/Issues/IssueJira0565_IgnoringTakeMethodOnTranslation.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Xtensive LLC.
+// Copyright (C) 2015 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Alexey Kulakov
@@ -307,7 +307,7 @@ private static void IgnoreMe(string format, object argument, string reason = nul
     {
       var message = string.Format(format, argument);
       if (!string.IsNullOrEmpty(reason)) {
-        message = string.Format("{0}. Reason: {1}", message, reason);
+        message = $"{message}. Reason: {reason}";
       }
 
       throw new IgnoreException(message);

Extensions/Xtensive.Orm.BulkOperations/Internals/ExpressionVisitor.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2020 Xtensive LLC.
+// Copyright (C) 2019-2020 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -115,7 +115,7 @@ protected virtual Expression Visit(Expression exp)
         case ExpressionType.ListInit:
           return VisitListInit((ListInitExpression) exp);
         default:
-          throw new Exception(String.Format("Unhandled expression type: '{0}'", exp.NodeType));
+          throw new Exception($"Unhandled expression type: '{exp.NodeType}'");
       }
     }
 
@@ -142,7 +142,7 @@ private MemberBinding VisitBinding(MemberBinding binding)
         case MemberBindingType.ListBinding:
           return VisitMemberListBinding((MemberListBinding) binding);
         default:
-          throw new Exception(String.Format("Unhandled binding type '{0}'", binding.BindingType));
+          throw new Exception($"Unhandled binding type '{binding.BindingType}'");
       }
     }
 

Extensions/Xtensive.Orm.Security/GenericPrincipal.cs

@@ -32,7 +32,7 @@ public virtual void SetPassword(string password)
       var service = Session.Services.Get<IHashingService>(config.HashingServiceName);
 
       if (service == null)
-        throw new InvalidOperationException(string.Format("Hashing service by name {0} is not found. Check Xtensive.Security configuration", config.HashingServiceName));
+        throw new InvalidOperationException($"Hashing service by name {config.HashingServiceName} is not found. Check Xtensive.Security configuration");
 
       PasswordHash = service.ComputeHash(password);
     }

Extensions/Xtensive.Orm.Security/Services/GenericAuthenticationService.cs

@@ -53,7 +53,7 @@ protected virtual IPrincipal Authenticate(string username, string password)
       var service = Session.Services.Get<IHashingService>(config.HashingServiceName);
 
       if (service == null)
-        throw new InvalidOperationException(string.Format("Hashing service by name {0} is not found. Check Xtensive.Security configuration", config.HashingServiceName));
+        throw new InvalidOperationException($"Hashing service by name {config.HashingServiceName} is not found. Check Xtensive.Security configuration");
 
       // GenericPrincipal is not in the model, let's find its descendant
       var model = Session.Domain.Model;

Extensions/Xtensive.Orm.Tracking.Tests/Model/MyStructure.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -18,7 +18,7 @@ public MyStructure() : base() { }
     public MyStructure(Session session) : base(session) {}
     public override string ToString()
     {
-      return string.Format("MyEntityStructure: Z={0}, SubStructure=({1})", Z, SubStructure);
+      return $"MyEntityStructure: Z={Z}, SubStructure=({SubStructure})";
     }
   }
 
@@ -34,7 +34,7 @@ public MyEntitySubStructure() : base() { }
     public MyEntitySubStructure(Session session) : base(session) { }
     public override string ToString()
     {
-      return string.Format("MyEntitySubStructure: X={0}, Y={1}", X, Y);
+      return $"MyEntitySubStructure: X={X}, Y={Y}";
     }
   }
 }

Orm/Xtensive.Orm.Manual/Advanced/CustomLinqCompilerTest.cs

@@ -35,17 +35,17 @@ public class Person : Entity
 
     public string FullName
     {
-      get { return string.Format("{0} {1}", FirstName, LastName); }
+      get { return $"{FirstName} {LastName}"; }
     }
 
     public string FullName2
     {
-      get { return string.Format("{0} {1}", FirstName, LastName); }
+      get { return $"{FirstName} {LastName}"; }
     }
 
     public string AddPrefix(string prefix)
     {
-      return string.Format("{0}{1}", prefix, LastName);
+      return $"{prefix}{LastName}";
     }
 
     public Person(Session session)

Orm/Xtensive.Orm.Manual/Advanced/CustomSqlCompilerTest.cs

@@ -67,7 +67,7 @@ public static char GetThirdChar(this string source)
 
     public static string BuildAddressString(string country, string city, string building)
     {
-      return string.Format("{0}, {1}-{2}", country, city, building);
+      return $"{country}, {city}-{building}";
     }
   }
 

Orm/Xtensive.Orm.Manual/Caching/CalculatedValueCachingTest.cs

@@ -37,8 +37,7 @@ public class Product : Entity
 
     public override string ToString()
     {
-      return string.Format("Product #{0}, Name={1}, Orders.Count={2}",
-        Id, Name, Orders.Count);
+      return $"Product #{Id}, Name={Name}, Orders.Count={Orders.Count}";
     }
 
     public Product(Session session)
@@ -99,8 +98,7 @@ public double TotalPriceCached {
 
     public override string ToString()
     {
-      return string.Format("Order #{0}, Product={1}, Quantity={2}",
-        Id, Product.Name, Quantity);
+      return $"Order #{Id}, Product={Product.Name}, Quantity={Quantity}";
     }
 
     public Order(Session session)

Orm/Xtensive.Orm.Manual/Concurrency/LockingTest.cs

@@ -109,7 +109,7 @@ private void TestThread(object state)
       var startTime = DateTime.UtcNow;
       var threadNumber = Interlocked.Increment(ref threadCount);
       try {
-        string threadName = string.Format("Thread {0}", threadNumber).Indent(2 + (int) (threadNumber - 1) * 5);
+        string threadName = $"Thread {threadNumber}".Indent(2 + (int) (threadNumber - 1) * 5);
         using (var session = GetDomain().OpenSession()) {
           while ((DateTime.UtcNow - startTime).TotalMilliseconds < TestTime) {
             try {

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/Connection.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2020 Xtensive LLC.
+// Copyright (C) 2011-2020 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Malisa Ncube
@@ -99,7 +99,7 @@ public override Task ReleaseSavepointAsync(string name, CancellationToken token
     private static string GetCreateSavepointCommandText(string name) => $"SAVEPOINT {name}";
 
     private static string GetRollbackToSavepointCommandText(string name) =>
-      string.Format("ROLLBACK TO SAVEPOINT {0}; RELEASE SAVEPOINT {0};", name);
+      $"ROLLBACK TO SAVEPOINT {name}; RELEASE SAVEPOINT {name};";
 
     private static string GetReleaseSavepointCommandText(string name) => $"RELEASE SAVEPOINT {name}";