Skip to content

Use interpolated strings 9 #18993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 4 commits into from
Jan 20, 2023
Merged

Use interpolated strings 9 #18993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bb6d80
7 files
CarloToso Jan 19, 2023
350a178
AppendFormat -> Append
CarloToso Jan 20, 2023
0aed511
Merge branch 'master' into Use-interpolated-strings-split-7
CarloToso Jan 20, 2023
94a0e59
update
CarloToso Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 12 additions & 12 deletions src/System.Management.Automation/DscSupport/CimDSCParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
{
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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(']');
Expand Down Expand Up @@ -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())
{
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down