From 5fd289095bd97c65e211c212d024fc565349cd44 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Mon, 12 Jul 2021 06:30:34 -0400 Subject: [PATCH] Use interpolated strings in more places Commit migrated from https://github.com/dotnet/runtime/commit/dfd618dc648ba9b11dd0f8034f78113d69f223cd --- .../src/System/Drawing/Brush.cs | 2 +- .../Drawing/Drawing2D/GraphicsPath.Windows.cs | 2 +- .../Drawing/Drawing2D/GraphicsPathIterator.cs | 2 +- .../Drawing2D/SafeCustomLineCapHandle.cs | 2 +- .../src/System/Drawing/Font.Unix.cs | 2 +- .../src/System/Drawing/Font.cs | 2 +- .../src/System/Drawing/FontConverter.cs | 6 ++++-- .../src/System/Drawing/FontFamily.cs | 2 +- .../src/System/Drawing/Graphics.Windows.cs | 2 +- .../src/System/Drawing/Image.Windows.cs | 2 +- .../System/Drawing/Imaging/FrameDimension.cs | 2 +- .../System/Drawing/Imaging/ImageAttributes.cs | 2 +- .../src/System/Drawing/Imaging/ImageFormat.cs | 2 +- .../Drawing/Internal/SystemColorTracker.cs | 2 +- .../src/System/Drawing/Pen.cs | 2 +- .../src/System/Drawing/Printing/Margins.cs | 10 +--------- .../Drawing/Printing/PageSettings.Unix.cs | 6 ++---- .../Drawing/Printing/PageSettings.Windows.cs | 13 ++---------- .../src/System/Drawing/Printing/PaperSize.cs | 9 +-------- .../System/Drawing/Printing/PaperSource.cs | 7 +------ .../Drawing/Printing/PrintDocument.Unix.cs | 5 +---- .../Drawing/Printing/PrintDocument.Windows.cs | 5 +---- .../Drawing/Printing/PrinterSettings.Unix.cs | 8 +------- .../Printing/PrinterSettings.Windows.cs | 20 +++++++++---------- .../src/System/Drawing/Region.cs | 2 +- .../src/System/Drawing/StringFormat.cs | 7 ++----- .../Drawing/Text/PrivateFontCollection.cs | 2 +- 27 files changed, 42 insertions(+), 86 deletions(-) diff --git a/src/System.Drawing.Common/src/System/Drawing/Brush.cs b/src/System.Drawing.Common/src/System/Drawing/Brush.cs index af4e81ea8af..de964a2b13d 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Brush.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Brush.cs @@ -47,7 +47,7 @@ protected virtual void Dispose(bool disposing) #endif Gdip.GdipDeleteBrush(new HandleRef(this, _nativeBrush)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsSecurityOrCriticalException(ex)) diff --git a/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Windows.cs index a1c04e7d2f5..f0a1bd9aec3 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Windows.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Windows.cs @@ -94,7 +94,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeletePath(new HandleRef(this, _nativePath)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) diff --git a/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPathIterator.cs b/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPathIterator.cs index 4b4135665ee..8e83841c4f6 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPathIterator.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPathIterator.cs @@ -38,7 +38,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeletePathIter(new HandleRef(this, nativeIter)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) diff --git a/src/System.Drawing.Common/src/System/Drawing/Drawing2D/SafeCustomLineCapHandle.cs b/src/System.Drawing.Common/src/System/Drawing/Drawing2D/SafeCustomLineCapHandle.cs index b01b88392b9..410f4478913 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Drawing2D/SafeCustomLineCapHandle.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Drawing2D/SafeCustomLineCapHandle.cs @@ -48,7 +48,7 @@ protected override bool ReleaseHandle() { handle = IntPtr.Zero; } - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); } return status == Gdip.Ok; } diff --git a/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs index 91a932b60dc..8163d0eefb1 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Font.Unix.cs @@ -65,7 +65,7 @@ private void CreateFont(string familyName, float emSize, FontStyle style, Graphi int status = Gdip.GdipCreateFont(new HandleRef(this, family.NativeFamily), emSize, style, unit, out _nativeFont); if (status == Gdip.FontStyleNotFound) - throw new ArgumentException($"Style {style.ToString()} isn't supported by font {familyName}."); + throw new ArgumentException($"Style {style} isn't supported by font {familyName}."); Gdip.CheckStatus(status); } diff --git a/src/System.Drawing.Common/src/System/Drawing/Font.cs b/src/System.Drawing.Common/src/System/Drawing/Font.cs index 6634ee78841..0a738e0e3e8 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Font.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Font.cs @@ -183,7 +183,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeleteFont(new HandleRef(this, _nativeFont)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsCriticalException(ex)) diff --git a/src/System.Drawing.Common/src/System/Drawing/FontConverter.cs b/src/System.Drawing.Common/src/System/Drawing/FontConverter.cs index 5bb82adbc80..ace1758b4d5 100644 --- a/src/System.Drawing.Common/src/System/Drawing/FontConverter.cs +++ b/src/System.Drawing.Common/src/System/Drawing/FontConverter.cs @@ -40,7 +40,8 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina ValueStringBuilder sb = default; sb.Append(font.Name); - sb.Append(culture.TextInfo.ListSeparator[0] + " "); + sb.Append(culture.TextInfo.ListSeparator[0]); + sb.Append(" "); sb.Append(font.Size.ToString(culture.NumberFormat)); switch (font.Unit) @@ -79,7 +80,8 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina if (font.Style != FontStyle.Regular) { - sb.Append(culture.TextInfo.ListSeparator[0] + " style="); + sb.Append(culture.TextInfo.ListSeparator[0]); + sb.Append(" style="); sb.Append(font.Style.ToString()); } diff --git a/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs b/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs index 6e0438be885..89b80a06cbc 100644 --- a/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs +++ b/src/System.Drawing.Common/src/System/Drawing/FontFamily.cs @@ -162,7 +162,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeleteFontFamily(new HandleRef(this, _nativeFamily)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsCriticalException(ex)) diff --git a/src/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs index 929ea19c4fa..8dd2ad15b22 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Graphics.Windows.cs @@ -178,7 +178,7 @@ private void Dispose(bool disposing) Gdip.GdipDeleteGraphics(new HandleRef(this, NativeGraphics)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsSecurityOrCriticalException(ex)) diff --git a/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs index ccea5ff42d5..c359e7af7fd 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Image.Windows.cs @@ -95,7 +95,7 @@ protected virtual void Dispose(bool disposing) #endif Gdip.GdipDisposeImage(new HandleRef(this, nativeImage)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) diff --git a/src/System.Drawing.Common/src/System/Drawing/Imaging/FrameDimension.cs b/src/System.Drawing.Common/src/System/Drawing/Imaging/FrameDimension.cs index 5fc556efad7..44d36d291cb 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Imaging/FrameDimension.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Imaging/FrameDimension.cs @@ -78,7 +78,7 @@ public override string ToString() if (this == s_time) return "Time"; if (this == s_resolution) return "Resolution"; if (this == s_page) return "Page"; - return "[FrameDimension: " + _guid + "]"; + return $"[FrameDimension: {_guid}]"; } } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageAttributes.cs b/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageAttributes.cs index 5831014b1e6..dca1674b2d5 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageAttributes.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageAttributes.cs @@ -94,7 +94,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDisposeImageAttributes(new HandleRef(this, nativeImageAttributes)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) diff --git a/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageFormat.cs b/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageFormat.cs index 705fad55ee5..ca4e867fcba 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageFormat.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Imaging/ImageFormat.cs @@ -170,7 +170,7 @@ public override string ToString() if (this.Guid == s_tiff.Guid) return "Tiff"; if (this.Guid == s_exif.Guid) return "Exif"; if (this.Guid == s_icon.Guid) return "Icon"; - return "[ImageFormat: " + _guid + "]"; + return $"[ImageFormat: {_guid}]"; } } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs b/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs index 9d2343d83b5..8645b31c10c 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Internal/SystemColorTracker.cs @@ -55,7 +55,7 @@ internal static void Add(ISystemColorTracker obj) list[index] = new WeakReference(obj); else { - Debug.Assert(list[index].Target == null, "Trying to reuse a weak reference that isn't broken yet: list[" + index + "], length =" + list.Length); + Debug.Assert(list[index].Target == null, $"Trying to reuse a weak reference that isn't broken yet: list[{index}], length = {list.Length}"); list[index].Target = obj; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Pen.cs b/src/System.Drawing.Common/src/System/Drawing/Pen.cs index 606f8cc57af..ca5d045000d 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Pen.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Pen.cs @@ -161,7 +161,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeletePen(new HandleRef(this, NativePen)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsSecurityOrCriticalException(ex)) diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/Margins.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/Margins.cs index 39691a9ad5e..05764ce8f21 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/Margins.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/Margins.cs @@ -235,14 +235,6 @@ public override bool Equals([NotNullWhen(true)] object? obj) /// /// Provides some interesting information for the Margins in String form. /// - public override string ToString() - { - return "[Margins" - + " Left=" + Left.ToString(CultureInfo.InvariantCulture) - + " Right=" + Right.ToString(CultureInfo.InvariantCulture) - + " Top=" + Top.ToString(CultureInfo.InvariantCulture) - + " Bottom=" + Bottom.ToString(CultureInfo.InvariantCulture) - + "]"; - } + public override string ToString() => $"[Margins Left={Left} Right={Right} Top={Top} Bottom={Bottom}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs index a7e8c1dbdbc..a79fb02f0a2 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs @@ -255,9 +255,7 @@ public void SetHdevmode(IntPtr hdevmode) throw new NotImplementedException(); } - public override string ToString() - { - return $"[{nameof(PageSettings)}: {nameof(Color)}={color}, {nameof(Landscape)}={landscape}, {nameof(Margins)}={margins}, {nameof(PaperSize)}={paperSize}, {nameof(PaperSource)}={paperSource}, {nameof(PrinterResolution)}={printerResolution}]"; - } + public override string ToString() => + $"[{nameof(PageSettings)}: {nameof(Color)}={color}, {nameof(Landscape)}={landscape}, {nameof(Margins)}={margins}, {nameof(PaperSize)}={paperSize}, {nameof(PaperSource)}={paperSource}, {nameof(PrinterResolution)}={printerResolution}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Windows.cs index 8ac8e9ce247..f0e41dbc667 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Windows.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Windows.cs @@ -536,16 +536,7 @@ public void SetHdevmode(IntPtr hdevmode) /// /// Provides some interesting information about the PageSettings in String form. /// - public override string ToString() - { - return "[PageSettings:" - + " Color=" + Color.ToString() - + ", Landscape=" + Landscape.ToString() - + ", Margins=" + Margins.ToString() - + ", PaperSize=" + PaperSize.ToString() - + ", PaperSource=" + PaperSource.ToString() - + ", PrinterResolution=" + PrinterResolution.ToString() - + "]"; - } + public override string ToString() => + $"[{nameof(PageSettings)}: Color={Color}, Landscape={Landscape}, Margins={Margins}, PaperSize={PaperSize}, PaperSource={PaperSource}, PrinterResolution={PrinterResolution}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSize.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSize.cs index 34b12d52c9d..4b9b49ae33d 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSize.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSize.cs @@ -127,13 +127,6 @@ public int Width /// /// Provides some interesting information about the PaperSize in String form. /// - public override string ToString() - { - return "[PaperSize " + PaperName - + " Kind=" + Kind.ToString() - + " Height=" + Height.ToString(CultureInfo.InvariantCulture) - + " Width=" + Width.ToString(CultureInfo.InvariantCulture) - + "]"; - } + public override string ToString() => $"[PaperSize {PaperName} Kind={Kind.ToString()} Height={Height.ToString(CultureInfo.InvariantCulture)} Width={Width.ToString(CultureInfo.InvariantCulture)}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSource.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSource.cs index 9db90421050..5a321cc4d81 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSource.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSource.cs @@ -63,11 +63,6 @@ public string SourceName /// /// Provides some interesting information about the PaperSource in String form. /// - public override string ToString() - { - return "[PaperSource " + SourceName - + " Kind=" + Kind.ToString() - + "]"; - } + public override string ToString() => $"[PaperSource {SourceName} Kind={Kind}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs index 25ea2116850..2d3306ed8a2 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs @@ -187,10 +187,7 @@ public void Print() PrintController.OnEndPrint(this, printArgs); } - public override string ToString() - { - return "[PrintDocument " + this.DocumentName + "]"; - } + public override string ToString() => $"[PrintDocument {this.DocumentName}]"; // events protected virtual void OnBeginPrint(PrintEventArgs e) diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs index 3d0b09a7321..eaa73074f87 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs @@ -248,9 +248,6 @@ public void Print() /// /// Provides some interesting information about the PrintDocument in String form. /// - public override string ToString() - { - return "[PrintDocument " + DocumentName + "]"; - } + public override string ToString() => $"[PrintDocument {DocumentName}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs index d3e567777cd..4043ec72213 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs @@ -365,13 +365,7 @@ public void SetHdevnames(IntPtr hdevnames) throw new NotImplementedException(); } - public override string ToString() - { - return "Printer [PrinterSettings " + printer_name + " Copies=" + copies + " Collate=" + collate - + " Duplex=" + can_duplex + " FromPage=" + from_page + " LandscapeAngle=" + landscape_angle - + " MaximumCopies=" + maximum_copies + " OutputPort=" + " ToPage=" + to_page + "]"; - - } + public override string ToString() => $"Printer [PrinterSettings {printer_name} Copies={copies} Collate={collate} Duplex={can_duplex} FromPage={from_page} LandscapeAngle={landscape_angle} MaximumCopies={maximum_copies} OutputPort= ToPage={to_page}]"; // Public subclasses #region Public Subclasses diff --git a/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs index 1889516f87a..d750390d07d 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs @@ -1258,16 +1258,16 @@ public override string ToString() { string printerName = PrinterName; return "[PrinterSettings " - + printerName - + " Copies=" + Copies.ToString(CultureInfo.InvariantCulture) - + " Collate=" + Collate.ToString(CultureInfo.InvariantCulture) - + " Duplex=" + Duplex.ToString() - + " FromPage=" + FromPage.ToString(CultureInfo.InvariantCulture) - + " LandscapeAngle=" + LandscapeAngle.ToString(CultureInfo.InvariantCulture) - + " MaximumCopies=" + MaximumCopies.ToString(CultureInfo.InvariantCulture) - + " OutputPort=" + OutputPort.ToString(CultureInfo.InvariantCulture) - + " ToPage=" + ToPage.ToString(CultureInfo.InvariantCulture) - + "]"; + + printerName + + " Copies=" + Copies.ToString(CultureInfo.InvariantCulture) + + " Collate=" + Collate.ToString(CultureInfo.InvariantCulture) + + " Duplex=" + Duplex.ToString() + + " FromPage=" + FromPage.ToString(CultureInfo.InvariantCulture) + + " LandscapeAngle=" + LandscapeAngle.ToString(CultureInfo.InvariantCulture) + + " MaximumCopies=" + MaximumCopies.ToString(CultureInfo.InvariantCulture) + + " OutputPort=" + OutputPort.ToString(CultureInfo.InvariantCulture) + + " ToPage=" + ToPage.ToString(CultureInfo.InvariantCulture) + + "]"; } // Write null terminated string, return length of string in characters (including null) diff --git a/src/System.Drawing.Common/src/System/Drawing/Region.cs b/src/System.Drawing.Common/src/System/Drawing/Region.cs index d87c739d8ca..379fc61e2e1 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Region.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Region.cs @@ -101,7 +101,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeleteRegion(new HandleRef(this, NativeRegion)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsSecurityOrCriticalException(ex)) diff --git a/src/System.Drawing.Common/src/System/Drawing/StringFormat.cs b/src/System.Drawing.Common/src/System/Drawing/StringFormat.cs index 6a905918200..cd0a7d074d1 100644 --- a/src/System.Drawing.Common/src/System/Drawing/StringFormat.cs +++ b/src/System.Drawing.Common/src/System/Drawing/StringFormat.cs @@ -86,7 +86,7 @@ private void Dispose(bool disposing) #endif Gdip.GdipDeleteStringFormat(new HandleRef(this, nativeFormat)); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) @@ -442,9 +442,6 @@ internal int GetMeasurableCharacterRangeCount() /// /// Converts this to a human-readable string. /// - public override string ToString() - { - return "[StringFormat, FormatFlags=" + FormatFlags.ToString() + "]"; - } + public override string ToString() => $"[StringFormat, FormatFlags={FormatFlags.ToString()}]"; } } diff --git a/src/System.Drawing.Common/src/System/Drawing/Text/PrivateFontCollection.cs b/src/System.Drawing.Common/src/System/Drawing/Text/PrivateFontCollection.cs index 8541e3069c2..609ccae35b8 100644 --- a/src/System.Drawing.Common/src/System/Drawing/Text/PrivateFontCollection.cs +++ b/src/System.Drawing.Common/src/System/Drawing/Text/PrivateFontCollection.cs @@ -37,7 +37,7 @@ protected override void Dispose(bool disposing) #endif Gdip.GdipDeletePrivateFontCollection(ref _nativeFontCollection); #if DEBUG - Debug.Assert(status == Gdip.Ok, "GDI+ returned an error status: " + status.ToString(CultureInfo.InvariantCulture)); + Debug.Assert(status == Gdip.Ok, $"GDI+ returned an error status: {status.ToString(CultureInfo.InvariantCulture)}"); #endif } catch (Exception ex) when (!ClientUtils.IsSecurityOrCriticalException(ex))