Skip to content

Update additional interpolated string changes #19029

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
daxian-dbw merged 1 commit into from
Jan 25, 2023
Merged

Update additional interpolated string changes #19029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions src/Microsoft.WSMan.Management/WsManHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,13 +1066,10 @@ internal static void LoadResourceData()
{
try
{
string filepath = System.Environment.ExpandEnvironmentVariables("%Windir%") + "\\System32\\Winrm\\" +
#if CORECLR
"0409" /* TODO: don't assume it is always English on CSS? */
#else
string.Concat("0", string.Create(CultureInfo.CurrentCulture, $"{checked((uint)CultureInfo.CurrentUICulture.LCID):x2}"))
#endif
+ "\\" + "winrm.ini";
string winDir = System.Environment.ExpandEnvironmentVariables("%Windir%");
uint lcid = checked((uint)CultureInfo.CurrentUICulture.LCID);
string filepath = string.Create(CultureInfo.CurrentCulture, $@"{winDir}\System32\Winrm\0{lcid:x2}\winrm.ini");

if (File.Exists(filepath))
{
FileStream _fs = new FileStream(filepath, FileMode.Open, FileAccess.Read);
Expand Down
20 changes: 10 additions & 10 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 @@ -2907,19 +2907,19 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>
{
if (dscProperty.Key)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}key");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}key", needComma ? ", " : string.Empty);
needComma = true;
}

if (dscProperty.Mandatory)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}required");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}required", needComma ? ", " : string.Empty);
needComma = true;
}

if (dscProperty.NotConfigurable)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}read");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}read", needComma ? ", " : string.Empty);
needComma = true;
}

Expand All @@ -2931,13 +2931,13 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>
{
bool valueMapComma = false;
StringBuilder sbValues = new(", Values{");
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}ValueMap{{", needComma ? ", " : string.Empty);
needComma = true;

foreach (var value in validateSet.ValidValues)
{
sb.Append(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");
sbValues.Append(CultureInfo.InvariantCulture, $"{(valueMapComma ? ", " : string.Empty)}\"{value}\"");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}\"{1}\"", valueMapComma ? ", " : string.Empty, value);
sbValues.AppendFormat(CultureInfo.InvariantCulture, "{0}\"{1}\"", valueMapComma ? ", " : string.Empty, value);
valueMapComma = true;
}

Expand All @@ -2956,27 +2956,27 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>

if (enumNames != null)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}ValueMap{{");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}ValueMap{{", needComma ? ", " : string.Empty);
needComma = false;
foreach (var name in enumNames)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}\"{1}\"", needComma ? ", " : string.Empty, name);
needComma = true;
}

sb.Append("}, Values{");
needComma = false;
foreach (var name in enumNames)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}\"{name}\"");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}\"{1}\"", needComma ? ", " : string.Empty, name);
needComma = true;
}

sb.Append('}');
}
else if (embeddedInstanceType != null)
{
sb.Append(CultureInfo.InvariantCulture, $"{(needComma ? ", " : string.Empty)}EmbeddedInstance(\"{embeddedInstanceType}\")");
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}EmbeddedInstance(\"{1}\")", needComma ? ", " : string.Empty, embeddedInstanceType);
}

sb.Append(']');
Expand Down
14 changes: 12 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,22 @@ private static void TraceHelper(ViewDefinition vd, bool isMatched)
sb.Append(isMatched ? "MATCH FOUND" : "NOT MATCH");
if (tr != null)
{
sb.Append(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name} TYPE: {tr.name}");
sb.AppendFormat(
CultureInfo.InvariantCulture,
" {0} NAME: {1} TYPE: {2}",
ControlBase.GetControlShapeName(vd.mainControl),
vd.name,
tr.name);
}
else
{
TypeGroupReference tgr = togr as TypeGroupReference;
sb.Append(CultureInfo.InvariantCulture, $" {ControlBase.GetControlShapeName(vd.mainControl)} NAME: {vd.name} GROUP: {tgr.name}");
sb.AppendFormat(
CultureInfo.InvariantCulture,
" {0} NAME: {1} GROUP: {2}",
ControlBase.GetControlShapeName(vd.mainControl),
vd.name,
tgr.name);
}

ActiveTracer.WriteLine(sb.ToString());
Expand Down
2 changes: 1 addition & 1 deletion ...mation/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.xmlSerializer.autogen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ protected Exception CreateUnknownNodeException()

protected Exception CreateUnknownTypeException(XmlQualifiedName type)
{
return new InvalidOperationException(string.Create(CultureInfo.CurrentCulture, $"XmlUnknownType. Name: {type.Name}, Namespace {type.Namespace}, CurrentTag: {CurrentTag()}"));
return new InvalidOperationException(string.Create(CultureInfo.CurrentCulture, $"XmlUnknownType. Name: {type.Name}, Namespace: {type.Namespace}, CurrentTag: {CurrentTag()}"));
}

protected Exception CreateUnknownConstantException(string value, Type enumType)
Expand Down