From 0d3f84c8429b2275eaede0e50b78ab3cdaffe3dc Mon Sep 17 00:00:00 2001 From: Lee Culver Date: Wed, 10 May 2023 07:23:29 -0700 Subject: [PATCH 1/2] Fix integer formatting StringBuilder.Format doesn't respect "x" when with nint/nuint. --- .../Output/Formats.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs b/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs index 2ef5090eea..49407a662b 100644 --- a/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs +++ b/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs @@ -58,6 +58,17 @@ public override int FormatValue(StringBuilder result, object value, int maxLengt case null: break; + case nuint: + result.AppendFormat(_format, (ulong)value); + break; + + case nint: + unchecked + { + result.AppendFormat(_format, (ulong)value); + } + break; + default: result.AppendFormat(_format, value); break; From a339e403317ab8290ec52dfa1187b60ccd3e9502 Mon Sep 17 00:00:00 2001 From: Lee Culver Date: Wed, 10 May 2023 07:38:53 -0700 Subject: [PATCH 2/2] Update Formats.cs --- .../Output/Formats.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs b/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs index 49407a662b..1fdc488e69 100644 --- a/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs +++ b/src/Microsoft.Diagnostics.ExtensionCommands/Output/Formats.cs @@ -58,14 +58,14 @@ public override int FormatValue(StringBuilder result, object value, int maxLengt case null: break; - case nuint: - result.AppendFormat(_format, (ulong)value); + case nuint nui: + result.AppendFormat(_format, (ulong)nui); break; - case nint: + case nint ni: unchecked { - result.AppendFormat(_format, (ulong)value); + result.AppendFormat(_format, (ulong)ni); } break;