Use interpolated strings 9 (PowerShell#18993)

CarloToso · web-flow · commit 64d82f812d8b · 2023-01-20T15:26:43.000+05:00
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
@@ -524,7 +524,7 @@ private static string GetRunDirectory(
             DateTime runStart)
         {
             string directoryPath = GetJobRunOutputDirectory(definitionName);
-            return string.reate(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");
+            return string.Create(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -2339,7 +2339,7 @@ internal static string MapTypeNameToMofType(ITypeName typeName, string memberNam
         private static void GenerateMofForAst(TypeDefinitionAst typeAst, StringBuilder sb, List<object> embeddedInstanceTypes)
         {
             var className = typeAst.Name;
-            sb.AppendFormat(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");
+            sb.Append(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");
 
             if (typeAst.Attributes.Any(static a => a.TypeName.GetReflectionAttributeType() == typeof(DscResourceAttribute)))
             {
@@ -2912,19 +2912,19 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>
                 {
                     if (dscProperty.Key)
                     {
-                        sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}key");
+                        sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}key");
                         needComma = true;
                     }
 
                     if (dscProperty.Mandatory)
                     {
-                        sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}required");
+                        sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}required");
                         needComma = true;
                     }
 
                     if (dscProperty.NotConfigurable)
                     {
-                        sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}read");
+                        sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}read");
                         needComma = true;
                     }
 
@@ -2936,13 +2936,13 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>
                 {
                     bool valueMapComma = false;
                     StringBuilder sbValues = new(", Values{");
-                    sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");
+                    sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");
                     needComma = true;
 
                     foreach (var value in validateSet.ValidValues)
                     {
-                        sb.AppendFormat(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");
-                        sbValues.AppendFormat(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");
+                        sb.Append(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");
+                        sbValues.Append(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");
                         valueMapComma = true;
                     }
 
@@ -2961,27 +2961,27 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>
 
             if (enumNames != null)
             {
-                sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");
+                sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");
                 needComma = false;
                 foreach (var name in enumNames)
                 {
-                    sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");
+                    sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");
                     needComma = true;
                 }
 
                 sb.Append("}, Values{");
                 needComma = false;
                 foreach (var name in enumNames)
                 {
-                    sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");
+                    sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");
                     needComma = true;
                 }
 
                 sb.Append('}');
             }
             else if (embeddedInstanceType != null)
             {
-                sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}EmbeddedInstance(\"{embeddedInstanceType}\")");
+                sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}EmbeddedInstance(\"{embeddedInstanceType}\")");
             }
 
             sb.Append(']');
@@ -3047,7 +3047,7 @@ private static void GenerateMofForType(Type type, StringBuilder sb, List<object>
         {
             var className = type.Name;
             // Friendly name is required by module validator to verify resource instance against the exclusive resource name list.
-            sb.AppendFormat(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");
+            sb.Append(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");
 
             if (type.GetCustomAttributes<DscResourceAttribute>().Any())
             {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
@@ -490,12 +490,12 @@ private static void TraceHelper(ViewDefinition vd, bool isMatched)
                     sb.Append(isMatched ? "MATCH FOUND" : "NOT MATCH");
                     if (tr != null)
                     {
-                        sb.AppendFormat(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name}  TYPE: {tr.name}");
+                        sb.Append(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name}  TYPE: {tr.name}");
                     }
                     else
                     {
                         TypeGroupReference tgr = togr as TypeGroupReference;
-                        sb.AppendFormat(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name}  GROUP: {tgr.name}");
+                        sb.Append(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name}  GROUP: {tgr.name}");
                     }
 
                     ActiveTracer.WriteLine(sb.ToString());
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs b/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
@@ -249,7 +249,7 @@ private static string GetCmdletAttributes(CommonCmdletMetadata cmdletMetadata)
                     ? ("'" + CodeGeneration.EscapeSingleQuotedStringContent(cmdletMetadata.Obsolete.Message) + "'")
                     : string.Empty;
                 string newline = (attributes.Length > 0) ? Environment.NewLine : string.Empty;
-                attributes.AppendFormat(CultureInfo.InvariantCulture, $"{newline}[Obsolete({obsoleteMsg})]");
+                attributes.Append(CultureInfo.InvariantCulture, $"{newline}[Obsolete({obsoleteMsg})]");
             }
 
             return attributes.ToString();

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ private static string GetRunDirectory(`
`524`	`524`	`DateTime runStart)`
`525`	`525`	`{`
`526`	`526`	`string directoryPath = GetJobRunOutputDirectory(definitionName);`
`527`		`- return string.reate(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");`
	`527`	`+ return string.Create(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -2339,7 +2339,7 @@ internal static string MapTypeNameToMofType(ITypeName typeName, string memberNam`
`2339`	`2339`	`private static void GenerateMofForAst(TypeDefinitionAst typeAst, StringBuilder sb, List<object> embeddedInstanceTypes)`
`2340`	`2340`	`{`
`2341`	`2341`	`var className = typeAst.Name;`
`2342`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");`
	`2342`	`+ sb.Append(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");`
`2343`	`2343`
`2344`	`2344`	`if (typeAst.Attributes.Any(static a => a.TypeName.GetReflectionAttributeType() == typeof(DscResourceAttribute)))`
`2345`	`2345`	`{`
`@@ -2912,19 +2912,19 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>`
`2912`	`2912`	`{`
`2913`	`2913`	`if (dscProperty.Key)`
`2914`	`2914`	`{`
`2915`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}key");`
	`2915`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}key");`
`2916`	`2916`	`needComma = true;`
`2917`	`2917`	`}`
`2918`	`2918`
`2919`	`2919`	`if (dscProperty.Mandatory)`
`2920`	`2920`	`{`
`2921`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}required");`
	`2921`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}required");`
`2922`	`2922`	`needComma = true;`
`2923`	`2923`	`}`
`2924`	`2924`
`2925`	`2925`	`if (dscProperty.NotConfigurable)`
`2926`	`2926`	`{`
`2927`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}read");`
	`2927`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}read");`
`2928`	`2928`	`needComma = true;`
`2929`	`2929`	`}`
`2930`	`2930`
`@@ -2936,13 +2936,13 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>`
`2936`	`2936`	`{`
`2937`	`2937`	`bool valueMapComma = false;`
`2938`	`2938`	`StringBuilder sbValues = new(", Values{");`
`2939`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");`
	`2939`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");`
`2940`	`2940`	`needComma = true;`
`2941`	`2941`
`2942`	`2942`	`foreach (var value in validateSet.ValidValues)`
`2943`	`2943`	`{`
`2944`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");`
`2945`		`- sbValues.AppendFormat(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");`
	`2944`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");`
	`2945`	`+ sbValues.Append(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");`
`2946`	`2946`	`valueMapComma = true;`
`2947`	`2947`	`}`
`2948`	`2948`
`@@ -2961,27 +2961,27 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>`
`2961`	`2961`
`2962`	`2962`	`if (enumNames != null)`
`2963`	`2963`	`{`
`2964`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");`
	`2964`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");`
`2965`	`2965`	`needComma = false;`
`2966`	`2966`	`foreach (var name in enumNames)`
`2967`	`2967`	`{`
`2968`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");`
	`2968`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");`
`2969`	`2969`	`needComma = true;`
`2970`	`2970`	`}`
`2971`	`2971`
`2972`	`2972`	`sb.Append("}, Values{");`
`2973`	`2973`	`needComma = false;`
`2974`	`2974`	`foreach (var name in enumNames)`
`2975`	`2975`	`{`
`2976`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");`
	`2976`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");`
`2977`	`2977`	`needComma = true;`
`2978`	`2978`	`}`
`2979`	`2979`
`2980`	`2980`	`sb.Append('}');`
`2981`	`2981`	`}`
`2982`	`2982`	`else if (embeddedInstanceType != null)`
`2983`	`2983`	`{`
`2984`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}EmbeddedInstance(\"{embeddedInstanceType}\")");`
	`2984`	`+ sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}EmbeddedInstance(\"{embeddedInstanceType}\")");`
`2985`	`2985`	`}`
`2986`	`2986`
`2987`	`2987`	`sb.Append(']');`
`@@ -3047,7 +3047,7 @@ private static void GenerateMofForType(Type type, StringBuilder sb, List<object>`
`3047`	`3047`	`{`
`3048`	`3048`	`var className = type.Name;`
`3049`	`3049`	`// Friendly name is required by module validator to verify resource instance against the exclusive resource name list.`
`3050`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");`
	`3050`	`+ sb.Append(CultureInfo.InvariantCulture, $"[ClassVersion(\"1.0.0\"), FriendlyName(\"{className}\")]\nclass {className}");`
`3051`	`3051`
`3052`	`3052`	`if (type.GetCustomAttributes<DscResourceAttribute>().Any())`
`3053`	`3053`	`{`
Original file line number	Diff line number	Diff line change
`@@ -490,12 +490,12 @@ private static void TraceHelper(ViewDefinition vd, bool isMatched)`
`490`	`490`	`sb.Append(isMatched ? "MATCH FOUND" : "NOT MATCH");`
`491`	`491`	`if (tr != null)`
`492`	`492`	`{`
`493`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name} TYPE: {tr.name}");`
	`493`	`+ sb.Append(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name} TYPE: {tr.name}");`
`494`	`494`	`}`
`495`	`495`	`else`
`496`	`496`	`{`
`497`	`497`	`TypeGroupReference tgr = togr as TypeGroupReference;`
`498`		`- sb.AppendFormat(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name} GROUP: {tgr.name}");`
	`498`	`+ sb.Append(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name} GROUP: {tgr.name}");`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`ActiveTracer.WriteLine(sb.ToString());`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ private static string GetCmdletAttributes(CommonCmdletMetadata cmdletMetadata)`
`249`	`249`	`? ("'" + CodeGeneration.EscapeSingleQuotedStringContent(cmdletMetadata.Obsolete.Message) + "'")`
`250`	`250`	`: string.Empty;`
`251`	`251`	`string newline = (attributes.Length > 0) ? Environment.NewLine : string.Empty;`
`252`		`- attributes.AppendFormat(CultureInfo.InvariantCulture, $"{newline}[Obsolete({obsoleteMsg})]");`
	`252`	`+ attributes.Append(CultureInfo.InvariantCulture, $"{newline}[Obsolete({obsoleteMsg})]");`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`return attributes.ToString();`