Skip to content

Fix strings in ApplicationId.ToString #55879

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
stephentoub merged 1 commit into from
Jul 18, 2021
Merged

Fix strings in ApplicationId.ToString #55879

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
27 changes: 15 additions & 12 deletions src/libraries/System.Private.CoreLib/src/System/ApplicationId.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,33 @@ public override string ToString()
{
var sb = new ValueStringBuilder(stackalloc char[128]);
sb.Append(Name);

if (Culture != null)
{
sb.Append($", culture=\"{Culture}\"");
sb.Append(", culture=\"");
sb.Append(Culture);
sb.Append('"');
}
sb.Append($", version=\"{Version}\"");

sb.Append(", version=\"");
sb.Append(Version.ToString());
sb.Append('"');

if (_publicKeyToken != null)
{
sb.Append(", publicKeyToken=\"");
EncodeHexString(_publicKeyToken, ref sb);
HexConverter.EncodeToUtf16(_publicKeyToken, sb.AppendSpan(2 * _publicKeyToken.Length), HexConverter.Casing.Upper);
sb.Append('"');
}

if (ProcessorArchitecture != null)
{
sb.Append($", processorArchitecture =\"{ProcessorArchitecture}\"");
sb.Append(", processorArchitecture =\"");
sb.Append(ProcessorArchitecture);
sb.Append('"');
}
return sb.ToString();
}

private static void EncodeHexString(byte[] sArray, ref ValueStringBuilder stringBuilder)
{
for (int i = 0; i < sArray.Length; i++)
{
HexConverter.ToCharsBuffer(sArray[i], stringBuilder.AppendSpan(2), 0, HexConverter.Casing.Upper);
}
return sb.ToString();
}

public override bool Equals([NotNullWhen(true)] object? o)
Expand Down