admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use interpolated strings 9 (#18993)

Browse Source
This commit is contained in:
CarloToso
2023-01-20 15:26:43 +05:00
committed by GitHub
parent f5627538e1
commit 64d82f812d
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
+1 -1
View File
@@ -524,7 +524,7 @@ namespace Microsoft.PowerShell.ScheduledJob
DateTime runStart)
{
string directoryPath = GetJobRunOutputDirectory(definitionName);
return string.reate(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");
return string.Create(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");
}
/// <summary>
src/System.Management.Automation/DscSupport/CimDSCParser.cs
+12 -12
View File
@@ -2339,7 +2339,7 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
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 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
{
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 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
{
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,11 +2961,11 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
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;
}
@@ -2973,7 +2973,7 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
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;
}
@@ -2981,7 +2981,7 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
}
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 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
{
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())
{
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
+2 -2
View File
@@ -490,12 +490,12 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
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());
src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
+1 -1
View File
@@ -249,7 +249,7 @@ function __cmdletization_BindCommonParameters
? ("'" + 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();