diff options
Diffstat (limited to 'src/mscorlib/src/System/Tuple.cs')
| -rw-r--r-- | src/mscorlib/src/System/Tuple.cs | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/mscorlib/src/System/Tuple.cs b/src/mscorlib/src/System/Tuple.cs index bb0dbcad6f..a118df02bd 100644 --- a/src/mscorlib/src/System/Tuple.cs +++ b/src/mscorlib/src/System/Tuple.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. + using System; using System.Text; using System.Collections; @@ -15,7 +16,6 @@ using System.Runtime.CompilerServices; namespace System { - /// <summary> /// Helper so we can call some tuple methods recursively without knowing the underlying types. /// </summary> @@ -107,7 +107,6 @@ namespace System [Serializable] public class Tuple<T1> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; public T1 Item1 { get { return m_Item1; } } @@ -149,7 +148,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } return comparer.Compare(m_Item1, objTuple.m_Item1); @@ -207,7 +206,6 @@ namespace System [Serializable] public class Tuple<T1, T2> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; @@ -252,7 +250,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; @@ -322,7 +320,6 @@ namespace System [Serializable] public class Tuple<T1, T2, T3> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; private readonly T3 m_Item3; @@ -370,7 +367,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; @@ -448,7 +445,6 @@ namespace System [Serializable] public class Tuple<T1, T2, T3, T4> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; private readonly T3 m_Item3; @@ -499,7 +495,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; @@ -585,7 +581,6 @@ namespace System [Serializable] public class Tuple<T1, T2, T3, T4, T5> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; private readonly T3 m_Item3; @@ -639,7 +634,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; @@ -733,7 +728,6 @@ namespace System [Serializable] public class Tuple<T1, T2, T3, T4, T5, T6> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; private readonly T3 m_Item3; @@ -790,7 +784,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; @@ -892,7 +886,6 @@ namespace System [Serializable] public class Tuple<T1, T2, T3, T4, T5, T6, T7> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; private readonly T3 m_Item3; @@ -952,7 +945,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; @@ -1062,7 +1055,6 @@ namespace System [Serializable] public class Tuple<T1, T2, T3, T4, T5, T6, T7, TRest> : IStructuralEquatable, IStructuralComparable, IComparable, ITupleInternal, ITuple { - private readonly T1 m_Item1; private readonly T2 m_Item2; private readonly T3 m_Item3; @@ -1085,7 +1077,7 @@ namespace System { if (!(rest is ITupleInternal)) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleLastArgumentNotATuple")); + throw new ArgumentException(SR.ArgumentException_TupleLastArgumentNotATuple); } m_Item1 = item1; @@ -1130,7 +1122,7 @@ namespace System if (objTuple == null) { - throw new ArgumentException(Environment.GetResourceString("ArgumentException_TupleIncorrectType", this.GetType().ToString()), "other"); + throw new ArgumentException(SR.Format(SR.ArgumentException_TupleIncorrectType, this.GetType().ToString()), "other"); } int c = 0; |