Skip to content

Use interpolated strings 3 #18979

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 5 commits into from
Jan 21, 2023
Merged

Use interpolated strings 3 #18979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94bd393
14 files
CarloToso Jan 19, 2023
99ad509
revert
CarloToso Jan 20, 2023
9019a05
add suggestions
CarloToso Jan 20, 2023
8f2865d
tests LangVersion csharp 11
CarloToso Jan 20, 2023
f3aeaae
revert
CarloToso Jan 21, 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
36 changes: 18 additions & 18 deletions src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ internal static PSObject GetPSObjectFromCmdletInfo(CommandInfo input)
PSObject obj = new PSObject();

obj.TypeNames.Clear();
obj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#{1}#command", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp, commandInfo.ModuleName));
obj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#{1}", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp, commandInfo.ModuleName));
obj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#{commandInfo.ModuleName}#command"));
obj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#{commandInfo.ModuleName}"));
obj.TypeNames.Add(DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp);
obj.TypeNames.Add("CmdletHelpInfo");
obj.TypeNames.Add("HelpInfo");
Expand Down Expand Up @@ -160,7 +160,7 @@ internal static void AddDetailsProperties(PSObject obj, string name, string noun
PSObject mshObject = new PSObject();

mshObject.TypeNames.Clear();
mshObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#details", typeNameForHelp));
mshObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{typeNameForHelp}#details"));

mshObject.Properties.Add(new PSNoteProperty("name", name));
mshObject.Properties.Add(new PSNoteProperty("noun", noun));
Expand Down Expand Up @@ -192,7 +192,7 @@ internal static void AddSyntaxProperties(PSObject obj, string cmdletName, ReadOn
PSObject mshObject = new PSObject();

mshObject.TypeNames.Clear();
mshObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#syntax", typeNameForHelp));
mshObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{typeNameForHelp}#syntax"));

AddSyntaxItemProperties(mshObject, cmdletName, parameterSets, common, typeNameForHelp);

Expand All @@ -216,7 +216,7 @@ private static void AddSyntaxItemProperties(PSObject obj, string cmdletName, Rea
PSObject mshObject = new PSObject();

mshObject.TypeNames.Clear();
mshObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#syntaxItem", typeNameForHelp));
mshObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{typeNameForHelp}#syntaxItem"));

mshObject.Properties.Add(new PSNoteProperty("name", cmdletName));
mshObject.Properties.Add(new PSNoteProperty("CommonParameters", common));
Expand Down Expand Up @@ -263,7 +263,7 @@ private static void AddSyntaxParametersProperties(PSObject obj, IEnumerable<Comm
PSObject mshObject = new PSObject();

mshObject.TypeNames.Clear();
mshObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#parameter", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
mshObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#parameter"));

Collection<Attribute> attributes = new Collection<Attribute>(parameter.Attributes);

Expand Down Expand Up @@ -339,7 +339,7 @@ private static void AddParameterValueGroupProperties(PSObject obj, string[] valu
PSObject paramValueGroup = new PSObject();

paramValueGroup.TypeNames.Clear();
paramValueGroup.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#parameterValueGroup", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
paramValueGroup.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#parameterValueGroup"));

ArrayList paramValue = new ArrayList(values);

Expand All @@ -359,7 +359,7 @@ internal static void AddParametersProperties(PSObject obj, Dictionary<string, Pa
PSObject paramsObject = new PSObject();

paramsObject.TypeNames.Clear();
paramsObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#parameters", typeNameForHelp));
paramsObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{typeNameForHelp}#parameters"));

ArrayList paramObjects = new ArrayList();

Expand All @@ -385,7 +385,7 @@ internal static void AddParametersProperties(PSObject obj, Dictionary<string, Pa
PSObject paramObject = new PSObject();

paramObject.TypeNames.Clear();
paramObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#parameter", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
paramObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#parameter"));

AddParameterProperties(paramObject, parameter, parameters[parameter].Aliases,
parameters[parameter].IsDynamic, parameters[parameter].ParameterType, parameters[parameter].Attributes);
Expand Down Expand Up @@ -551,7 +551,7 @@ private static void AddParameterTypeProperties(PSObject obj, Type parameterType,
PSObject mshObject = new PSObject();

mshObject.TypeNames.Clear();
mshObject.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#type", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
mshObject.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#type"));

var parameterTypeString = CommandParameterSetInfo.GetParameterTypeString(parameterType, attributes);
mshObject.Properties.Add(new PSNoteProperty("name", parameterTypeString));
Expand Down Expand Up @@ -633,17 +633,17 @@ internal static void AddInputTypesProperties(PSObject obj, Dictionary<string, Pa
PSObject inputTypesObj = new PSObject();

inputTypesObj.TypeNames.Clear();
inputTypesObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#inputTypes", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
inputTypesObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#inputTypes"));

PSObject inputTypeObj = new PSObject();

inputTypeObj.TypeNames.Clear();
inputTypeObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#inputType", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
inputTypeObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#inputType"));

PSObject typeObj = new PSObject();

typeObj.TypeNames.Clear();
typeObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#type", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
typeObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#type"));

typeObj.Properties.Add(new PSNoteProperty("name", sb.ToString()));
inputTypeObj.Properties.Add(new PSNoteProperty("type", typeObj));
Expand All @@ -661,17 +661,17 @@ private static void AddOutputTypesProperties(PSObject obj, ReadOnlyCollection<PS
PSObject returnValuesObj = new PSObject();

returnValuesObj.TypeNames.Clear();
returnValuesObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#returnValues", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
returnValuesObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#returnValues"));

PSObject returnValueObj = new PSObject();

returnValueObj.TypeNames.Clear();
returnValueObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#returnValue", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
returnValueObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#returnValue"));

PSObject typeObj = new PSObject();

typeObj.TypeNames.Clear();
typeObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#type", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
typeObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#type"));

if (outputTypes.Count == 0)
{
Expand Down Expand Up @@ -753,7 +753,7 @@ internal static void AddRelatedLinksProperties(PSObject obj, string relatedLink)
PSObject navigationLinkObj = new PSObject();

navigationLinkObj.TypeNames.Clear();
navigationLinkObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#navigationLinks", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
navigationLinkObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#navigationLinks"));

navigationLinkObj.Properties.Add(new PSNoteProperty("uri", relatedLink));

Expand Down Expand Up @@ -789,7 +789,7 @@ internal static void AddRelatedLinksProperties(PSObject obj, string relatedLink)
PSObject relatedLinksObj = new PSObject();

relatedLinksObj.TypeNames.Clear();
relatedLinksObj.TypeNames.Add(string.Format(CultureInfo.InvariantCulture, "{0}#relatedLinks", DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp));
relatedLinksObj.TypeNames.Add(string.Create(CultureInfo.InvariantCulture, $"{DefaultCommandHelpObjectBuilder.TypeNameForDefaultHelp}#relatedLinks"));
relatedLinksObj.Properties.Add(new PSNoteProperty("navigationLink", navigationLinkValues.ToArray()));

obj.Properties.Add(new PSNoteProperty("relatedLinks", relatedLinksObj));
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/help/HelpCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ private PSObject TransformView(PSObject originalHelpObject)

if (originalHelpObject.TypeNames.Count == 0)
{
string typeToAdd = string.Format(CultureInfo.InvariantCulture, "HelpInfo#{0}", tokenToAdd);
string typeToAdd = string.Create(CultureInfo.InvariantCulture, $"HelpInfo#{tokenToAdd}");
objectToReturn.TypeNames.Add(typeToAdd);
}
else
Expand All @@ -440,7 +440,7 @@ private PSObject TransformView(PSObject originalHelpObject)
continue;
}

string typeToAdd = string.Format(CultureInfo.InvariantCulture, "{0}#{1}", typeName, tokenToAdd);
string typeToAdd = string.Create(CultureInfo.InvariantCulture, $"{typeName}#{tokenToAdd}");
s_tracer.WriteLine("Adding type {0}", typeToAdd);
objectToReturn.TypeNames.Add(typeToAdd);
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1957,7 +1957,7 @@ public static string LengthString(PSObject instance)
public static string LastWriteTimeString(PSObject instance)
{
return instance?.BaseObject is FileSystemInfo fileInfo
? string.Format(CultureInfo.CurrentCulture, "{0,10:d} {0,8:t}", fileInfo.LastWriteTime)
? string.Create(CultureInfo.CurrentCulture, $"{fileInfo.LastWriteTime,10:d} {fileInfo.LastWriteTime,8:t}")
: string.Empty;
}

Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/namespaces/LocationGlobber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4704,7 +4704,7 @@ private static void TraceFilters(CmdletProviderContext context)
StringBuilder includeString = new StringBuilder();
foreach (string includeFilter in context.Include)
{
includeString.AppendFormat("{0} ", includeFilter);
includeString.Append($"{includeFilter} ");
}

s_pathResolutionTracer.WriteLine("Include: {0}", includeString.ToString());
Expand All @@ -4716,7 +4716,7 @@ private static void TraceFilters(CmdletProviderContext context)
StringBuilder excludeString = new StringBuilder();
foreach (string excludeFilter in context.Exclude)
{
excludeString.AppendFormat("{0} ", excludeFilter);
excludeString.Append($"{excludeFilter} ");
}

s_pathResolutionTracer.WriteLine("Exclude: {0}", excludeString.ToString());
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/namespaces/RegistryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ private static string EscapeSpecialChars(string path)

Dbg.Diagnostics.Assert(
textEnumerator != null,
string.Format(CultureInfo.CurrentCulture, "Cannot get a text enumerator for name {0}", path));
string.Create(CultureInfo.CurrentCulture, $"Cannot get a text enumerator for name {path}"));

while (textEnumerator.MoveNext())
{
Expand Down Expand Up @@ -835,7 +835,7 @@ private static string EscapeChildName(string name)

Dbg.Diagnostics.Assert(
textEnumerator != null,
string.Format(CultureInfo.CurrentCulture, "Cannot get a text enumerator for name {0}", name));
string.Create(CultureInfo.CurrentCulture, $"Cannot get a text enumerator for name {name}"));

while (textEnumerator.MoveNext())
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/security/wldpNativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
{
SafeHandle fileHandle = fileStream.SafeFileHandle;

// First check latest WDAC APIs if available. Also revert to legacy APIs if debug hook is in effect.
// First check latest WDAC APIs if available. Also revert to legacy APIs if debug hook is in effect.
Exception errorException = null;
if (s_wldpCanExecuteAvailable && !s_allowDebugOverridePolicy)
{
Expand Down
7 changes: 3 additions & 4 deletions src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,13 +870,13 @@ internal static void ReadRegistryInfo(out Version assemblyVersion, out string pu
applicationBase = Utils.DefaultPowerShellAppBase;
Dbg.Assert(
!string.IsNullOrEmpty(applicationBase),
string.Format(CultureInfo.CurrentCulture, "{0} is empty or null", RegistryStrings.MonadEngine_ApplicationBase));
string.Create(CultureInfo.CurrentCulture, $"{RegistryStrings.MonadEngine_ApplicationBase} is empty or null"));

// Get the PSVersion from Utils..this is hardcoded
psVersion = PSVersionInfo.PSVersion;
Dbg.Assert(
psVersion != null,
string.Format(CultureInfo.CurrentCulture, "{0} is null", RegistryStrings.MonadEngine_MonadVersion));
string.Create(CultureInfo.CurrentCulture, $"{RegistryStrings.MonadEngine_MonadVersion} is null"));

// Get version number in x.x.x.x format
// This information is available from the executing assembly
Expand Down Expand Up @@ -939,8 +939,7 @@ internal static PSSnapInInfo ReadCoreEngineSnapIn()
"Help.format.ps1xml", "HelpV3.format.ps1xml", "PowerShellCore.format.ps1xml", "PowerShellTrace.format.ps1xml",
"Registry.format.ps1xml"});

string strongName = string.Format(CultureInfo.InvariantCulture, "{0}, Version={1}, Culture={2}, PublicKeyToken={3}",
s_coreSnapin.AssemblyName, assemblyVersion, culture, publicKeyToken);
string strongName = string.Create(CultureInfo.InvariantCulture, $"{s_coreSnapin.AssemblyName}, Version={assemblyVersion}, Culture={culture}, PublicKeyToken={publicKeyToken}");

string moduleName = Path.Combine(applicationBase, s_coreSnapin.AssemblyName + ".dll");

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/utils/perfCounters/PSPerfCountersMgr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static PSPerfCountersMgr Instance
public string GetCounterSetInstanceName()
{
Process currentProcess = Process.GetCurrentProcess();
string pid = string.Format(CultureInfo.InvariantCulture, "{0}", currentProcess.Id);
string pid = string.Create(CultureInfo.InvariantCulture, $"{currentProcess.Id}");
return pid;
}

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/utils/tracing/PSEtwLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ internal static void LogAnalyticVerbose(PSEventId id, PSOpcode opcode, PSTask ta
if (provider.IsEnabled(PSLevel.Verbose, keyword))
{
string payLoadData = BitConverter.ToString(fragmentData.blob, fragmentData.offset, fragmentData.length);
payLoadData = string.Format(CultureInfo.InvariantCulture, "0x{0}", payLoadData.Replace("-", string.Empty));
payLoadData = string.Create(CultureInfo.InvariantCulture, $"0x{payLoadData.Replace("-", string.Empty)}");

provider.WriteEvent(id, PSChannel.Analytic, opcode, PSLevel.Verbose, task, keyword,
objectId, fragmentId, isStartFragment, isEndFragment, fragmentLength,
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/utils/tracing/SysLogProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private static string GetResourceString(string resourceName)
string value = ResourceManager.GetString(resourceName, Culture);
if (string.IsNullOrEmpty(value))
{
value = string.Format(CultureInfo.InvariantCulture, "Unknown resource: {0}", resourceName);
value = string.Create(CultureInfo.InvariantCulture, $"Unknown resource: {resourceName}");
Diagnostics.Assert(false, value);
}

Expand Down
2 changes: 1 addition & 1 deletion test/Test.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Copyright>(c) Microsoft Corporation.</Copyright>

<TargetFramework>net7.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<LangVersion>11.0</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion test/perf/benchmarks/Engine.Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Compiler

static Compiler()
{
string pattern = string.Format("{0}test{0}perf{0}benchmarks", Path.DirectorySeparatorChar);
string pattern = string.Create($"{Path.DirectorySeparatorChar}test{Path.DirectorySeparatorChar}perf{Path.DirectorySeparatorChar}benchmarks");
string location = typeof(Compiler).Assembly.Location;
string testFilePath = null;

Expand Down
4 changes: 2 additions & 2 deletions test/perf/dotnet-tools/BenchmarkDotNet.Extensions/CommandLineOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static List<string> ParseAndRemoveIntParameter(List<string> argsList, str
}
else
{
throw new ArgumentException(String.Format("{0} must be followed by an integer", parameter));
throw new ArgumentException(String.Create($"{parameter} must be followed by an integer"));
}
}

Expand Down Expand Up @@ -94,4 +94,4 @@ public static void ValidatePartitionParameters(int? count, int? index)
}
}
}
}
}