Tuples: shorten names for well-known ValueTuple types and members

docs/features/tuples.work.md

@@ -12,7 +12,7 @@ This is the TODO list for the development of the tuples language feature for C#
 - [ ] Validation with other C# features (evaluation order, dynamic, unsafe code/pointers, optional parameter constants, nullable)
 - [ ] Semantic info and other IDE stuff
     - [ ] Debugger / watch window / expression evaluation / EnC
-- [ ] Update well-known tuple types to TN naming convention
+- [x] Update well-known tuple types to TN naming convention
 - [ ] Generating and loading metadata for user-defined member names
 - [ ] Figure out full behavior for reserved member names
 - [ ] Support tuples 8+

src/Compilers/CSharp/Portable/Symbols/TupleTypeSymbol.cs

@@ -208,7 +208,7 @@ private static NamedTypeSymbol GetTupleUnderlyingType(ImmutableArray<TypeSymbol>
         /// <summary>
         /// Find the well-known ValueTuple type of a given arity.
         /// For example, for arity=2:
-        /// returns WellKnownType.System_ValueTuple_T1_T2
+        /// returns WellKnownType.System_ValueTuple_T2
         /// </summary>
         private static WellKnownType GetTupleType(int arity)
         {
@@ -221,22 +221,22 @@ private static WellKnownType GetTupleType(int arity)
 
         private static readonly WellKnownType[] tupleTypes = {
                                                             WellKnownType.System_ValueTuple_T1,
-                                                            WellKnownType.System_ValueTuple_T1_T2,
-                                                            WellKnownType.System_ValueTuple_T1_T2_T3,
-                                                            WellKnownType.System_ValueTuple_T1_T2_T3_T4,
-                                                            WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5,
-                                                            WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6,
-                                                            WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7,
-                                                            WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest };
+                                                            WellKnownType.System_ValueTuple_T2,
+                                                            WellKnownType.System_ValueTuple_T3,
+                                                            WellKnownType.System_ValueTuple_T4,
+                                                            WellKnownType.System_ValueTuple_T5,
+                                                            WellKnownType.System_ValueTuple_T6,
+                                                            WellKnownType.System_ValueTuple_T7,
+                                                            WellKnownType.System_ValueTuple_TRest };
 
         /// <summary>
         /// Find the constructor for a well-known ValueTuple type of a given arity.
         ///
         /// For example, for arity=2:
-        /// returns WellKnownMember.System_ValueTuple_T1_T2__ctor
+        /// returns WellKnownMember.System_ValueTuple_T2__ctor
         ///
         /// For arity=12:
-        /// return System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__ctor
+        /// return System_ValueTuple_TRest__ctor
         /// </summary>
         internal static WellKnownMember GetTupleCtor(int arity)
         {
@@ -249,18 +249,18 @@ internal static WellKnownMember GetTupleCtor(int arity)
 
         private static readonly WellKnownMember[] tupleCtors = {
                                                             WellKnownMember.System_ValueTuple_T1__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__ctor,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__ctor };
+                                                            WellKnownMember.System_ValueTuple_T2__ctor,
+                                                            WellKnownMember.System_ValueTuple_T3__ctor,
+                                                            WellKnownMember.System_ValueTuple_T4__ctor,
+                                                            WellKnownMember.System_ValueTuple_T5__ctor,
+                                                            WellKnownMember.System_ValueTuple_T6__ctor,
+                                                            WellKnownMember.System_ValueTuple_T7__ctor,
+                                                            WellKnownMember.System_ValueTuple_TRest__ctor };
 
         /// <summary>
         /// Find the well-known members to the ValueTuple type of a given arity and position.
         /// For example, for arity=3 and position=1:
-        /// returns WellKnownMember.System_ValueTuple_T1_T2_T3__Item1
+        /// returns WellKnownMember.System_ValueTuple_T3__Item1
         /// </summary>
         internal static WellKnownMember GetTupleTypeMember(int arity, int position)
         {
@@ -272,53 +272,53 @@ internal static WellKnownMember GetTupleTypeMember(int arity, int position)
                                                             WellKnownMember.System_ValueTuple_T1__Item1 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2__Item2 },
+                                                            WellKnownMember.System_ValueTuple_T2__Item1,
+                                                            WellKnownMember.System_ValueTuple_T2__Item2 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3__Item2,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3__Item3 },
+                                                            WellKnownMember.System_ValueTuple_T3__Item1,
+                                                            WellKnownMember.System_ValueTuple_T3__Item2,
+                                                            WellKnownMember.System_ValueTuple_T3__Item3 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4 },
+                                                            WellKnownMember.System_ValueTuple_T4__Item1,
+                                                            WellKnownMember.System_ValueTuple_T4__Item2,
+                                                            WellKnownMember.System_ValueTuple_T4__Item3,
+                                                            WellKnownMember.System_ValueTuple_T4__Item4 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5 },
+                                                            WellKnownMember.System_ValueTuple_T5__Item1,
+                                                            WellKnownMember.System_ValueTuple_T5__Item2,
+                                                            WellKnownMember.System_ValueTuple_T5__Item3,
+                                                            WellKnownMember.System_ValueTuple_T5__Item4,
+                                                            WellKnownMember.System_ValueTuple_T5__Item5 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6 },
+                                                            WellKnownMember.System_ValueTuple_T6__Item1,
+                                                            WellKnownMember.System_ValueTuple_T6__Item2,
+                                                            WellKnownMember.System_ValueTuple_T6__Item3,
+                                                            WellKnownMember.System_ValueTuple_T6__Item4,
+                                                            WellKnownMember.System_ValueTuple_T6__Item5,
+                                                            WellKnownMember.System_ValueTuple_T6__Item6 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7 },
+                                                            WellKnownMember.System_ValueTuple_T7__Item1,
+                                                            WellKnownMember.System_ValueTuple_T7__Item2,
+                                                            WellKnownMember.System_ValueTuple_T7__Item3,
+                                                            WellKnownMember.System_ValueTuple_T7__Item4,
+                                                            WellKnownMember.System_ValueTuple_T7__Item5,
+                                                            WellKnownMember.System_ValueTuple_T7__Item6,
+                                                            WellKnownMember.System_ValueTuple_T7__Item7 },
 
                                                         new[]{
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7,
-                                                            WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest }
+                                                            WellKnownMember.System_ValueTuple_TRest__Item1,
+                                                            WellKnownMember.System_ValueTuple_TRest__Item2,
+                                                            WellKnownMember.System_ValueTuple_TRest__Item3,
+                                                            WellKnownMember.System_ValueTuple_TRest__Item4,
+                                                            WellKnownMember.System_ValueTuple_TRest__Item5,
+                                                            WellKnownMember.System_ValueTuple_TRest__Item6,
+                                                            WellKnownMember.System_ValueTuple_TRest__Item7,
+                                                            WellKnownMember.System_ValueTuple_TRest__Rest }
         };
 
         /// <summary>

src/Compilers/CSharp/Test/Semantic/Semantics/ValueTupleTests.cs

@@ -80,81 +80,81 @@ struct ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>
                 comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1__Item1).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2>.Item1", 
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T2__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T2__Item2).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2, T3>.Item1",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T3__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2, T3>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T3__Item2).ToTestDisplayString());
             Assert.Equal("T3 System.ValueTuple<T1, T2, T3>.Item3",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item3).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T3__Item3).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2, T3, T4>.Item1",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2, T3, T4>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item2).ToTestDisplayString());
             Assert.Equal("T3 System.ValueTuple<T1, T2, T3, T4>.Item3",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item3).ToTestDisplayString());
             Assert.Equal("T4 System.ValueTuple<T1, T2, T3, T4>.Item4",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item4).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2, T3, T4, T5>.Item1",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2, T3, T4, T5>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item2).ToTestDisplayString());
             Assert.Equal("T3 System.ValueTuple<T1, T2, T3, T4, T5>.Item3",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item3).ToTestDisplayString());
             Assert.Equal("T4 System.ValueTuple<T1, T2, T3, T4, T5>.Item4",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item4).ToTestDisplayString());
             Assert.Equal("T5 System.ValueTuple<T1, T2, T3, T4, T5>.Item5",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item5).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2, T3, T4, T5, T6>.Item1",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2, T3, T4, T5, T6>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item2).ToTestDisplayString());
             Assert.Equal("T3 System.ValueTuple<T1, T2, T3, T4, T5, T6>.Item3",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item3).ToTestDisplayString());
             Assert.Equal("T4 System.ValueTuple<T1, T2, T3, T4, T5, T6>.Item4",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item4).ToTestDisplayString());
             Assert.Equal("T5 System.ValueTuple<T1, T2, T3, T4, T5, T6>.Item5",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item5).ToTestDisplayString());
             Assert.Equal("T6 System.ValueTuple<T1, T2, T3, T4, T5, T6>.Item6",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item6).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item1",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item2).ToTestDisplayString());
             Assert.Equal("T3 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item3",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item3).ToTestDisplayString());
             Assert.Equal("T4 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item4",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item4).ToTestDisplayString());
             Assert.Equal("T5 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item5",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item5).ToTestDisplayString());
             Assert.Equal("T6 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item6",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item6).ToTestDisplayString());
             Assert.Equal("T7 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7>.Item7",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item7).ToTestDisplayString());
 
             Assert.Equal("T1 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item1",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item1).ToTestDisplayString());
             Assert.Equal("T2 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item2",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item2).ToTestDisplayString());
             Assert.Equal("T3 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item3",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item3).ToTestDisplayString());
             Assert.Equal("T4 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item4",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item4).ToTestDisplayString());
             Assert.Equal("T5 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item5",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item5).ToTestDisplayString());
             Assert.Equal("T6 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item6",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item6).ToTestDisplayString());
             Assert.Equal("T7 System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Item7",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item7).ToTestDisplayString());
             Assert.Equal("TRest System.ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>.Rest",
-                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7).ToTestDisplayString());
+                comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item7).ToTestDisplayString());
         }
 
         [Fact]
@@ -164,51 +164,51 @@ public void TestMissingWellKnownMembersForValueTuple()
             Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1).IsErrorType());
             Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1__Item1));
 
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2__Item2));
-
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2_T3).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item2));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item3));
-
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2_T3_T4).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4));
-
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5));
-
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6));
-
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7));
-
-            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest).IsErrorType());
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7));
-            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest));
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T2).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T2__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T2__Item2));
+
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T3).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T3__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T3__Item2));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T3__Item3));
+
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T4).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item2));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item3));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T4__Item4));
+
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T5).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item2));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item3));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item4));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T5__Item5));
+
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T6).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item2));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item3));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item4));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T6__Item6));
+
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_T7).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item2));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item3));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item4));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item6));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T7__Item7));
+
+            Assert.True(comp.GetWellKnownType(WellKnownType.System_ValueTuple_TRest).IsErrorType());
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item1));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item2));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item3));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item4));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item6));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Item7));
+            Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_TRest__Rest));
         }
     }
 }

src/Compilers/CSharp/Test/Symbol/Symbols/MissingSpecialMember.cs

@@ -558,13 +558,13 @@ public void AllWellKnownTypes()
                     case WellKnownType.System_FormattableString:
                     case WellKnownType.System_Runtime_CompilerServices_FormattableStringFactory:
                     case WellKnownType.System_ValueTuple_T1:
-                    case WellKnownType.System_ValueTuple_T1_T2:
-                    case WellKnownType.System_ValueTuple_T1_T2_T3:
-                    case WellKnownType.System_ValueTuple_T1_T2_T3_T4:
-                    case WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5:
-                    case WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6:
-                    case WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7:
-                    case WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest:
+                    case WellKnownType.System_ValueTuple_T2:
+                    case WellKnownType.System_ValueTuple_T3:
+                    case WellKnownType.System_ValueTuple_T4:
+                    case WellKnownType.System_ValueTuple_T5:
+                    case WellKnownType.System_ValueTuple_T6:
+                    case WellKnownType.System_ValueTuple_T7:
+                    case WellKnownType.System_ValueTuple_TRest:
                         // PROTOTYPE(tuples)
                         // Not yet in the platform.
                         continue;
@@ -611,56 +611,56 @@ public void AllWellKnownTypeMembers()
 
                     case WellKnownMember.System_ValueTuple_T1__Item1:
 
-                    case WellKnownMember.System_ValueTuple_T1_T2__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2__Item2:
-
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3__Item2:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3__Item3:
-
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4:
-
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5:
-
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6:
-
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7:
-
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest:
+                    case WellKnownMember.System_ValueTuple_T2__Item1:
+                    case WellKnownMember.System_ValueTuple_T2__Item2:
+
+                    case WellKnownMember.System_ValueTuple_T3__Item1:
+                    case WellKnownMember.System_ValueTuple_T3__Item2:
+                    case WellKnownMember.System_ValueTuple_T3__Item3:
+
+                    case WellKnownMember.System_ValueTuple_T4__Item1:
+                    case WellKnownMember.System_ValueTuple_T4__Item2:
+                    case WellKnownMember.System_ValueTuple_T4__Item3:
+                    case WellKnownMember.System_ValueTuple_T4__Item4:
+
+                    case WellKnownMember.System_ValueTuple_T5__Item1:
+                    case WellKnownMember.System_ValueTuple_T5__Item2:
+                    case WellKnownMember.System_ValueTuple_T5__Item3:
+                    case WellKnownMember.System_ValueTuple_T5__Item4:
+                    case WellKnownMember.System_ValueTuple_T5__Item5:
+
+                    case WellKnownMember.System_ValueTuple_T6__Item1:
+                    case WellKnownMember.System_ValueTuple_T6__Item2:
+                    case WellKnownMember.System_ValueTuple_T6__Item3:
+                    case WellKnownMember.System_ValueTuple_T6__Item4:
+                    case WellKnownMember.System_ValueTuple_T6__Item5:
+                    case WellKnownMember.System_ValueTuple_T6__Item6:
+
+                    case WellKnownMember.System_ValueTuple_T7__Item1:
+                    case WellKnownMember.System_ValueTuple_T7__Item2:
+                    case WellKnownMember.System_ValueTuple_T7__Item3:
+                    case WellKnownMember.System_ValueTuple_T7__Item4:
+                    case WellKnownMember.System_ValueTuple_T7__Item5:
+                    case WellKnownMember.System_ValueTuple_T7__Item6:
+                    case WellKnownMember.System_ValueTuple_T7__Item7:
+
+                    case WellKnownMember.System_ValueTuple_TRest__Item1:
+                    case WellKnownMember.System_ValueTuple_TRest__Item2:
+                    case WellKnownMember.System_ValueTuple_TRest__Item3:
+                    case WellKnownMember.System_ValueTuple_TRest__Item4:
+                    case WellKnownMember.System_ValueTuple_TRest__Item5:
+                    case WellKnownMember.System_ValueTuple_TRest__Item6:
+                    case WellKnownMember.System_ValueTuple_TRest__Item7:
+                    case WellKnownMember.System_ValueTuple_TRest__Rest:
 
                     case WellKnownMember.System_ValueTuple_T1__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__ctor:
-                    case WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__ctor:
+                    case WellKnownMember.System_ValueTuple_T2__ctor:
+                    case WellKnownMember.System_ValueTuple_T3__ctor:
+                    case WellKnownMember.System_ValueTuple_T4__ctor:
+                    case WellKnownMember.System_ValueTuple_T5__ctor:
+                    case WellKnownMember.System_ValueTuple_T6__ctor:
+                    case WellKnownMember.System_ValueTuple_T7__ctor:
+                    case WellKnownMember.System_ValueTuple_TRest__ctor:
 
                         // PROTOTYPE(tuples) tuples
                         // Not yet in the platform.

src/Compilers/Core/Portable/WellKnownMember.cs

@@ -356,56 +356,56 @@ internal enum WellKnownMember
 
         System_ValueTuple_T1__Item1,
 
-        System_ValueTuple_T1_T2__Item1,
-        System_ValueTuple_T1_T2__Item2,
-
-        System_ValueTuple_T1_T2_T3__Item1,
-        System_ValueTuple_T1_T2_T3__Item2,
-        System_ValueTuple_T1_T2_T3__Item3,
-
-        System_ValueTuple_T1_T2_T3_T4__Item1,
-        System_ValueTuple_T1_T2_T3_T4__Item2,
-        System_ValueTuple_T1_T2_T3_T4__Item3,
-        System_ValueTuple_T1_T2_T3_T4__Item4,
-
-        System_ValueTuple_T1_T2_T3_T4_T5__Item1,
-        System_ValueTuple_T1_T2_T3_T4_T5__Item2,
-        System_ValueTuple_T1_T2_T3_T4_T5__Item3,
-        System_ValueTuple_T1_T2_T3_T4_T5__Item4,
-        System_ValueTuple_T1_T2_T3_T4_T5__Item5,
-
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6,
-
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7,
-
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest,
+        System_ValueTuple_T2__Item1,
+        System_ValueTuple_T2__Item2,
+
+        System_ValueTuple_T3__Item1,
+        System_ValueTuple_T3__Item2,
+        System_ValueTuple_T3__Item3,
+
+        System_ValueTuple_T4__Item1,
+        System_ValueTuple_T4__Item2,
+        System_ValueTuple_T4__Item3,
+        System_ValueTuple_T4__Item4,
+
+        System_ValueTuple_T5__Item1,
+        System_ValueTuple_T5__Item2,
+        System_ValueTuple_T5__Item3,
+        System_ValueTuple_T5__Item4,
+        System_ValueTuple_T5__Item5,
+
+        System_ValueTuple_T6__Item1,
+        System_ValueTuple_T6__Item2,
+        System_ValueTuple_T6__Item3,
+        System_ValueTuple_T6__Item4,
+        System_ValueTuple_T6__Item5,
+        System_ValueTuple_T6__Item6,
+
+        System_ValueTuple_T7__Item1,
+        System_ValueTuple_T7__Item2,
+        System_ValueTuple_T7__Item3,
+        System_ValueTuple_T7__Item4,
+        System_ValueTuple_T7__Item5,
+        System_ValueTuple_T7__Item6,
+        System_ValueTuple_T7__Item7,
+
+        System_ValueTuple_TRest__Item1,
+        System_ValueTuple_TRest__Item2,
+        System_ValueTuple_TRest__Item3,
+        System_ValueTuple_TRest__Item4,
+        System_ValueTuple_TRest__Item5,
+        System_ValueTuple_TRest__Item6,
+        System_ValueTuple_TRest__Item7,
+        System_ValueTuple_TRest__Rest,
 
         System_ValueTuple_T1__ctor,
-        System_ValueTuple_T1_T2__ctor,
-        System_ValueTuple_T1_T2_T3__ctor,
-        System_ValueTuple_T1_T2_T3_T4__ctor,
-        System_ValueTuple_T1_T2_T3_T4_T5__ctor,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6__ctor,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__ctor,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__ctor,
+        System_ValueTuple_T2__ctor,
+        System_ValueTuple_T3__ctor,
+        System_ValueTuple_T4__ctor,
+        System_ValueTuple_T5__ctor,
+        System_ValueTuple_T6__ctor,
+        System_ValueTuple_T7__ctor,
+        System_ValueTuple_TRest__ctor,
 
         System_String__Format_IFormatProvider,
         Count

src/Compilers/Core/Portable/WellKnownTypes.cs

@@ -246,16 +246,16 @@ internal enum WellKnownType
         System_Runtime_GCLatencyMode,
 
         System_ValueTuple_T1,
-        System_ValueTuple_T1_T2,
-        System_ValueTuple_T1_T2_T3,
-        System_ValueTuple_T1_T2_T3_T4,
-        System_ValueTuple_T1_T2_T3_T4_T5,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6,
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7,
+        System_ValueTuple_T2,
+        System_ValueTuple_T3,
+        System_ValueTuple_T4,
+        System_ValueTuple_T5,
+        System_ValueTuple_T6,
+        System_ValueTuple_T7,
 
         ExtSentinel, // Not a real type, just a marker for types above 255 and strictly below 512
 
-        System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest,
+        System_ValueTuple_TRest,
 
         System_IFormatProvider,
 

src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WellKnownTypeValidationTests.vb

@@ -501,13 +501,13 @@ End Namespace
                     Case WellKnownType.System_FormattableString,
                          WellKnownType.System_Runtime_CompilerServices_FormattableStringFactory,
                          WellKnownType.System_ValueTuple_T1,
-                         WellKnownType.System_ValueTuple_T1_T2,
-                         WellKnownType.System_ValueTuple_T1_T2_T3,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest ' PROTOTYPE(tuples)
+                         WellKnownType.System_ValueTuple_T2,
+                         WellKnownType.System_ValueTuple_T3,
+                         WellKnownType.System_ValueTuple_T4,
+                         WellKnownType.System_ValueTuple_T5,
+                         WellKnownType.System_ValueTuple_T6,
+                         WellKnownType.System_ValueTuple_T7,
+                         WellKnownType.System_ValueTuple_TRest ' PROTOTYPE(tuples)
                         ' Not available on all platforms.
                         Continue For
                     Case WellKnownType.ExtSentinel
@@ -541,13 +541,13 @@ End Namespace
                     Case WellKnownType.System_FormattableString,
                          WellKnownType.System_Runtime_CompilerServices_FormattableStringFactory,
                          WellKnownType.System_ValueTuple_T1,
-                         WellKnownType.System_ValueTuple_T1_T2,
-                         WellKnownType.System_ValueTuple_T1_T2_T3,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7,
-                         WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest ' PROTOTYPE(tuples)
+                         WellKnownType.System_ValueTuple_T2,
+                         WellKnownType.System_ValueTuple_T3,
+                         WellKnownType.System_ValueTuple_T4,
+                         WellKnownType.System_ValueTuple_T5,
+                         WellKnownType.System_ValueTuple_T6,
+                         WellKnownType.System_ValueTuple_T7,
+                         WellKnownType.System_ValueTuple_TRest ' PROTOTYPE(tuples)
                         ' Not available on all platforms.
                         Continue For
                     Case WellKnownType.ExtSentinel
@@ -586,49 +586,49 @@ End Namespace
                         Continue For
                     Case WellKnownMember.System_Array__Empty,
                          WellKnownMember.System_ValueTuple_T1__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest,
+                         WellKnownMember.System_ValueTuple_T2__Item1,
+                         WellKnownMember.System_ValueTuple_T2__Item2,
+                         WellKnownMember.System_ValueTuple_T3__Item1,
+                         WellKnownMember.System_ValueTuple_T3__Item2,
+                         WellKnownMember.System_ValueTuple_T3__Item3,
+                         WellKnownMember.System_ValueTuple_T4__Item1,
+                         WellKnownMember.System_ValueTuple_T4__Item2,
+                         WellKnownMember.System_ValueTuple_T4__Item3,
+                         WellKnownMember.System_ValueTuple_T4__Item4,
+                         WellKnownMember.System_ValueTuple_T5__Item1,
+                         WellKnownMember.System_ValueTuple_T5__Item2,
+                         WellKnownMember.System_ValueTuple_T5__Item3,
+                         WellKnownMember.System_ValueTuple_T5__Item4,
+                         WellKnownMember.System_ValueTuple_T5__Item5,
+                         WellKnownMember.System_ValueTuple_T6__Item1,
+                         WellKnownMember.System_ValueTuple_T6__Item2,
+                         WellKnownMember.System_ValueTuple_T6__Item3,
+                         WellKnownMember.System_ValueTuple_T6__Item4,
+                         WellKnownMember.System_ValueTuple_T6__Item5,
+                         WellKnownMember.System_ValueTuple_T6__Item6,
+                         WellKnownMember.System_ValueTuple_T7__Item1,
+                         WellKnownMember.System_ValueTuple_T7__Item2,
+                         WellKnownMember.System_ValueTuple_T7__Item3,
+                         WellKnownMember.System_ValueTuple_T7__Item4,
+                         WellKnownMember.System_ValueTuple_T7__Item5,
+                         WellKnownMember.System_ValueTuple_T7__Item6,
+                         WellKnownMember.System_ValueTuple_T7__Item7,
+                         WellKnownMember.System_ValueTuple_TRest__Item1,
+                         WellKnownMember.System_ValueTuple_TRest__Item2,
+                         WellKnownMember.System_ValueTuple_TRest__Item3,
+                         WellKnownMember.System_ValueTuple_TRest__Item4,
+                         WellKnownMember.System_ValueTuple_TRest__Item5,
+                         WellKnownMember.System_ValueTuple_TRest__Item6,
+                         WellKnownMember.System_ValueTuple_TRest__Item7,
+                         WellKnownMember.System_ValueTuple_TRest__Rest,
                          WellKnownMember.System_ValueTuple_T1__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__ctor
+                         WellKnownMember.System_ValueTuple_T2__ctor,
+                         WellKnownMember.System_ValueTuple_T3__ctor,
+                         WellKnownMember.System_ValueTuple_T4__ctor,
+                         WellKnownMember.System_ValueTuple_T5__ctor,
+                         WellKnownMember.System_ValueTuple_T6__ctor,
+                         WellKnownMember.System_ValueTuple_T7__ctor,
+                         WellKnownMember.System_ValueTuple_TRest__ctor
 
                         ' PROTOTYPE(tuples)
                         ' Not available yet, but will be in upcoming release.
@@ -709,49 +709,49 @@ End Namespace
                         Continue For
                     Case WellKnownMember.System_Array__Empty,
                          WellKnownMember.System_ValueTuple_T1__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest,
+                         WellKnownMember.System_ValueTuple_T2__Item1,
+                         WellKnownMember.System_ValueTuple_T2__Item2,
+                         WellKnownMember.System_ValueTuple_T3__Item1,
+                         WellKnownMember.System_ValueTuple_T3__Item2,
+                         WellKnownMember.System_ValueTuple_T3__Item3,
+                         WellKnownMember.System_ValueTuple_T4__Item1,
+                         WellKnownMember.System_ValueTuple_T4__Item2,
+                         WellKnownMember.System_ValueTuple_T4__Item3,
+                         WellKnownMember.System_ValueTuple_T4__Item4,
+                         WellKnownMember.System_ValueTuple_T5__Item1,
+                         WellKnownMember.System_ValueTuple_T5__Item2,
+                         WellKnownMember.System_ValueTuple_T5__Item3,
+                         WellKnownMember.System_ValueTuple_T5__Item4,
+                         WellKnownMember.System_ValueTuple_T5__Item5,
+                         WellKnownMember.System_ValueTuple_T6__Item1,
+                         WellKnownMember.System_ValueTuple_T6__Item2,
+                         WellKnownMember.System_ValueTuple_T6__Item3,
+                         WellKnownMember.System_ValueTuple_T6__Item4,
+                         WellKnownMember.System_ValueTuple_T6__Item5,
+                         WellKnownMember.System_ValueTuple_T6__Item6,
+                         WellKnownMember.System_ValueTuple_T7__Item1,
+                         WellKnownMember.System_ValueTuple_T7__Item2,
+                         WellKnownMember.System_ValueTuple_T7__Item3,
+                         WellKnownMember.System_ValueTuple_T7__Item4,
+                         WellKnownMember.System_ValueTuple_T7__Item5,
+                         WellKnownMember.System_ValueTuple_T7__Item6,
+                         WellKnownMember.System_ValueTuple_T7__Item7,
+                         WellKnownMember.System_ValueTuple_TRest__Item1,
+                         WellKnownMember.System_ValueTuple_TRest__Item2,
+                         WellKnownMember.System_ValueTuple_TRest__Item3,
+                         WellKnownMember.System_ValueTuple_TRest__Item4,
+                         WellKnownMember.System_ValueTuple_TRest__Item5,
+                         WellKnownMember.System_ValueTuple_TRest__Item6,
+                         WellKnownMember.System_ValueTuple_TRest__Item7,
+                         WellKnownMember.System_ValueTuple_TRest__Rest,
                          WellKnownMember.System_ValueTuple_T1__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__ctor,
-                         WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__ctor
+                         WellKnownMember.System_ValueTuple_T2__ctor,
+                         WellKnownMember.System_ValueTuple_T3__ctor,
+                         WellKnownMember.System_ValueTuple_T4__ctor,
+                         WellKnownMember.System_ValueTuple_T5__ctor,
+                         WellKnownMember.System_ValueTuple_T6__ctor,
+                         WellKnownMember.System_ValueTuple_T7__ctor,
+                         WellKnownMember.System_ValueTuple_TRest__ctor
 
                         ' PROTOTYPE(tuples)
                         ' Not available yet, but will be in upcoming release.