diff --git a/src/libraries/System.Console/src/System/TermInfo.cs b/src/libraries/System.Console/src/System/TermInfo.cs index 19e94551a6f59c..529ff7fcb7a3bf 100644 --- a/src/libraries/System.Console/src/System/TermInfo.cs +++ b/src/libraries/System.Console/src/System/TermInfo.cs @@ -131,7 +131,7 @@ private Database(string term, byte[] data) _readAs32Bit = magic == MagicLegacyNumber ? false : magic == Magic32BitNumber ? true : - throw new InvalidOperationException(SR.Format(SR.IO_TermInfoInvalidMagicNumber, string.Concat("O" + Convert.ToString(magic, 8)))); // magic number was not recognized. Printing the magic number in octal. + throw new InvalidOperationException(SR.Format(SR.IO_TermInfoInvalidMagicNumber, "O" + Convert.ToString(magic, 8))); // magic number was not recognized. Printing the magic number in octal. _sizeOfInt = (_readAs32Bit) ? 4 : 2; _nameSectionNumBytes = ReadInt16(data, 2); diff --git a/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs b/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs index a7f116edada78d..55ea746b2c9b55 100644 --- a/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs +++ b/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs @@ -402,7 +402,7 @@ public string Name // if we reached here, just encode the value // - return Convert.ToString(value, 16); + return value.ToString("x"); } } diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/ContentValidator.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/ContentValidator.cs index 876fcb6abc6964..fc5cafd2279426 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/ContentValidator.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/ContentValidator.cs @@ -876,7 +876,7 @@ public override bool IsNullable { public override void Dump(StringBuilder bb, SymbolsDictionary symbols, Positions positions) { LeftChild.Dump(bb, symbols, positions); - bb.Append($"{{{Convert.ToString(min, NumberFormatInfo.InvariantInfo)}, {Convert.ToString(max, NumberFormatInfo.InvariantInfo)}}}"); + bb.Append(NumberFormatInfo.InvariantInfo, $"{{{min}, {max}}}"); } } diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/NumberAction.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/NumberAction.cs index f118809686f9de..6c5051d49bafa5 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/NumberAction.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/NumberAction.cs @@ -127,20 +127,10 @@ private static string ConvertToArabic(double val, int minLength, int groupSize, } else { - str = Convert.ToString(val, CultureInfo.InvariantCulture); + str = val.ToString(CultureInfo.InvariantCulture); } - if (str.Length >= minLength) - { - return str; - } - else - { - StringBuilder sb = new StringBuilder(minLength); - sb.Append('0', minLength - str.Length); - sb.Append(str); - return sb.ToString(); - } + return str.PadLeft(minLength, '0'); } } diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CapiHelper.Windows.cs b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CapiHelper.Windows.cs index c78a1721c72a3f..b8d4841fee8b5e 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CapiHelper.Windows.cs +++ b/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/CapiHelper.Windows.cs @@ -615,7 +615,7 @@ internal static void SetKeyParameter(SafeKeyHandle safeKeyHandle, CryptGetKeyPar { case CryptGetKeyParamQueryType.KP_IV: if (!Interop.Advapi32.CryptSetKeyParam(safeKeyHandle, (int)keyParam, value, 0)) - throw new CryptographicException(SR.CryptSetKeyParam_Failed, Convert.ToString(GetErrorCode())); + throw new CryptographicException(SR.CryptSetKeyParam_Failed, GetErrorCode().ToString()); break; default: @@ -640,7 +640,7 @@ internal static void SetKeyParameter(SafeKeyHandle safeKeyHandle, CryptGetKeyPar case CryptGetKeyParamQueryType.KP_MODE_BITS: case CryptGetKeyParamQueryType.KP_EFFECTIVE_KEYLEN: if (!Interop.Advapi32.CryptSetKeyParam(safeKeyHandle, (int)keyParam, ref value, 0)) - throw new CryptographicException(SR.CryptSetKeyParam_Failed, Convert.ToString(GetErrorCode())); + throw new CryptographicException(SR.CryptSetKeyParam_Failed, GetErrorCode().ToString()); break; default: @@ -716,7 +716,7 @@ private static void ValidateCspFlags(CspProviderFlags flags) CspProviderFlags.UseUserProtectedKey); if ((flags & keyFlags) != CspProviderFlags.NoFlags) { - throw new ArgumentException(SR.Format(SR.Arg_EnumIllegalVal, Convert.ToString(flags)), nameof(flags)); + throw new ArgumentException(SR.Format(SR.Arg_EnumIllegalVal, flags), nameof(flags)); } } } @@ -756,7 +756,7 @@ internal static SafeKeyHandle GetKeyPairHelper( (keyType == CspAlgorithmType.Dss && dwAlgId != CALG_DSS_SIGN)) { hKey.Dispose(); - throw new CryptographicException(SR.Format(SR.Cryptography_CSP_WrongKeySpec, Convert.ToString(keyType))); + throw new CryptographicException(SR.Format(SR.Cryptography_CSP_WrongKeySpec, keyType)); } return hKey; diff --git a/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsIdentity.cs b/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsIdentity.cs index 4bff4c48735ca0..1079b819bafe22 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsIdentity.cs +++ b/src/libraries/System.Security.Principal.Windows/src/System/Security/Principal/WindowsIdentity.cs @@ -1177,7 +1177,7 @@ private void AddDeviceGroupSidClaims(List instanceClaims, TokenInformatio { claimType = ClaimTypes.WindowsDeviceGroup; Claim claim = new Claim(claimType, groupSid.Value, ClaimValueTypes.String, _issuerName, _issuerName, this); - claim.Properties.Add(ClaimTypes.WindowsSubAuthority, Convert.ToString(groupSid.IdentifierAuthority, CultureInfo.InvariantCulture)!); + claim.Properties.Add(ClaimTypes.WindowsSubAuthority, groupSid.IdentifierAuthority.ToString()); claim.Properties.Add(claimType, ""); instanceClaims.Add(claim); } @@ -1185,7 +1185,7 @@ private void AddDeviceGroupSidClaims(List instanceClaims, TokenInformatio { claimType = ClaimTypes.DenyOnlyWindowsDeviceGroup; Claim claim = new Claim(claimType, groupSid.Value, ClaimValueTypes.String, _issuerName, _issuerName, this); - claim.Properties.Add(ClaimTypes.WindowsSubAuthority, Convert.ToString(groupSid.IdentifierAuthority, CultureInfo.InvariantCulture)!); + claim.Properties.Add(ClaimTypes.WindowsSubAuthority, groupSid.IdentifierAuthority.ToString()); claim.Properties.Add(claimType, ""); instanceClaims.Add(claim); } @@ -1244,7 +1244,7 @@ private void AddTokenClaims(List instanceClaims, TokenInformationClass to for (int item = 0; item < windowsClaim.ValueCount; item++) { - Claim c = new Claim(windowsClaim.Name, Convert.ToString(intValues[item], CultureInfo.InvariantCulture), ClaimValueTypes.Integer64, _issuerName, _issuerName, this); + Claim c = new Claim(windowsClaim.Name, intValues[item].ToString(CultureInfo.InvariantCulture), ClaimValueTypes.Integer64, _issuerName, _issuerName, this); c.Properties.Add(propertyValue, string.Empty); instanceClaims.Add(c); } @@ -1257,7 +1257,7 @@ private void AddTokenClaims(List instanceClaims, TokenInformationClass to for (int item = 0; item < windowsClaim.ValueCount; item++) { - Claim c = new Claim(windowsClaim.Name, Convert.ToString((ulong)uintValues[item], CultureInfo.InvariantCulture), ClaimValueTypes.UInteger64, _issuerName, _issuerName, this); + Claim c = new Claim(windowsClaim.Name, ((ulong)uintValues[item]).ToString(CultureInfo.InvariantCulture), ClaimValueTypes.UInteger64, _issuerName, _issuerName, this); c.Properties.Add(propertyValue, string.Empty); instanceClaims.Add(c); } diff --git a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs index 7778341f0d29e9..3549abab1161a7 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs +++ b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs @@ -481,7 +481,7 @@ internal void WriteLink(XmlWriter writer, SyndicationLink link, Uri baseUri) } if (link.Length != 0 && !link.AttributeExtensions.ContainsKey(s_atom10Length)) { - writer.WriteAttributeString(Atom10Constants.LengthTag, Convert.ToString(link.Length, CultureInfo.InvariantCulture)); + writer.WriteAttributeString(Atom10Constants.LengthTag, link.Length.ToString(CultureInfo.InvariantCulture)); } if (!link.AttributeExtensions.ContainsKey(s_atom10Href)) { diff --git a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs index d6d8cb85dc9b04..eae365c0c67d29 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs +++ b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs @@ -1182,7 +1182,7 @@ private void WriteMediaEnclosure(XmlWriter writer, SyndicationLink link, Uri bas } if (link.Length != 0 && !link.AttributeExtensions.ContainsKey(s_rss20Length)) { - writer.WriteAttributeString(Rss20Constants.LengthTag, Rss20Constants.Rss20Namespace, Convert.ToString(link.Length, CultureInfo.InvariantCulture)); + writer.WriteAttributeString(Rss20Constants.LengthTag, Rss20Constants.Rss20Namespace, link.Length.ToString(CultureInfo.InvariantCulture)); } writer.WriteEndElement(); } diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/Enlistment.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/Enlistment.cs index ffbf6d12ef8de0..71bdc979f2ffcc 100644 --- a/src/libraries/System.Transactions.Local/src/System/Transactions/Enlistment.cs +++ b/src/libraries/System.Transactions.Local/src/System/Transactions/Enlistment.cs @@ -226,8 +226,7 @@ internal EnlistmentTraceIdentifier EnlistmentTraceId temp = new EnlistmentTraceIdentifier( Guid.Empty, new TransactionTraceIdentifier( - InternalTransaction.InstanceIdentifier + - Convert.ToString(Interlocked.Increment(ref InternalTransaction._nextHash), CultureInfo.InvariantCulture), + string.Create(CultureInfo.InvariantCulture, $"{InternalTransaction.InstanceIdentifier}{Interlocked.Increment(ref InternalTransaction._nextHash)}"), 0), _enlistmentId); } diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/InternalTransaction.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/InternalTransaction.cs index e4633703561cfc..56873516ed748f 100644 --- a/src/libraries/System.Transactions.Local/src/System/Transactions/InternalTransaction.cs +++ b/src/libraries/System.Transactions.Local/src/System/Transactions/InternalTransaction.cs @@ -186,7 +186,7 @@ internal TransactionTraceIdentifier TransactionTraceId if (!_traceIdentifierInited) { TransactionTraceIdentifier temp = new TransactionTraceIdentifier( - InstanceIdentifier + Convert.ToString(_transactionHash, CultureInfo.InvariantCulture), + string.Create(CultureInfo.InvariantCulture, $"{InstanceIdentifier}{_transactionHash}"), 0); _traceIdentifier = temp; _traceIdentifierInited = true;