Skip to content
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.

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

Use interpolated strings 2 #18978

Merged
merged 13 commits into from
Jan 20, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ protected override void ProcessRecord()
break;

default:
Debug.Fail(string.Format(CultureInfo.InvariantCulture, "Invalid parameter set name: {0}", ParameterSetName));
Debug.Fail(string.Create(CultureInfo.InvariantCulture, $"Invalid parameter set name: {ParameterSetName}"));
break;
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ protected override void ProcessRecord()
break;

default:
WriteDebug(string.Format(CultureInfo.InvariantCulture, "Invalid parameter set name: {0}", ParameterSetName));
WriteDebug(string.Create(CultureInfo.InvariantCulture, $"Invalid parameter set name: {ParameterSetName}"));
break;
}
}
Expand Down Expand Up @@ -492,7 +492,7 @@ private void ProcessGetProvider()
foreach (string log in _providersByLogMap.Keys)
{
logQuery = new EventLogQuery(log, PathType.LogName, AddProviderPredicatesToFilter(_providersByLogMap[log]));
WriteVerbose(string.Format(CultureInfo.InvariantCulture, "Log {0} will be queried", log));
WriteVerbose(string.Create(CultureInfo.InvariantCulture, $"Log {log} will be queried"));
}
}

Expand Down Expand Up @@ -680,7 +680,7 @@ private void ProcessFile()
foreach (string resolvedPath in resolvedPaths)
{
_resolvedPaths.Add(resolvedPath);
WriteVerbose(string.Format(CultureInfo.InvariantCulture, "Found file {0}", resolvedPath));
WriteVerbose(string.Create(CultureInfo.InvariantCulture, $"Found file {resolvedPath}"));
}
}

Expand Down Expand Up @@ -908,7 +908,7 @@ private string BuildStructuredQuery(EventLogSession eventLogSession)
break;

default:
WriteDebug(string.Format(CultureInfo.InvariantCulture, "Invalid parameter set name: {0}", ParameterSetName));
WriteDebug(string.Create(CultureInfo.InvariantCulture, $"Invalid parameter set name: {ParameterSetName}"));
break;
}

Expand Down Expand Up @@ -2047,7 +2047,7 @@ private void FindProvidersByLogForWildcardPatterns(EventLogSession eventLogSessi
||
(wildProvPattern.IsMatch(provName)))
{
WriteVerbose(string.Format(CultureInfo.InvariantCulture, "Found matching provider: {0}", provName));
WriteVerbose(string.Create(CultureInfo.InvariantCulture, $"Found matching provider: {provName}"));
AddLogsForProviderToInternalMap(eventLogSession, provName);
bMatched = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ protected override void EndProcessing()
break;

default:
Debug.Assert(false, string.Format(CultureInfo.InvariantCulture, "Invalid parameter set name: {0}", ParameterSetName));
Debug.Assert(false, $"Invalid parameter set name: {ParameterSetName}");
break;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private static string GetHalVersion(CimSession session, string systemDirectory)
try
{
var halPath = CIMHelper.EscapePath(System.IO.Path.Combine(systemDirectory, "hal.dll"));
var query = string.Format("SELECT * FROM CIM_DataFile Where Name='{0}'", halPath);
var query = string.Create(CultureInfo.InvariantCulture, $"SELECT * FROM CIM_DataFile Where Name='{halPath}'");
var instance = session.QueryFirstInstance(query);

if (instance != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ protected override void ProcessRecord()
break;

default:
Dbg.Diagnostics.Assert(false, string.Format(System.Globalization.CultureInfo.InvariantCulture, "One of the predefined parameter sets should have been specified, instead we got: {0}", ParameterSetName));
Dbg.Diagnostics.Assert(false, string.Create(System.Globalization.CultureInfo.InvariantCulture, $"One of the predefined parameter sets should have been specified, instead we got: {ParameterSetName}"));
break;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ internal static string GetTypeString(PSObject source)
temp = temp.Substring(4);
}

type = string.Format(System.Globalization.CultureInfo.InvariantCulture, "#TYPE {0}", temp);
type = string.Create(System.Globalization.CultureInfo.InvariantCulture, $"#TYPE {temp}");
}

return type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private void ProcessString(string originalString)
private static readonly Random _idGenerator = new();

private static string GetGroupLabel(Type inputType)
=> string.Format("{0} ({1}) <{2:X8}>", inputType.Name, inputType.FullName, _idGenerator.Next());
=> string.Create(System.Globalization.CultureInfo.InvariantCulture, $"{inputType.Name} ({inputType.FullName}) <{_idGenerator.Next():X8}>");

private void FlushInputBuffer()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ private static string BuildName(List<ObjectCommandPropertyValue> propValues)

foreach (object item in propertyValueItems)
{
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}, ", item.ToString());
sb.Append(CultureInfo.InvariantCulture, $"{item}, ");
}

sb = sb.Length > length ? sb.Remove(sb.Length - 2, 2) : sb;
sb.Append("}, ");
}
else
{
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}, ", propValuePropertyValue.ToString());
sb.Append(CultureInfo.InvariantCulture, $"{propValuePropertyValue}, ");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2247,13 +2247,13 @@ private string GenerateNewPSSessionOption()
RunspaceConnectionInfo runspaceConnectionInfo = _remoteRunspaceInfo.Runspace.ConnectionInfo as RunspaceConnectionInfo;
if (runspaceConnectionInfo != null)
{
result.AppendFormat(null, "-Culture '{0}' ", CodeGeneration.EscapeSingleQuotedStringContent(runspaceConnectionInfo.Culture.ToString()));
result.AppendFormat(null, "-UICulture '{0}' ", CodeGeneration.EscapeSingleQuotedStringContent(runspaceConnectionInfo.UICulture.ToString()));
result.Append(null, $"-Culture '{CodeGeneration.EscapeSingleQuotedStringContent(runspaceConnectionInfo.Culture.ToString())}' ");
iSazonov marked this conversation as resolved.
Show resolved Hide resolved
result.Append(null, $"-UICulture '{CodeGeneration.EscapeSingleQuotedStringContent(runspaceConnectionInfo.UICulture.ToString())}' ");
iSazonov marked this conversation as resolved.
Show resolved Hide resolved

result.AppendFormat(null, "-CancelTimeOut {0} ", runspaceConnectionInfo.CancelTimeout);
result.AppendFormat(null, "-IdleTimeOut {0} ", runspaceConnectionInfo.IdleTimeout);
result.AppendFormat(null, "-OpenTimeOut {0} ", runspaceConnectionInfo.OpenTimeout);
result.AppendFormat(null, "-OperationTimeOut {0} ", runspaceConnectionInfo.OperationTimeout);
result.Append(null, $"-CancelTimeOut {runspaceConnectionInfo.CancelTimeout} ");
result.Append(null, $"-IdleTimeOut {runspaceConnectionInfo.IdleTimeout} ");
result.Append(null, $"-OpenTimeOut {runspaceConnectionInfo.OpenTimeout} ");
result.Append(null, $"-OperationTimeOut {runspaceConnectionInfo.OperationTimeout} ");
}

WSManConnectionInfo wsmanConnectionInfo = _remoteRunspaceInfo.Runspace.ConnectionInfo as WSManConnectionInfo;
Expand All @@ -2275,33 +2275,18 @@ private string GenerateNewPSSessionOption()

if (wsmanConnectionInfo.MaximumReceivedDataSizePerCommand.HasValue)
{
result.AppendFormat(
CultureInfo.InvariantCulture,
"-MaximumReceivedDataSizePerCommand {0} ",
wsmanConnectionInfo.MaximumReceivedDataSizePerCommand.Value);
result.Append(CultureInfo.InvariantCulture, $"-MaximumReceivedDataSizePerCommand {wsmanConnectionInfo.MaximumReceivedDataSizePerCommand.Value} ");
}

if (wsmanConnectionInfo.MaximumReceivedObjectSize.HasValue)
{
result.AppendFormat(
CultureInfo.InvariantCulture,
"-MaximumReceivedObjectSize {0} ",
wsmanConnectionInfo.MaximumReceivedObjectSize.Value);
result.Append(CultureInfo.InvariantCulture, $"-MaximumReceivedObjectSize {wsmanConnectionInfo.MaximumReceivedObjectSize.Value} ");
}

result.AppendFormat(
CultureInfo.InvariantCulture,
"-MaximumRedirection {0} ",
wsmanConnectionInfo.MaximumConnectionRedirectionCount);
result.Append(CultureInfo.InvariantCulture, $"-MaximumRedirection {wsmanConnectionInfo.MaximumConnectionRedirectionCount} ");

result.AppendFormat(
CultureInfo.InvariantCulture,
"-ProxyAccessType {0} ",
wsmanConnectionInfo.ProxyAccessType.ToString());
result.AppendFormat(
CultureInfo.InvariantCulture,
"-ProxyAuthentication {0} ",
wsmanConnectionInfo.ProxyAuthentication.ToString());
result.Append(CultureInfo.InvariantCulture, $"-ProxyAccessType {wsmanConnectionInfo.ProxyAccessType} ");
result.Append(CultureInfo.InvariantCulture, $"-ProxyAuthentication {wsmanConnectionInfo.ProxyAuthentication} ");
result.Append(this.GenerateProxyCredentialParameter(wsmanConnectionInfo));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private set
/// <summary>
/// Gets the hexadecimal representation of the <see cref="Offset64"/> value.
/// </summary>
public string HexOffset { get => string.Format(CultureInfo.CurrentCulture, "{0:X16}", Offset64); }
public string HexOffset => string.Create(CultureInfo.CurrentCulture, $"{Offset64:X16}");

/// <summary>
/// Gets the type of the input objects used to create the <see cref="ByteCollection"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal static StringBuilder GetRawContentHeader(HttpResponseMessage response)
{
int statusCode = WebResponseHelper.GetStatusCode(response);
string statusDescription = WebResponseHelper.GetStatusDescription(response);
raw.AppendFormat("{0} {1} {2}", protocol, statusCode, statusDescription);
raw.Append($"{protocol} {statusCode} {statusDescription}");
raw.AppendLine();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ internal override void ProcessResponse(HttpResponseMessage response)
}

// NOTE: Tests use this verbose output to verify the encoding.
WriteVerbose(string.Format(System.Globalization.CultureInfo.InvariantCulture, $"Content encoding: {encodingVerboseName}"));
WriteVerbose(string.Create(System.Globalization.CultureInfo.InvariantCulture, $"Content encoding: {encodingVerboseName}"));

bool convertSuccess = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ private static string FormatDictionary(IDictionary content)
encodedValue = WebUtility.UrlEncode(value.ToString());
}

bodyBuilder.AppendFormat("{0}={1}", encodedKey, encodedValue);
bodyBuilder.Append($"{encodedKey}={encodedValue}");
}

return bodyBuilder.ToString();
Expand All @@ -768,14 +768,14 @@ private ErrorRecord GetValidationError(string msg, string errorId, params object
private string GetBasicAuthorizationHeader()
{
var password = new NetworkCredential(null, Credential.Password).Password;
string unencoded = string.Format($"{Credential.UserName}:{password}");
string unencoded = string.Create(CultureInfo.InvariantCulture, $"{Credential.UserName}:{password}");
byte[] bytes = Encoding.UTF8.GetBytes(unencoded);
return string.Format($"Basic {Convert.ToBase64String(bytes)}");
return string.Create(CultureInfo.InvariantCulture, $"Basic {Convert.ToBase64String(bytes)}");
}

private string GetBearerAuthorizationHeader()
{
return string.Format($"Bearer {new NetworkCredential(string.Empty, Token).Password}");
return string.Create(CultureInfo.InvariantCulture, $"Bearer {new NetworkCredential(string.Empty, Token).Password}");
}

private void ProcessAuthentication()
Expand All @@ -790,7 +790,7 @@ private void ProcessAuthentication()
}
else
{
Diagnostics.Assert(false, string.Format($"Unrecognized Authentication value: {Authentication}"));
Diagnostics.Assert(false, string.Create(CultureInfo.InvariantCulture, $"Unrecognized Authentication value: {Authentication}"));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ internal static class WebResponseHelper
return headers;
}

internal static string GetProtocol(HttpResponseMessage response) => string.Format(CultureInfo.InvariantCulture, $"HTTP/{response.Version}");
internal static string GetProtocol(HttpResponseMessage response) => string.Create(CultureInfo.InvariantCulture, $"HTTP/{response.Version}");

internal static int GetStatusCode(HttpResponseMessage response) => (int)response.StatusCode;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,36 @@ public static class PSUserAgent
private static string s_windowsUserAgent;

// Format the user-agent string from the various component parts
internal static string UserAgent => string.Format(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) {App}");
internal static string UserAgent => string.Create(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) {App}");

/// <summary>
/// Useragent string for InternetExplorer (9.0).
/// </summary>
public static string InternetExplorer => string.Format(CultureInfo.InvariantCulture, $"{Compatibility} (compatible; MSIE 9.0; {PlatformName}; {OS}; {Culture})");
public static string InternetExplorer => string.Create(CultureInfo.InvariantCulture, $"{Compatibility} (compatible; MSIE 9.0; {PlatformName}; {OS}; {Culture})");

/// <summary>
/// Useragent string for Firefox (4.0).
/// </summary>
public static string FireFox => string.Format(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) Gecko/20100401 Firefox/4.0");
public static string FireFox => string.Create(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) Gecko/20100401 Firefox/4.0");

/// <summary>
/// Useragent string for Chrome (7.0).
/// </summary>
public static string Chrome => string.Format(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) AppleWebKit/534.6 (KHTML, like Gecko) Chrome/7.0.500.0 Safari/534.6");
public static string Chrome => string.Create(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) AppleWebKit/534.6 (KHTML, like Gecko) Chrome/7.0.500.0 Safari/534.6");

/// <summary>
/// Useragent string for Opera (9.0).
/// </summary>
public static string Opera => string.Format(CultureInfo.InvariantCulture, $"Opera/9.70 ({PlatformName}; {OS}; {Culture}) Presto/2.2.1");
public static string Opera => string.Create(CultureInfo.InvariantCulture, $"Opera/9.70 ({PlatformName}; {OS}; {Culture}) Presto/2.2.1");

/// <summary>
/// Useragent string for Safari (5.0).
/// </summary>
public static string Safari => string.Format(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16");
public static string Safari => string.Create(CultureInfo.InvariantCulture, $"{Compatibility} ({PlatformName}; {OS}; {Culture}) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16");

internal static string Compatibility => "Mozilla/5.0";

internal static string App => string.Format(CultureInfo.InvariantCulture, $"PowerShell/{PSVersionInfo.PSVersion}");
internal static string App => string.Create(CultureInfo.InvariantCulture, $"PowerShell/{PSVersionInfo.PSVersion}");

internal static string PlatformName
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ protected override void BeginProcessing()
}
else
{
WriteObject(string.Format(CultureInfo.InvariantCulture, "<?xml version=\"1.0\" encoding=\"{0}\"?>", Encoding.UTF8.WebName));
WriteObject(string.Create(CultureInfo.InvariantCulture, $"<?xml version=\"1.0\" encoding=\"{Encoding.UTF8.WebName}\"?>"));
WriteObject("<Objects>");
}
}
Expand Down
Loading