Merge pull request #16857 from tamasvajk/feature/stringformat

C#: Change `string.Format` calls to interpolated strings

Author: tamasvajk

csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs

@@ -39,7 +39,7 @@ public BuildScript Analyse(IAutobuilder<CSharpAutobuildOptions> builder, bool au
 
                 if (notDotNetProject is not null)
                 {
-                    builder.Logger.Log(Severity.Info, "Not using .NET Core because of incompatible project {0}", notDotNetProject);
+                    builder.Logger.LogInfo($"Not using .NET Core because of incompatible project {notDotNetProject}");
                     return BuildScript.Failure;
                 }
 

csharp/autobuilder/Semmle.Autobuild.CSharp/Program.cs

@@ -22,12 +22,12 @@ public static int Main()
                 }
                 catch (InvalidEnvironmentException ex)
                 {
-                    Console.WriteLine("The environment is invalid: {0}", ex.Message);
+                    Console.WriteLine($"The environment is invalid: {ex.Message}");
                 }
             }
             catch (ArgumentOutOfRangeException ex)
             {
-                Console.WriteLine("The value \"{0}\" for parameter \"{1}\" is invalid", ex.ActualValue, ex.ParamName);
+                Console.WriteLine($"The value \"{ex.ActualValue}\" for parameter \"{ex.ParamName}\" is invalid");
             }
             return 1;
         }

csharp/autobuilder/Semmle.Autobuild.Cpp/Program.cs

@@ -22,12 +22,12 @@ static int Main()
                 }
                 catch (InvalidEnvironmentException ex)
                 {
-                    Console.WriteLine("The environment is invalid: {0}", ex.Message);
+                    Console.WriteLine($"The environment is invalid: {ex.Message}");
                 }
             }
             catch (ArgumentOutOfRangeException ex)
             {
-                Console.WriteLine("The value \"{0}\" for parameter \"{1}\" is invalid", ex.ActualValue, ex.ParamName);
+                Console.WriteLine($"The value \"{ex.ActualValue}\" for parameter \"{ex.ParamName}\" is invalid");
             }
             return 1;
         }

csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs

@@ -128,9 +128,9 @@ BuildScript GetNugetRestoreScript() =>
 
                 command.Argument("/t:" + target);
                 if (platform is not null)
-                    command.Argument(string.Format("/p:Platform=\"{0}\"", platform));
+                    command.Argument($"/p:Platform=\"{platform}\"");
                 if (configuration is not null)
-                    command.Argument(string.Format("/p:Configuration=\"{0}\"", configuration));
+                    command.Argument($"/p:Configuration=\"{configuration}\"");
 
                 // append the build script which invokes msbuild to the overall build script `ret`;
                 // we insert a check that building the current project or solution was successful:

csharp/autobuilder/Semmle.Autobuild.Shared/Project.cs

@@ -66,7 +66,7 @@ public Project(Autobuilder<TAutobuildOptions> builder, string path) : base(build
                     catch  // lgtm[cs/catch-of-all-exceptions]
                            // Generic catch clause - Version constructor throws about 5 different exceptions.
                     {
-                        builder.Logger.Log(Severity.Warning, "Project {0} has invalid tools version {1}", path, toolsVersion);
+                        builder.Logger.LogWarning($"Project {path} has invalid tools version {toolsVersion}");
                     }
                 }
 

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs

@@ -60,11 +60,11 @@ public string Id
             {
                 var result = Name;
                 if (Version is not null)
-                    result = string.Format("{0}, Version={1}", result, Version);
+                    result = $"{result}, Version={Version}";
                 if (Culture is not null)
-                    result = string.Format("{0}, Culture={1}", result, Culture);
+                    result = $"{result}, Culture={Culture}";
                 if (PublicKeyToken is not null)
-                    result = string.Format("{0}, PublicKeyToken={1}", result, PublicKeyToken);
+                    result = $"{result}, PublicKeyToken={PublicKeyToken}";
                 return result;
             }
         }
@@ -82,8 +82,8 @@ public IEnumerable<string> IndexStrings
                 if (Version is not null)
                 {
                     if (Culture is not null)
-                        yield return string.Format("{0}, Version={1}, Culture={2}", Name, Version, Culture);
-                    yield return string.Format("{0}, Version={1}", Name, Version);
+                        yield return $"{Name}, Version={Version}, Culture={Culture}";
+                    yield return $"{Name}, Version={Version}";
                 }
                 yield return Name;
                 yield return Name.ToLowerInvariant();

csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs

@@ -151,7 +151,7 @@ public static ExitCode Run(Options options)
             }
             catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
             {
-                fileLogger.Log(Severity.Error, "  Unhandled exception: {0}", ex);
+                fileLogger.LogError($"  Unhandled exception: {ex}");
             }
 
             logger.Log(Severity.Info, $"Extraction completed in {overallStopwatch.Elapsed}");

csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs

@@ -14,7 +14,7 @@ public override void Populate(TextWriter trapFile)
             PopulateModifiers(trapFile);
             ContainingType!.PopulateGenerics();
 
-            trapFile.destructors(this, string.Format("~{0}", Symbol.ContainingType.Name), ContainingType, OriginalDefinition(Context, this, Symbol));
+            trapFile.destructors(this, $"~{Symbol.ContainingType.Name}", ContainingType, OriginalDefinition(Context, this, Symbol));
             trapFile.destructor_location(this, Location);
         }
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs

@@ -63,7 +63,7 @@ Symbol.ContainingType is INamedTypeSymbol nt &&
         {
             if (method.MethodKind == MethodKind.ReducedExtension)
             {
-                cx.ExtractionContext.Logger.Log(Semmle.Util.Logging.Severity.Warning, "Reduced extension method symbols should not be directly extracted.");
+                cx.ExtractionContext.Logger.LogWarning("Reduced extension method symbols should not be directly extracted.");
             }
 
             return OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs

@@ -54,7 +54,7 @@ protected Analyser(
             this.addAssemblyTrapPrefix = addAssemblyTrapPrefix;
             this.progressMonitor = pm;
 
-            Logger.Log(Severity.Info, "EXTRACTION STARTING at {0}", DateTime.Now);
+            Logger.LogInfo($"EXTRACTION STARTING at {DateTime.Now}");
             stopWatch.Start();
         }
 
@@ -175,7 +175,7 @@ private void DoAnalyseReferenceAssembly(PortableExecutableReference r)
             }
             catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
             {
-                Logger.Log(Severity.Error, "  Unhandled exception analyzing {0}: {1}", r.FilePath, ex);
+                Logger.LogError($"  Unhandled exception analyzing {r.FilePath}: {ex}");
             }
         }
 
@@ -251,7 +251,7 @@ private void DoAnalyseCompilation()
             }
             catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
             {
-                Logger.Log(Severity.Error, "  Unhandled exception analyzing {0}: {1}", "compilation", ex);
+                Logger.LogError($"  Unhandled exception analyzing compilation: {ex}");
             }
         }
 
@@ -315,12 +315,12 @@ public void PerformExtraction(int numberOfThreads)
         public virtual void Dispose()
         {
             stopWatch.Stop();
-            Logger.Log(Severity.Info, "  Peak working set = {0} MB", Process.GetCurrentProcess().PeakWorkingSet64 / (1024 * 1024));
+            Logger.LogInfo($"  Peak working set = {Process.GetCurrentProcess().PeakWorkingSet64 / (1024 * 1024)} MB");
 
             if (TotalErrors > 0)
-                Logger.Log(Severity.Info, "EXTRACTION FAILED with {0} error{1} in {2}", TotalErrors, TotalErrors == 1 ? "" : "s", stopWatch.Elapsed);
+                Logger.LogInfo($"EXTRACTION FAILED with {TotalErrors} error{(TotalErrors == 1 ? "" : "s")} in {stopWatch.Elapsed}");
             else
-                Logger.Log(Severity.Info, "EXTRACTION SUCCEEDED in {0}", stopWatch.Elapsed);
+                Logger.LogInfo($"EXTRACTION SUCCEEDED in {stopWatch.Elapsed}");
 
             compilationTrapFile?.Dispose();
         }
@@ -345,9 +345,9 @@ public virtual void Dispose()
         /// </summary>
         public void LogExtractorInfo()
         {
-            Logger.Log(Severity.Info, "  Extractor: {0}", Environment.GetCommandLineArgs().First());
-            Logger.Log(Severity.Info, "  Extractor version: {0}", Version);
-            Logger.Log(Severity.Info, "  Current working directory: {0}", Directory.GetCurrentDirectory());
+            Logger.LogInfo($"  Extractor: {Environment.GetCommandLineArgs().First()}");
+            Logger.LogInfo($"  Extractor version: {Version}");
+            Logger.LogInfo($"  Current working directory: {Directory.GetCurrentDirectory()}");
         }
 
         private static string Version