mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
Revert some of the interpolated string changes (#19018)
This commit is contained in:
@@ -199,14 +199,6 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
|
||||
{
|
||||
StackTrace trace = new();
|
||||
StackFrame frame = trace.GetFrame(depth);
|
||||
// if (withFileName)
|
||||
// {
|
||||
// return string.Create(CultureInfo.CurrentUICulture, $"{frame.GetFileName().}#{frame.GetFileLineNumber()}:{frame.GetMethod().Name}:");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return string.Create(CultureInfo.CurrentUICulture, $"{frame.GetMethod()}:");
|
||||
// }
|
||||
|
||||
return string.Create(CultureInfo.CurrentUICulture, $"{frame.GetMethod().DeclaringType.Name}::{frame.GetMethod().Name} ");
|
||||
}
|
||||
|
||||
+7
-2
@@ -121,7 +121,7 @@ namespace Microsoft.Management.UI.Internal
|
||||
patterns.Add(rule.Pattern);
|
||||
}
|
||||
|
||||
patterns.Add(string.Create(CultureInfo.InvariantCulture, $"(?<{FullTextRuleGroupName}>){ValuePattern}"));
|
||||
patterns.Add(string.Format(CultureInfo.InvariantCulture, "(?<{0}>){1}", FullTextRuleGroupName, ValuePattern));
|
||||
|
||||
return string.Join("|", patterns.ToArray());
|
||||
}
|
||||
@@ -199,7 +199,12 @@ namespace Microsoft.Management.UI.Internal
|
||||
this.UniqueId = uniqueId;
|
||||
this.selectorFilterRule = selectorFilterRule;
|
||||
this.childRule = childRule;
|
||||
this.Pattern = string.Create(CultureInfo.InvariantCulture, $"(?<{uniqueId}>){Regex.Escape(selectorFilterRule.DisplayName)}\\s*:\\s*{SearchTextParser.ValuePattern}");
|
||||
this.Pattern = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"(?<{0}>){1}\\s*:\\s*{2}",
|
||||
uniqueId,
|
||||
Regex.Escape(selectorFilterRule.DisplayName),
|
||||
SearchTextParser.ValuePattern);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
+1
-1
@@ -296,7 +296,7 @@ namespace Microsoft.PowerShell.Commands
|
||||
private static readonly Random _idGenerator = new();
|
||||
|
||||
private static string GetGroupLabel(Type inputType)
|
||||
=> string.Create(System.Globalization.CultureInfo.InvariantCulture, $"{inputType.Name} ({inputType.FullName}) <{_idGenerator.Next():X8}>");
|
||||
=> string.Format("{0} ({1}) <{2:X8}>", inputType.Name, inputType.FullName, _idGenerator.Next());
|
||||
|
||||
private void FlushInputBuffer()
|
||||
{
|
||||
|
||||
+2
-1
@@ -2594,7 +2594,8 @@ function Get-PSImplicitRemotingSession
|
||||
}
|
||||
else
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"-connectionUri '{CodeGeneration.EscapeSingleQuotedStringContent(GetConnectionString())}'");
|
||||
string connectionString = CodeGeneration.EscapeSingleQuotedStringContent(GetConnectionString());
|
||||
return string.Create(CultureInfo.InvariantCulture, $"-connectionUri '{connectionString}'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -200,7 +200,10 @@ namespace Microsoft.WSMan.Management
|
||||
return;
|
||||
}
|
||||
|
||||
string inputXml = string.Create(CultureInfo.InvariantCulture, $@"<cfg:Auth xmlns:cfg=""{helper.Service_CredSSP_XMLNmsp}""><cfg:CredSSP>false</cfg:CredSSP></cfg:Auth>");
|
||||
string inputXml = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
@"<cfg:Auth xmlns:cfg=""{0}""><cfg:CredSSP>false</cfg:CredSSP></cfg:Auth>",
|
||||
helper.Service_CredSSP_XMLNmsp);
|
||||
|
||||
m_SessionObj.Put(helper.Service_CredSSP_Uri, inputXml, 0);
|
||||
}
|
||||
@@ -591,8 +594,11 @@ namespace Microsoft.WSMan.Management
|
||||
try
|
||||
{
|
||||
XmlDocument xmldoc = new XmlDocument();
|
||||
string newxmlcontent = string.Create(CultureInfo.InvariantCulture, $@"<cfg:Auth xmlns:cfg=""{helper.Service_CredSSP_XMLNmsp}""><cfg:CredSSP>true</cfg:CredSSP></cfg:Auth>");
|
||||
|
||||
string newxmlcontent = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
@"<cfg:Auth xmlns:cfg=""{0}""><cfg:CredSSP>true</cfg:CredSSP></cfg:Auth>",
|
||||
helper.Service_CredSSP_XMLNmsp);
|
||||
|
||||
// push the xml string with credssp enabled
|
||||
xmldoc.LoadXml(m_SessionObj.Put(helper.Service_CredSSP_Uri, newxmlcontent, 0));
|
||||
WriteObject(xmldoc.FirstChild);
|
||||
|
||||
@@ -2532,9 +2532,12 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
|
||||
out embeddedInstanceType, embeddedInstanceTypes, ref enumNames);
|
||||
}
|
||||
|
||||
string mofAttr = MapAttributesToMof(enumNames, attributes, embeddedInstanceType);
|
||||
string arrayAffix = isArrayType ? "[]" : string.Empty;
|
||||
|
||||
sb.Append(CultureInfo.InvariantCulture, $" {MapAttributesToMof(enumNames, attributes, embeddedInstanceType)}{mofType} {member.Name}{arrayAffix};\n");
|
||||
sb.Append(
|
||||
CultureInfo.InvariantCulture,
|
||||
$" {mofAttr}{mofType} {member.Name}{arrayAffix};\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3082,16 +3085,21 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
|
||||
}
|
||||
|
||||
// TODO - validate type and name
|
||||
bool isArrayType;
|
||||
string embeddedInstanceType;
|
||||
string mofType = MapTypeToMofType(memberType, member.Name, className, out isArrayType, out embeddedInstanceType,
|
||||
string mofType = MapTypeToMofType(
|
||||
memberType,
|
||||
member.Name,
|
||||
className,
|
||||
out bool isArrayType,
|
||||
out string embeddedInstanceType,
|
||||
embeddedInstanceTypes);
|
||||
|
||||
var enumNames = memberType.IsEnum ? Enum.GetNames(memberType) : null;
|
||||
string mofAttr = MapAttributesToMof(enumNames, member.GetCustomAttributes(true), embeddedInstanceType);
|
||||
string arrayAffix = isArrayType ? "[]" : string.Empty;
|
||||
|
||||
var enumNames = memberType.IsEnum
|
||||
? Enum.GetNames(memberType)
|
||||
: null;
|
||||
sb.Append(CultureInfo.InvariantCulture, $" {MapAttributesToMof(enumNames, member.GetCustomAttributes(true), embeddedInstanceType)}{mofType} {member.Name}{arrayAffix};\n");
|
||||
sb.Append(
|
||||
CultureInfo.InvariantCulture,
|
||||
$" {mofAttr}{mofType} {member.Name}{arrayAffix};\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+7
-1
@@ -436,7 +436,13 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
|
||||
ViewDefinition view = LoadViewFromObjectModel(typeDefinition.TypeNames, formatView, viewIndex++);
|
||||
if (view != null)
|
||||
{
|
||||
ReportTrace(string.Create(CultureInfo.InvariantCulture, $"{ControlBase.GetControlShapeName(view.mainControl)} view {view.name} is loaded from the 'FormatViewDefinition' at index {viewIndex - 1} in 'ExtendedTypeDefinition' with type name {typeDefinition.TypeName}"));
|
||||
ReportTrace(string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0} view {1} is loaded from the 'FormatViewDefinition' at index {2} in 'ExtendedTypeDefinition' with type name {3}",
|
||||
ControlBase.GetControlShapeName(view.mainControl),
|
||||
view.name,
|
||||
viewIndex - 1,
|
||||
typeDefinition.TypeName));
|
||||
|
||||
// we are fine, add the view to the list
|
||||
db.viewDefinitionsSection.viewDefinitionList.Add(view);
|
||||
|
||||
+6
-1
@@ -27,7 +27,12 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
|
||||
ViewDefinition view = LoadView(n, index++);
|
||||
if (view != null)
|
||||
{
|
||||
ReportTrace(string.Create(CultureInfo.InvariantCulture, $"{ControlBase.GetControlShapeName(view.mainControl)} view {view.name} is loaded from file {view.loadingInfo.filePath}"));
|
||||
ReportTrace(string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0} view {1} is loaded from file {2}",
|
||||
ControlBase.GetControlShapeName(view.mainControl),
|
||||
view.name,
|
||||
view.loadingInfo.filePath));
|
||||
// we are fine, add the view to the list
|
||||
db.viewDefinitionsSection.viewDefinitionList.Add(view);
|
||||
}
|
||||
|
||||
@@ -1009,6 +1009,7 @@ clean
|
||||
commandOrigin = string.Empty;
|
||||
}
|
||||
|
||||
string wrappedCommand = CodeGeneration.EscapeSingleQuotedStringContent(_wrappedCommand);
|
||||
if (_wrappedAnyCmdlet)
|
||||
{
|
||||
result = string.Create(CultureInfo.InvariantCulture, $@"
|
||||
@@ -1019,7 +1020,7 @@ clean
|
||||
$PSBoundParameters['OutBuffer'] = 1
|
||||
}}
|
||||
|
||||
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand('{CodeGeneration.EscapeSingleQuotedStringContent(_wrappedCommand)}', [System.Management.Automation.CommandTypes]::{_wrappedCommandType})
|
||||
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand('{wrappedCommand}', [System.Management.Automation.CommandTypes]::{_wrappedCommandType})
|
||||
$scriptCmd = {{& $wrappedCmd @PSBoundParameters }}
|
||||
|
||||
$steppablePipeline = $scriptCmd.GetSteppablePipeline({commandOrigin})
|
||||
@@ -1033,7 +1034,7 @@ clean
|
||||
{
|
||||
result = string.Create(CultureInfo.InvariantCulture, $@"
|
||||
try {{
|
||||
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand('{CodeGeneration.EscapeSingleQuotedStringContent(_wrappedCommand)}', [System.Management.Automation.CommandTypes]::{_wrappedCommandType})
|
||||
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand('{wrappedCommand}', [System.Management.Automation.CommandTypes]::{_wrappedCommandType})
|
||||
$PSBoundParameters.Add('$args', $args)
|
||||
$scriptCmd = {{& $wrappedCmd @PSBoundParameters }}
|
||||
|
||||
@@ -1066,9 +1067,10 @@ clean
|
||||
|
||||
internal string GetDynamicParamBlock()
|
||||
{
|
||||
string wrappedCommand = CodeGeneration.EscapeSingleQuotedStringContent(_wrappedCommand);
|
||||
return string.Create(CultureInfo.InvariantCulture, $@"
|
||||
try {{
|
||||
$targetCmd = $ExecutionContext.InvokeCommand.GetCommand('{CodeGeneration.EscapeSingleQuotedStringContent(_wrappedCommand)}', [System.Management.Automation.CommandTypes]::{_wrappedCommandType}, $PSBoundParameters)
|
||||
$targetCmd = $ExecutionContext.InvokeCommand.GetCommand('{wrappedCommand}', [System.Management.Automation.CommandTypes]::{_wrappedCommandType}, $PSBoundParameters)
|
||||
$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
|
||||
if ($dynamicParams.Length -gt 0)
|
||||
{{
|
||||
|
||||
@@ -614,7 +614,12 @@ namespace Microsoft.PowerShell.Commands
|
||||
switch (command)
|
||||
{
|
||||
case ExternalScriptInfo externalScript:
|
||||
replacedSyntax = string.Create(CultureInfo.InvariantCulture, $"{aliasName} (alias) -> {externalScript.Path}{Environment.NewLine}{Environment.NewLine}{command.Syntax.Replace(command.Name, aliasName)}");
|
||||
replacedSyntax = string.Format(
|
||||
"{0} (alias) -> {1}{2}{3}",
|
||||
aliasName,
|
||||
string.Format("{0}{1}", externalScript.Path, Environment.NewLine),
|
||||
Environment.NewLine,
|
||||
command.Syntax.Replace(command.Name, aliasName));
|
||||
break;
|
||||
case ApplicationInfo app:
|
||||
replacedSyntax = app.Path;
|
||||
@@ -626,7 +631,12 @@ namespace Microsoft.PowerShell.Commands
|
||||
}
|
||||
else
|
||||
{
|
||||
replacedSyntax = string.Create(CultureInfo.InvariantCulture, $"{aliasName} (alias) -> {command.Name}{Environment.NewLine}{command.Syntax.Replace(command.Name, aliasName)}");
|
||||
replacedSyntax = string.Format(
|
||||
"{0} (alias) -> {1}{2}{3}",
|
||||
aliasName,
|
||||
command.Name,
|
||||
Environment.NewLine,
|
||||
command.Syntax.Replace(command.Name, aliasName));
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
@@ -577,7 +577,11 @@ namespace System.Management.Automation
|
||||
try
|
||||
{
|
||||
string cimType = (string)pData.Qualifiers["cimtype"].Value;
|
||||
result = string.Create(CultureInfo.InvariantCulture, $"{typeof(ManagementObject).FullName}#{cimType.Replace("object:", string.Empty)}");
|
||||
result = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}#{1}",
|
||||
typeof(ManagementObject).FullName,
|
||||
cimType.Replace("object:", string.Empty));
|
||||
}
|
||||
catch (ManagementException)
|
||||
{
|
||||
|
||||
@@ -238,14 +238,7 @@ namespace System.Management.Automation
|
||||
|
||||
if (parameter.ParameterType == typeof(SwitchParameter))
|
||||
{
|
||||
if (parameter.IsMandatory)
|
||||
{
|
||||
result.Append($"-{parameter.Name}");
|
||||
}
|
||||
else
|
||||
{
|
||||
result.Append($"[-{parameter.Name}]");
|
||||
}
|
||||
result.AppendFormat(CultureInfo.InvariantCulture, parameter.IsMandatory ? "-{0}" : "[-{0}]", parameter.Name);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -253,25 +246,19 @@ namespace System.Management.Automation
|
||||
|
||||
if (parameter.IsMandatory)
|
||||
{
|
||||
if (parameter.Position != int.MinValue)
|
||||
{
|
||||
result.Append($"[-{parameter.Name}] <{parameterTypeString}>");
|
||||
}
|
||||
else
|
||||
{
|
||||
result.Append($"-{parameter.Name} <{parameterTypeString}>");
|
||||
}
|
||||
result.AppendFormat(
|
||||
CultureInfo.InvariantCulture,
|
||||
parameter.Position != int.MinValue ? "[-{0}] <{1}>" : "-{0} <{1}>",
|
||||
parameter.Name,
|
||||
parameterTypeString);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (parameter.Position != int.MinValue)
|
||||
{
|
||||
result.Append($"[[-{parameter.Name}] <{parameterTypeString}>]");
|
||||
}
|
||||
else
|
||||
{
|
||||
result.Append($"[-{parameter.Name} <{parameterTypeString}>]");
|
||||
}
|
||||
result.AppendFormat(
|
||||
CultureInfo.InvariantCulture,
|
||||
parameter.Position != int.MinValue ? "[[-{0}] <{1}>]" : "[-{0} <{1}>]",
|
||||
parameter.Name,
|
||||
parameterTypeString);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5301,10 +5301,9 @@ namespace System.Management.Automation
|
||||
for (int lineNumber = start; lineNumber <= _lines.Length && lineNumber < start + count; lineNumber++)
|
||||
{
|
||||
WriteLine(
|
||||
lineNumber == invocationInfo.ScriptLineNumber ?
|
||||
string.Create(CultureInfo.CurrentCulture, $"{lineNumber,5}:* { _lines[lineNumber - 1]}")
|
||||
:
|
||||
string.Create(CultureInfo.CurrentCulture, $"{lineNumber,5}: { _lines[lineNumber - 1]}"),
|
||||
lineNumber == invocationInfo.ScriptLineNumber
|
||||
? string.Format(CultureInfo.CurrentCulture, "{0,5}:* {1}", lineNumber, _lines[lineNumber - 1])
|
||||
: string.Format(CultureInfo.CurrentCulture, "{0,5}: {1}", lineNumber, _lines[lineNumber - 1]),
|
||||
host,
|
||||
output);
|
||||
|
||||
|
||||
@@ -639,10 +639,19 @@ namespace System.Management.Automation
|
||||
!string.IsNullOrEmpty(sshConnectionInfo.UserName) &&
|
||||
!System.Environment.UserName.Equals(sshConnectionInfo.UserName, StringComparison.Ordinal))
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"[{sshConnectionInfo.UserName}@{sshConnectionInfo.ComputerName}]: {basePrompt}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"[{0}@{1}]: {2}",
|
||||
sshConnectionInfo.UserName,
|
||||
sshConnectionInfo.ComputerName,
|
||||
basePrompt);
|
||||
}
|
||||
|
||||
return string.Create(CultureInfo.InvariantCulture, $"[{runspace.ConnectionInfo.ComputerName}]: {basePrompt}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"[{0}]: {1}",
|
||||
runspace.ConnectionInfo.ComputerName,
|
||||
basePrompt);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace System.Management.Automation.Interpreter
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"->{Index} C({ContinuationStackDepth}) S({StackDepth})");
|
||||
return string.Format(CultureInfo.InvariantCulture, "->{0} C({1}) S({2})", Index, ContinuationStackDepth, StackDepth);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -92,7 +92,14 @@ namespace System.Management.Automation.Interpreter
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{(IsFault ? "fault" : "catch(" + ExceptionType.Name + ")")} [{StartIndex}-{EndIndex}] [{HandlerStartIndex}->{HandlerEndIndex}]");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0} [{1}-{2}] [{3}->{4}]",
|
||||
IsFault ? "fault" : "catch(" + ExceptionType.Name + ")",
|
||||
StartIndex,
|
||||
EndIndex,
|
||||
HandlerStartIndex,
|
||||
HandlerEndIndex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -227,11 +234,11 @@ namespace System.Management.Automation.Interpreter
|
||||
{
|
||||
if (IsClear)
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{Index}: clear");
|
||||
return string.Format(CultureInfo.InvariantCulture, "{0}: clear", Index);
|
||||
}
|
||||
else
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{Index}: [{StartLine}-{EndLine}] '{FileName}'");
|
||||
return string.Format(CultureInfo.InvariantCulture, "{0}: [{1}-{2}] '{3}'", Index, StartLine, EndLine, FileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace System.Management.Automation.Interpreter
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{Index}: {(IsBoxed ? "boxed" : null)} {(InClosure ? "in closure" : null)}");
|
||||
return string.Format(CultureInfo.InvariantCulture, "{0}: {1} {2}", Index, IsBoxed ? "boxed" : null, InClosure ? "in closure" : null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace System.Management.Automation.Interpreter
|
||||
|
||||
public override string ToDebugString(int instructionIndex, object cookie, Func<int, int> labelIndexer, IList<object> objects)
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"LoadCached({_index}: {objects[(int)_index]})");
|
||||
return string.Format(CultureInfo.InvariantCulture, "LoadCached({0}: {1})", _index, objects[(int)_index]);
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
|
||||
@@ -447,7 +447,12 @@ namespace System.Management.Automation.Language {
|
||||
|
||||
protected override Expression VisitLambda<T>(Expression<T> node) {
|
||||
Out(
|
||||
string.Create(CultureInfo.CurrentCulture, $".Lambda {GetLambdaName(node)}<{node.Type}>")
|
||||
string.Format(CultureInfo.CurrentCulture,
|
||||
"{0} {1}<{2}>",
|
||||
".Lambda",
|
||||
GetLambdaName(node),
|
||||
node.Type.ToString()
|
||||
)
|
||||
);
|
||||
|
||||
if (_lambdas == null) {
|
||||
|
||||
@@ -8044,7 +8044,7 @@ namespace System.Management.Automation.Language
|
||||
}
|
||||
}
|
||||
|
||||
Diagnostics.Assert(msgCorrespondsToString, string.Create(CultureInfo.InvariantCulture, $"Parser error ID \"{errorId}\" must correspond to the error message \"{errorMsg}\""));
|
||||
Diagnostics.Assert(msgCorrespondsToString, $"Parser error ID \"{errorId}\" must correspond to the error message \"{errorMsg}\"");
|
||||
}
|
||||
|
||||
private static object[] arrayOfOneArg
|
||||
|
||||
@@ -766,7 +766,9 @@ namespace System.Management.Automation.Language
|
||||
_endPosition.ColumnNumber - _startPosition.ColumnNumber);
|
||||
}
|
||||
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{_startPosition.Line.AsSpan(_startPosition.ColumnNumber)}...{ _endPosition.Line.AsSpan(0, _endPosition.ColumnNumber)}");
|
||||
var start = _startPosition.Line.AsSpan(_startPosition.ColumnNumber);
|
||||
var end = _endPosition.Line.AsSpan(0, _endPosition.ColumnNumber);
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{start}...{end}");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -1290,7 +1290,14 @@ namespace System.Management.Automation.Language
|
||||
|
||||
internal override string ToDebugString(int indent)
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{StringUtil.Padding(indent)}{Kind}: <{Text}> Value:<{_value}> Type:<{_value.GetType().Name}>");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}{1}: <{2}> Value:<{3}> Type:<{4}>",
|
||||
StringUtil.Padding(indent),
|
||||
Kind,
|
||||
Text,
|
||||
_value,
|
||||
_value.GetType().Name);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1331,7 +1338,13 @@ namespace System.Management.Automation.Language
|
||||
|
||||
internal override string ToDebugString(int indent)
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{StringUtil.Padding(indent)}{Kind}: <-{_parameterName}{(_usedColon ? ":" : string.Empty)}>");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}{1}: <-{2}{3}>",
|
||||
StringUtil.Padding(indent),
|
||||
Kind,
|
||||
_parameterName,
|
||||
_usedColon ? ":" : string.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1358,7 +1371,13 @@ namespace System.Management.Automation.Language
|
||||
|
||||
internal override string ToDebugString(int indent)
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{StringUtil.Padding(indent)}{Kind}: <{Text}> Name:<{Name}>");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}{1}: <{2}> Name:<{3}>",
|
||||
StringUtil.Padding(indent),
|
||||
Kind,
|
||||
Text,
|
||||
Name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1380,7 +1399,13 @@ namespace System.Management.Automation.Language
|
||||
|
||||
internal override string ToDebugString(int indent)
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{StringUtil.Padding(indent)}{Kind}: <{Text}> Value:<{Value}>");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}{1}: <{2}> Value:<{3}>",
|
||||
StringUtil.Padding(indent),
|
||||
Kind,
|
||||
Text,
|
||||
Value);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -363,8 +363,12 @@ namespace System.Management.Automation.Remoting
|
||||
if (!shouldProcess)
|
||||
{
|
||||
// we dont support this stream..so ignore the data
|
||||
Dbg.Assert(false,
|
||||
string.Create(CultureInfo.InvariantCulture, $"Data should be from one of the streams : {WSManNativeApi.WSMAN_STREAM_ID_STDIN} or {WSManNativeApi.WSMAN_STREAM_ID_STDOUT} or {WSManNativeApi.WSMAN_STREAM_ID_PROMPTRESPONSE}"));
|
||||
Dbg.Assert(false, string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"Data should be from one of the streams : {0} or {1} or {2}",
|
||||
WSManNativeApi.WSMAN_STREAM_ID_STDIN,
|
||||
WSManNativeApi.WSMAN_STREAM_ID_STDOUT,
|
||||
WSManNativeApi.WSMAN_STREAM_ID_PROMPTRESPONSE));
|
||||
s_baseTracer.WriteLine("{0} is not a valid stream", stream);
|
||||
}
|
||||
// process data
|
||||
|
||||
+15
-2
@@ -75,7 +75,15 @@ namespace System.Management.Automation.Remoting
|
||||
|
||||
internal static string CreateDataPacket(byte[] data, DataPriorityType streamType, Guid psGuid)
|
||||
{
|
||||
string result = string.Create(CultureInfo.InvariantCulture, $"<{PS_OUT_OF_PROC_DATA_TAG} {PS_OUT_OF_PROC_STREAM_ATTRIBUTE}='{streamType}' {PS_OUT_OF_PROC_PSGUID_ATTRIBUTE}='{psGuid}'>{Convert.ToBase64String(data)}</{PS_OUT_OF_PROC_DATA_TAG}>");
|
||||
string result = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"<{0} {1}='{2}' {3}='{4}'>{5}</{0}>",
|
||||
PS_OUT_OF_PROC_DATA_TAG,
|
||||
PS_OUT_OF_PROC_STREAM_ATTRIBUTE,
|
||||
streamType.ToString(),
|
||||
PS_OUT_OF_PROC_PSGUID_ATTRIBUTE,
|
||||
psGuid.ToString(),
|
||||
Convert.ToBase64String(data));
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -124,7 +132,12 @@ namespace System.Management.Automation.Remoting
|
||||
/// <returns></returns>
|
||||
private static string CreatePSGuidPacket(string element, Guid psGuid)
|
||||
{
|
||||
string result = string.Create(CultureInfo.InvariantCulture, $"<{element} {PS_OUT_OF_PROC_PSGUID_ATTRIBUTE}='{psGuid}' />");
|
||||
string result = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"<{0} {1}='{2}' />",
|
||||
element,
|
||||
PS_OUT_OF_PROC_PSGUID_ATTRIBUTE,
|
||||
psGuid.ToString());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -468,7 +468,12 @@ namespace System.Management.Automation.Remoting
|
||||
_remoteSession.ExecuteConnect(inputData, out outputData);
|
||||
|
||||
// construct Xml to send back
|
||||
string responseData = string.Create(System.Globalization.CultureInfo.InvariantCulture, $"<{WSManNativeApi.PS_CONNECTRESPONSE_XML_TAG} xmlns=\"{WSManNativeApi.PS_XML_NAMESPACE}\">{Convert.ToBase64String(outputData)}</{WSManNativeApi.PS_CONNECTRESPONSE_XML_TAG}>");
|
||||
string responseData = string.Format(
|
||||
System.Globalization.CultureInfo.InvariantCulture,
|
||||
"<{0} xmlns=\"{1}\">{2}</{0}>",
|
||||
WSManNativeApi.PS_CONNECTRESPONSE_XML_TAG,
|
||||
WSManNativeApi.PS_XML_NAMESPACE,
|
||||
Convert.ToBase64String(outputData));
|
||||
|
||||
// TODO: currently using OperationComplete to report back the responseXml. This will need to change to use WSManReportObject
|
||||
// that is currently internal.
|
||||
|
||||
@@ -925,7 +925,12 @@ namespace System.Management.Automation.Remoting.Client
|
||||
{
|
||||
// WSMan expects the data to be in XML format (which is text + xml tags)
|
||||
// so convert byte[] into base64 encoded format
|
||||
string base64EncodedDataInXml = string.Create(CultureInfo.InvariantCulture, $"<{WSManNativeApi.PS_CONNECT_XML_TAG} xmlns=\"{WSManNativeApi.PS_XML_NAMESPACE}\">{Convert.ToBase64String(additionalData)}</{WSManNativeApi.PS_CONNECT_XML_TAG}>");
|
||||
string base64EncodedDataInXml = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"<{0} xmlns=\"{1}\">{2}</{0}>",
|
||||
WSManNativeApi.PS_CONNECT_XML_TAG,
|
||||
WSManNativeApi.PS_XML_NAMESPACE,
|
||||
Convert.ToBase64String(additionalData));
|
||||
_openContent = new WSManNativeApi.WSManData_ManToUn(base64EncodedDataInXml);
|
||||
}
|
||||
|
||||
@@ -1093,7 +1098,12 @@ namespace System.Management.Automation.Remoting.Client
|
||||
{
|
||||
// WSMan expects the data to be in XML format (which is text + xml tags)
|
||||
// so convert byte[] into base64 encoded format
|
||||
string base64EncodedDataInXml = string.Create(CultureInfo.InvariantCulture, $"<{WSManNativeApi.PS_CREATION_XML_TAG} xmlns=\"{WSManNativeApi.PS_XML_NAMESPACE}\">{Convert.ToBase64String(additionalData)}</{WSManNativeApi.PS_CREATION_XML_TAG}>");
|
||||
string base64EncodedDataInXml = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"<{0} xmlns=\"{1}\">{2}</{0}>",
|
||||
WSManNativeApi.PS_CREATION_XML_TAG,
|
||||
WSManNativeApi.PS_XML_NAMESPACE,
|
||||
Convert.ToBase64String(additionalData));
|
||||
_openContent = new WSManNativeApi.WSManData_ManToUn(base64EncodedDataInXml);
|
||||
}
|
||||
}
|
||||
@@ -1392,17 +1402,27 @@ namespace System.Management.Automation.Remoting.Client
|
||||
if (string.IsNullOrEmpty(connectionUri.Query))
|
||||
{
|
||||
// if there is no query string already, create one..see RFC 3986
|
||||
connectionStr = string.Create(CultureInfo.InvariantCulture, $"{connectionStr.TrimEnd('/')}?PSVersion={PSVersionInfo.PSVersion}{additionalUriSuffixString}");
|
||||
connectionStr = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}?PSVersion={1}{2}",
|
||||
// Trimming the last '/' as this will allow WSMan to
|
||||
// properly apply URLPrefix.
|
||||
// Ex: http://localhost?PSVersion=2.0 will be converted
|
||||
// to http://localhost:<port>/<urlprefix>?PSVersion=2.0
|
||||
// by WSMan
|
||||
connectionStr.TrimEnd('/'),
|
||||
PSVersionInfo.PSVersion,
|
||||
additionalUriSuffixString);
|
||||
}
|
||||
else
|
||||
{
|
||||
// if there is already a query string, append using & .. see RFC 3986
|
||||
connectionStr = string.Create(CultureInfo.InvariantCulture, $"{connectionStr};PSVersion={PSVersionInfo.PSVersion}{additionalUriSuffixString}");
|
||||
connectionStr = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0};PSVersion={1}{2}",
|
||||
connectionStr,
|
||||
PSVersionInfo.PSVersion,
|
||||
additionalUriSuffixString);
|
||||
}
|
||||
|
||||
WSManNativeApi.BaseWSManAuthenticationCredentials authCredentials;
|
||||
|
||||
@@ -2239,7 +2239,12 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"PSBinaryOperationBinder {GetOperatorText()}{(_scalarCompare ? " scalarOnly" : string.Empty)} ver:{_version}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"PSBinaryOperationBinder {0}{1} ver:{2}",
|
||||
GetOperatorText(),
|
||||
_scalarCompare ? " scalarOnly" : string.Empty,
|
||||
_version);
|
||||
}
|
||||
|
||||
internal static void InvalidateCache()
|
||||
@@ -3790,7 +3795,11 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"PSConvertBinder [{Microsoft.PowerShell.ToStringCodeMethods.Type(this.Type, true)}] ver:{_version}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"PSConvertBinder [{0}] ver:{1}",
|
||||
Microsoft.PowerShell.ToStringCodeMethods.Type(this.Type, true),
|
||||
_version);
|
||||
}
|
||||
|
||||
internal static void InvalidateCache()
|
||||
@@ -3959,7 +3968,13 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"PSGetIndexBinder indexCount={this.CallInfo.ArgumentCount}{(_allowSlicing ? string.Empty : " slicing disallowed")}{(_constraints == null ? string.Empty : " constraints: " + _constraints)} ver:{_version}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"PSGetIndexBinder indexCount={0}{1}{2} ver:{3}",
|
||||
this.CallInfo.ArgumentCount,
|
||||
_allowSlicing ? string.Empty : " slicing disallowed",
|
||||
_constraints == null ? string.Empty : " constraints: " + _constraints,
|
||||
_version);
|
||||
}
|
||||
|
||||
internal static void InvalidateCache()
|
||||
@@ -4543,7 +4558,12 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"PSSetIndexBinder indexCnt={CallInfo.ArgumentCount}{(_constraints == null ? string.Empty : " constraints: " + _constraints)} ver:{_version}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"PSSetIndexBinder indexCnt={0}{1} ver:{2}",
|
||||
CallInfo.ArgumentCount,
|
||||
_constraints == null ? string.Empty : " constraints: " + _constraints,
|
||||
_version);
|
||||
}
|
||||
|
||||
internal static void InvalidateCache()
|
||||
@@ -5138,7 +5158,13 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"GetMember: {Name}{(_static ? " static" : string.Empty)}{(_nonEnumerating ? " nonEnumerating" : string.Empty)} ver:{_version}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"GetMember: {0}{1}{2} ver:{3}",
|
||||
Name,
|
||||
_static ? " static" : string.Empty,
|
||||
_nonEnumerating ? " nonEnumerating" : string.Empty,
|
||||
_version);
|
||||
}
|
||||
|
||||
public override DynamicMetaObject FallbackGetMember(DynamicMetaObject target, DynamicMetaObject errorSuggestion)
|
||||
@@ -5970,7 +5996,12 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"SetMember: {(_static ? "static " : string.Empty)}{Name} ver:{_getMemberBinder._version}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"SetMember: {0}{1} ver:{2}",
|
||||
_static ? "static " : string.Empty,
|
||||
Name,
|
||||
_getMemberBinder._version);
|
||||
}
|
||||
|
||||
private static Expression GetTransformedExpression(IEnumerable<ArgumentTransformationAttribute> transformationAttributes, Expression originalExpression)
|
||||
@@ -6574,7 +6605,15 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"PSInvokeMember: {(_static ? "static " : string.Empty)}{(_propertySetter ? "propset " : string.Empty)}{Name} ver:{_getMemberBinder._version} args:{CallInfo.ArgumentCount} constraints:<{(_invocationConstraints != null ? _invocationConstraints.ToString() : string.Empty)}>");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"PSInvokeMember: {0}{1}{2} ver:{3} args:{4} constraints:<{5}>",
|
||||
_static ? "static " : string.Empty,
|
||||
_propertySetter ? "propset " : string.Empty,
|
||||
Name,
|
||||
_getMemberBinder._version,
|
||||
CallInfo.ArgumentCount,
|
||||
_invocationConstraints != null ? _invocationConstraints.ToString() : string.Empty);
|
||||
}
|
||||
|
||||
public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
|
||||
@@ -7568,7 +7607,12 @@ namespace System.Management.Automation.Language
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"PSCreateInstanceBinder: ver:{_version} args:{_callInfo.ArgumentCount} constraints:<{(_constraints != null ? _constraints : string.Empty)}>");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"PSCreateInstanceBinder: ver:{0} args:{1} constraints:<{2}>",
|
||||
_version,
|
||||
_callInfo.ArgumentCount,
|
||||
_constraints != null ? _constraints.ToString() : string.Empty);
|
||||
}
|
||||
|
||||
public override DynamicMetaObject FallbackCreateInstance(DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
|
||||
|
||||
@@ -1031,7 +1031,13 @@ namespace System.Management.Automation
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Create(CultureInfo.InvariantCulture, $"{(FromStream == RedirectionStream.All ? "*" : ((int)FromStream).ToString(CultureInfo.InvariantCulture))}> {File}");
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}> {1}",
|
||||
FromStream == RedirectionStream.All
|
||||
? "*"
|
||||
: ((int)FromStream).ToString(CultureInfo.InvariantCulture),
|
||||
File);
|
||||
}
|
||||
|
||||
internal string File { get; }
|
||||
|
||||
@@ -950,13 +950,21 @@ namespace System.Management.Automation
|
||||
|
||||
// Add snapin qualified type name for this command at the top..
|
||||
// this will enable customizations of the help object.
|
||||
helpInfo.FullHelp.TypeNames.Insert(0, string.Create(CultureInfo.InvariantCulture, $"MamlCommandHelpInfo#{mshSnapInId}#{cmdletName}"));
|
||||
helpInfo.FullHelp.TypeNames.Insert(
|
||||
index: 0,
|
||||
string.Create(
|
||||
CultureInfo.InvariantCulture,
|
||||
$"MamlCommandHelpInfo#{mshSnapInId}#{cmdletName}"));
|
||||
|
||||
if (!string.IsNullOrEmpty(mshSnapInId))
|
||||
{
|
||||
key = mshSnapInId + "\\" + key;
|
||||
// Add snapin name to the typenames of this object
|
||||
helpInfo.FullHelp.TypeNames.Insert(1, string.Create(CultureInfo.InvariantCulture, $"MamlCommandHelpInfo#{mshSnapInId}"));
|
||||
helpInfo.FullHelp.TypeNames.Insert(
|
||||
index: 1,
|
||||
string.Create(
|
||||
CultureInfo.InvariantCulture,
|
||||
$"MamlCommandHelpInfo#{mshSnapInId}"));
|
||||
}
|
||||
|
||||
AddCache(key, helpInfo);
|
||||
|
||||
@@ -361,7 +361,9 @@ namespace System.Management.Automation
|
||||
|
||||
// The title is automatically generated
|
||||
XmlElement title = _doc.CreateElement("maml:title", mamlURI);
|
||||
string titleStr = string.Create(CultureInfo.InvariantCulture, $"\t\t\t\t-------------------------- {HelpDisplayStrings.ExampleUpperCase} {count++} --------------------------");
|
||||
string titleStr = string.Format(CultureInfo.InvariantCulture,
|
||||
"\t\t\t\t-------------------------- {0} {1} --------------------------",
|
||||
HelpDisplayStrings.ExampleUpperCase, count++);
|
||||
XmlText title_text = _doc.CreateTextNode(titleStr);
|
||||
example_node.AppendChild(title).AppendChild(title_text);
|
||||
|
||||
|
||||
@@ -236,12 +236,20 @@ namespace System.Management.Automation
|
||||
this.HelpSystem.TraceErrors(helpInfo.Errors);
|
||||
// Add snapin qualified type name for this command..
|
||||
// this will enable customizations of the help object.
|
||||
helpInfo.FullHelp.TypeNames.Insert(0, string.Create(CultureInfo.InvariantCulture, $"ProviderHelpInfo#{providerInfo.PSSnapInName}#{helpInfo.Name}"));
|
||||
helpInfo.FullHelp.TypeNames.Insert(
|
||||
index: 0,
|
||||
string.Create(
|
||||
CultureInfo.InvariantCulture,
|
||||
$"ProviderHelpInfo#{providerInfo.PSSnapInName}#{helpInfo.Name}"));
|
||||
|
||||
if (!string.IsNullOrEmpty(providerInfo.PSSnapInName))
|
||||
{
|
||||
helpInfo.FullHelp.Properties.Add(new PSNoteProperty("PSSnapIn", providerInfo.PSSnapIn));
|
||||
helpInfo.FullHelp.TypeNames.Insert(1, string.Create(CultureInfo.InvariantCulture, $"ProviderHelpInfo#{providerInfo.PSSnapInName}"));
|
||||
helpInfo.FullHelp.TypeNames.Insert(
|
||||
index: 1,
|
||||
string.Create(
|
||||
CultureInfo.InvariantCulture,
|
||||
$"ProviderHelpInfo#{providerInfo.PSSnapInName}"));
|
||||
}
|
||||
|
||||
AddCache(providerInfo.PSSnapInName + "\\" + helpInfo.Name, helpInfo);
|
||||
|
||||
@@ -939,7 +939,13 @@ namespace System.Management.Automation
|
||||
"Help.format.ps1xml", "HelpV3.format.ps1xml", "PowerShellCore.format.ps1xml", "PowerShellTrace.format.ps1xml",
|
||||
"Registry.format.ps1xml"});
|
||||
|
||||
string strongName = string.Create(CultureInfo.InvariantCulture, $"{s_coreSnapin.AssemblyName}, Version={assemblyVersion}, Culture={culture}, PublicKeyToken={publicKeyToken}");
|
||||
string strongName = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}, Version={1}, Culture={2}, PublicKeyToken={3}",
|
||||
s_coreSnapin.AssemblyName,
|
||||
assemblyVersion,
|
||||
culture,
|
||||
publicKeyToken);
|
||||
|
||||
string moduleName = Path.Combine(applicationBase, s_coreSnapin.AssemblyName + ".dll");
|
||||
|
||||
|
||||
@@ -288,7 +288,11 @@ namespace System.Management.Automation.Tracing
|
||||
{
|
||||
// NOTE: always log
|
||||
int threadId = Environment.CurrentManagedThreadId;
|
||||
string message = string.Create(CultureInfo.InvariantCulture, $"({PSVersionInfo.GitCommitId}:{threadId:X}:{PSChannel.Operational:X}) [Transfer]:{parentActivityId.ToString("B")} {Activity.ToString("B")}");
|
||||
string message = string.Format(CultureInfo.InvariantCulture,
|
||||
"({0}:{1:X}:{2:X}) [Transfer]:{3} {4}",
|
||||
PSVersionInfo.GitCommitId, threadId, PSChannel.Operational,
|
||||
parentActivityId.ToString("B"),
|
||||
Activity.ToString("B"));
|
||||
|
||||
NativeMethods.SysLog(NativeMethods.SysLogPriority.Info, message);
|
||||
}
|
||||
@@ -303,7 +307,9 @@ namespace System.Management.Automation.Tracing
|
||||
Activity = activity;
|
||||
|
||||
// NOTE: always log
|
||||
string message = string.Create(CultureInfo.InvariantCulture, $"({PSVersionInfo.GitCommitId:X}:{threadId:X}:{PSChannel.Operational:X}) [Activity] {activity.ToString("B")}");
|
||||
string message = string.Format(CultureInfo.InvariantCulture,
|
||||
"({0:X}:{1:X}:{2:X}) [Activity] {3}",
|
||||
PSVersionInfo.GitCommitId, threadId, PSChannel.Operational, activity.ToString("B"));
|
||||
NativeMethods.SysLog(NativeMethods.SysLogPriority.Info, message);
|
||||
}
|
||||
|
||||
@@ -327,7 +333,9 @@ namespace System.Management.Automation.Tracing
|
||||
sb.Clear();
|
||||
|
||||
// add the message preamble
|
||||
sb.Append(CultureInfo.InvariantCulture, $"({PSVersionInfo.GitCommitId}:{threadId:X}:{channel:X}) [{eventId:G}:{task:G}.{opcode:G}.{level:G}] ");
|
||||
sb.AppendFormat(CultureInfo.InvariantCulture,
|
||||
"({0}:{1:X}:{2:X}) [{3:G}:{4:G}.{5:G}.{6:G}] ",
|
||||
PSVersionInfo.GitCommitId, threadId, channel, eventId, task, opcode, level);
|
||||
|
||||
// add the message
|
||||
GetEventMessage(sb, eventId, args);
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace Engine
|
||||
|
||||
static Compiler()
|
||||
{
|
||||
string pattern = string.Create($"{Path.DirectorySeparatorChar}test{Path.DirectorySeparatorChar}perf{Path.DirectorySeparatorChar}benchmarks");
|
||||
string pattern = string.Format("{0}test{0}perf{0}benchmarks", Path.DirectorySeparatorChar);
|
||||
string location = typeof(Compiler).Assembly.Location;
|
||||
string testFilePath = null;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace BenchmarkDotNet.Extensions
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new ArgumentException(String.Create($"{parameter} must be followed by an integer"));
|
||||
throw new ArgumentException($"{parameter} must be followed by an integer");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user