From 00477a795a468f7f893347b149b0ddb8aac225df Mon Sep 17 00:00:00 2001 From: Julien Couvreur Date: Thu, 24 Mar 2016 15:38:02 -0700 Subject: [PATCH] Tuples: rename namespace to System.ValueTuple --- .../Portable/Symbols/TupleTypeSymbol.cs | 74 ++--- .../Test/Emit/CodeGen/CodeGenTupleTest.cs | 138 +++++----- .../Semantic/Semantics/SemanticErrorTests.cs | 12 +- .../Semantic/Semantics/ValueTupleTests.cs | 256 +++++++++--------- .../Symbol/Symbols/MissingSpecialMember.cs | 102 +++---- .../Core/Portable/WellKnownMember.cs | 86 +++--- .../Core/Portable/WellKnownMembers.cs | 230 ++++++++-------- src/Compilers/Core/Portable/WellKnownTypes.cs | 32 +-- .../WellKnownTypeValidationTests.vb | 176 ++++++------ 9 files changed, 553 insertions(+), 553 deletions(-) diff --git a/src/Compilers/CSharp/Portable/Symbols/TupleTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/TupleTypeSymbol.cs index bf50cd55fe1..ce10c0e5411 100644 --- a/src/Compilers/CSharp/Portable/Symbols/TupleTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/TupleTypeSymbol.cs @@ -103,7 +103,7 @@ internal static TupleTypeSymbol ConstructTupleTypeSymbol(TupleTypeSymbol origina /// /// Find the well-known ValueTuple type of a given arity. /// For example, for arity=2: - /// returns WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2 + /// returns WellKnownType.System_ValueTuple_T1_T2 /// private static WellKnownType GetTupleType(int arity) { @@ -116,18 +116,18 @@ private static WellKnownType GetTupleType(int arity) } private static readonly WellKnownType[] tupleTypes = { - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7 }; + 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 }; /// /// Find the well-known members to the ValueTuple type of a given arity and index/position. /// For example, for arity=3 and position=0: - /// returns WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1 + /// returns WellKnownMember.System_ValueTuple_T1_T2_T3__Item1 /// private static WellKnownMember GetTupleTypeMember(int arity, int position) { @@ -136,46 +136,46 @@ private static WellKnownMember GetTupleTypeMember(int arity, int position) private static readonly WellKnownMember[][] tupleMembers = new[]{ new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1__Item1 }, + WellKnownMember.System_ValueTuple_T1__Item1 }, new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2 }, + WellKnownMember.System_ValueTuple_T1_T2__Item1, + WellKnownMember.System_ValueTuple_T1_T2__Item2 }, new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3 }, + WellKnownMember.System_ValueTuple_T1_T2_T3__Item1, + WellKnownMember.System_ValueTuple_T1_T2_T3__Item2, + WellKnownMember.System_ValueTuple_T1_T2_T3__Item3 }, new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4 }, + 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 }, new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5 }, + 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 }, new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6 }, + 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 }, new[]{ - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7 } + 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 } }; /// diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs index ab9c836f18d..64972fcf06a 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs @@ -17,7 +17,7 @@ public class CodeGenTupleTests : CSharpTestBase @" // PROTOTYPE: put in correct namespace -namespace System.Runtime.CompilerServices +namespace System { // struct with two values public struct ValueTuple @@ -44,7 +44,7 @@ public override string ToString() @" // PROTOTYPE: put in correct namespace - namespace System.Runtime.CompilerServices + namespace System { // struct with two values public struct ValueTuple @@ -88,13 +88,13 @@ static void Main() { // Code size 28 (0x1c) .maxstack 3 - .locals init (System.Runtime.CompilerServices.ValueTuple V_0) //x + .locals init (System.ValueTuple V_0) //x IL_0000: ldloca.s V_0 IL_0002: ldc.i4.1 IL_0003: ldc.i4.2 - IL_0004: call ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" + IL_0004: call ""System.ValueTuple..ctor(int, int)"" IL_0009: ldloca.s V_0 - IL_000b: constrained. ""System.Runtime.CompilerServices.ValueTuple"" + IL_000b: constrained. ""System.ValueTuple"" IL_0011: callvirt ""string object.ToString()"" IL_0016: call ""void System.Console.WriteLine(string)"" IL_001b: ret @@ -121,22 +121,22 @@ static void Main() { // Code size 54 (0x36) .maxstack 5 - .locals init (System.Runtime.CompilerServices.ValueTuple V_0, //x - System.Runtime.CompilerServices.ValueTuple> V_1) + .locals init (System.ValueTuple V_0, //x + System.ValueTuple> V_1) IL_0000: ldloca.s V_0 IL_0002: ldc.i4.1 IL_0003: ldc.i4.2 IL_0004: ldc.i4.3 IL_0005: ldc.i4.4 - IL_0006: newobj ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" - IL_000b: newobj ""System.Runtime.CompilerServices.ValueTuple>..ctor(int, )"" + IL_0006: newobj ""System.ValueTuple..ctor(int, int)"" + IL_000b: newobj ""System.ValueTuple>..ctor(int, )"" IL_0010: stloc.1 IL_0011: ldloca.s V_1 - IL_0013: constrained. ""System.Runtime.CompilerServices.ValueTuple>"" + IL_0013: constrained. ""System.ValueTuple>"" IL_0019: callvirt ""string object.ToString()"" - IL_001e: call ""System.Runtime.CompilerServices.ValueTuple..ctor(int, string)"" + IL_001e: call ""System.ValueTuple..ctor(int, string)"" IL_0023: ldloca.s V_0 - IL_0025: constrained. ""System.Runtime.CompilerServices.ValueTuple"" + IL_0025: constrained. ""System.ValueTuple"" IL_002b: callvirt ""string object.ToString()"" IL_0030: call ""void System.Console.WriteLine(string)"" IL_0035: ret @@ -166,22 +166,22 @@ static void Main() { // Code size 54 (0x36) .maxstack 3 - .locals init (System.Runtime.CompilerServices.ValueTuple V_0) //x + .locals init (System.ValueTuple V_0) //x IL_0000: ldloca.s V_0 IL_0002: ldc.i4.1 IL_0003: ldc.i4.2 - IL_0004: call ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" + IL_0004: call ""System.ValueTuple..ctor(int, int)"" IL_0009: ldloca.s V_0 - IL_000b: ldflda ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_000b: ldflda ""int System.ValueTuple.Item2"" IL_0010: call ""string int.ToString()"" IL_0015: call ""void System.Console.WriteLine(string)"" IL_001a: ldloca.s V_0 IL_001c: ldc.i4.s 40 - IL_001e: stfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_001e: stfld ""int System.ValueTuple.Item1"" IL_0023: ldloc.0 - IL_0024: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_0024: ldfld ""int System.ValueTuple.Item1"" IL_0029: ldloc.0 - IL_002a: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_002a: ldfld ""int System.ValueTuple.Item2"" IL_002f: add IL_0030: call ""void System.Console.WriteLine(int)"" IL_0035: ret @@ -212,22 +212,22 @@ static void Main() { // Code size 54 (0x36) .maxstack 3 - .locals init (System.Runtime.CompilerServices.ValueTuple V_0) //x + .locals init (System.ValueTuple V_0) //x IL_0000: ldloca.s V_0 IL_0002: ldc.i4.1 IL_0003: ldc.i4.2 - IL_0004: call ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" + IL_0004: call ""System.ValueTuple..ctor(int, int)"" IL_0009: ldloca.s V_0 - IL_000b: ldflda ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_000b: ldflda ""int System.ValueTuple.Item2"" IL_0010: call ""string int.ToString()"" IL_0015: call ""void System.Console.WriteLine(string)"" IL_001a: ldloca.s V_0 IL_001c: ldc.i4.s 40 - IL_001e: stfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_001e: stfld ""int System.ValueTuple.Item1"" IL_0023: ldloc.0 - IL_0024: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_0024: ldfld ""int System.ValueTuple.Item1"" IL_0029: ldloc.0 - IL_002a: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_002a: ldfld ""int System.ValueTuple.Item2"" IL_002f: add IL_0030: call ""void System.Console.WriteLine(int)"" IL_0035: ret @@ -258,22 +258,22 @@ static void Main() { // Code size 54 (0x36) .maxstack 3 - .locals init (System.Runtime.CompilerServices.ValueTuple V_0) //x + .locals init (System.ValueTuple V_0) //x IL_0000: ldloca.s V_0 IL_0002: ldc.i4.1 IL_0003: ldc.i4.2 - IL_0004: call ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" + IL_0004: call ""System.ValueTuple..ctor(int, int)"" IL_0009: ldloca.s V_0 - IL_000b: ldflda ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_000b: ldflda ""int System.ValueTuple.Item2"" IL_0010: call ""string int.ToString()"" IL_0015: call ""void System.Console.WriteLine(string)"" IL_001a: ldloca.s V_0 IL_001c: ldc.i4.s 40 - IL_001e: stfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_001e: stfld ""int System.ValueTuple.Item1"" IL_0023: ldloc.0 - IL_0024: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_0024: ldfld ""int System.ValueTuple.Item1"" IL_0029: ldloc.0 - IL_002a: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_002a: ldfld ""int System.ValueTuple.Item2"" IL_002f: add IL_0030: call ""void System.Console.WriteLine(int)"" IL_0035: ret @@ -304,31 +304,31 @@ static void Main() { // Code size 87 (0x57) .maxstack 4 - .locals init (System.Runtime.CompilerServices.ValueTuple> V_0) //x + .locals init (System.ValueTuple> V_0) //x IL_0000: ldloca.s V_0 IL_0002: ldc.i4.1 IL_0003: ldc.i4.2 IL_0004: ldc.i4.3 - IL_0005: newobj ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" - IL_000a: call ""System.Runtime.CompilerServices.ValueTuple>..ctor(int, )"" + IL_0005: newobj ""System.ValueTuple..ctor(int, int)"" + IL_000a: call ""System.ValueTuple>..ctor(int, )"" IL_000f: ldloca.s V_0 - IL_0011: ldflda "" System.Runtime.CompilerServices.ValueTuple>.Item2"" - IL_0016: ldflda ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_0011: ldflda "" System.ValueTuple>.Item2"" + IL_0016: ldflda ""int System.ValueTuple.Item1"" IL_001b: call ""string int.ToString()"" IL_0020: call ""void System.Console.WriteLine(string)"" IL_0025: ldloca.s V_0 - IL_0027: ldflda "" System.Runtime.CompilerServices.ValueTuple>.Item2"" + IL_0027: ldflda "" System.ValueTuple>.Item2"" IL_002c: ldc.i4.s 39 - IL_002e: stfld ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_002e: stfld ""int System.ValueTuple.Item2"" IL_0033: ldloc.0 - IL_0034: ldfld ""int System.Runtime.CompilerServices.ValueTuple>.Item1"" + IL_0034: ldfld ""int System.ValueTuple>.Item1"" IL_0039: ldloc.0 - IL_003a: ldfld "" System.Runtime.CompilerServices.ValueTuple>.Item2"" - IL_003f: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_003a: ldfld "" System.ValueTuple>.Item2"" + IL_003f: ldfld ""int System.ValueTuple.Item1"" IL_0044: add IL_0045: ldloc.0 - IL_0046: ldfld "" System.Runtime.CompilerServices.ValueTuple>.Item2"" - IL_004b: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_0046: ldfld "" System.ValueTuple>.Item2"" + IL_004b: ldfld ""int System.ValueTuple.Item2"" IL_0050: add IL_0051: call ""void System.Console.WriteLine(int)"" IL_0056: ret @@ -481,27 +481,27 @@ static void Main() { // Code size 67 (0x43) .maxstack 6 - .locals init (System.Runtime.CompilerServices.ValueTuple d>> V_0) //v + .locals init (System.ValueTuple d>> V_0) //v IL_0000: ldc.i4.1 IL_0001: ldc.i4.2 - IL_0002: newobj ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" + IL_0002: newobj ""System.ValueTuple..ctor(int, int)"" IL_0007: ldloca.s V_0 IL_0009: ldc.i4.1 IL_000a: ldc.i4.2 IL_000b: ldc.i4.3 IL_000c: ldc.i4.4 - IL_000d: newobj ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" - IL_0012: newobj ""System.Runtime.CompilerServices.ValueTuple>..ctor(int, )"" - IL_0017: call ""System.Runtime.CompilerServices.ValueTuple d>>..ctor(int, d>)"" + IL_000d: newobj ""System.ValueTuple..ctor(int, int)"" + IL_0012: newobj ""System.ValueTuple>..ctor(int, )"" + IL_0017: call ""System.ValueTuple d>>..ctor(int, d>)"" IL_001c: ldloc.0 IL_001d: call ""System.Collections.Generic.Dictionary<, d> b>> C.Test<, d> b>>(, d> b>)"" IL_0022: ldc.i4.1 IL_0023: ldc.i4.2 - IL_0024: newobj ""System.Runtime.CompilerServices.ValueTuple..ctor(int, int)"" + IL_0024: newobj ""System.ValueTuple..ctor(int, int)"" IL_0029: callvirt "" d> b> System.Collections.Generic.Dictionary<, d> b>>.this[].get"" - IL_002e: ldfld "" d> System.Runtime.CompilerServices.ValueTuple d>>.Item2"" - IL_0033: ldfld "" System.Runtime.CompilerServices.ValueTuple>.Item2"" - IL_0038: ldfld ""int System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_002e: ldfld "" d> System.ValueTuple d>>.Item2"" + IL_0033: ldfld "" System.ValueTuple>.Item2"" + IL_0038: ldfld ""int System.ValueTuple.Item2"" IL_003d: call ""void System.Console.WriteLine(int)"" IL_0042: ret } @@ -540,7 +540,7 @@ public static T Test(T a) .maxstack 1 IL_0000: ldarg.0 IL_0001: ldflda "" C.<>c__DisplayClass1_0.x"" - IL_0006: ldfld ""T System.Runtime.CompilerServices.ValueTuple.Item2"" + IL_0006: ldfld ""T System.ValueTuple.Item2"" IL_000b: ret } "); @@ -595,7 +595,7 @@ .maxstack 3 IL_000c: ldfld ""T C.d__1.a"" IL_0011: ldarg.0 IL_0012: ldfld ""T C.d__1.a"" - IL_0017: newobj ""System.Runtime.CompilerServices.ValueTuple..ctor(T, T)"" + IL_0017: newobj ""System.ValueTuple..ctor(T, T)"" IL_001c: stfld "" C.d__1.5__1"" IL_0021: call ""System.Runtime.CompilerServices.YieldAwaitable System.Threading.Tasks.Task.Yield()"" IL_0026: stloc.3 @@ -636,7 +636,7 @@ .maxstack 3 IL_007d: initobj ""System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter"" IL_0083: ldarg.0 IL_0084: ldflda "" C.d__1.5__1"" - IL_0089: ldfld ""T System.Runtime.CompilerServices.ValueTuple.Item1"" + IL_0089: ldfld ""T System.ValueTuple.Item1"" IL_008e: stloc.1 IL_008f: leave.s IL_00aa } @@ -679,30 +679,30 @@ static void Main() // PROTOTYPE those are not the final diagnostics var comp = CreateCompilationWithMscorlib(source); comp.VerifyDiagnostics( - // (6,9): error CS0518: Predefined type 'System.Runtime.CompilerServices.ValueTuple`2' is not defined or imported + // (6,9): error CS0518: Predefined type 'System.ValueTuple`2' is not defined or imported // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_PredefinedTypeNotFound, "(int, string a)").WithArguments("System.Runtime.CompilerServices.ValueTuple`2").WithLocation(6, 9), - // (6,9): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`2.Item1' + Diagnostic(ErrorCode.ERR_PredefinedTypeNotFound, "(int, string a)").WithArguments("System.ValueTuple`2").WithLocation(6, 9), + // (6,9): error CS0656: Missing compiler required member 'System.ValueTuple`2.Item1' // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(int, string a)").WithArguments("System.Runtime.CompilerServices.ValueTuple`2", "Item1").WithLocation(6, 9), - // (6,9): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`2.Item2' + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(int, string a)").WithArguments("System.ValueTuple`2", "Item1").WithLocation(6, 9), + // (6,9): error CS0656: Missing compiler required member 'System.ValueTuple`2.Item2' // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(int, string a)").WithArguments("System.Runtime.CompilerServices.ValueTuple`2", "Item2").WithLocation(6, 9), + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(int, string a)").WithArguments("System.ValueTuple`2", "Item2").WithLocation(6, 9), // (6,29): error CS8203: Tuple member names must all be provided, if any one is provided. // (int, string a) x = (b: 1, "hello", 2); Diagnostic(ErrorCode.ERR_TupleExplicitNamesOnAllMembersOrNone, @"(b: 1, ""hello"", 2)").WithLocation(6, 29), - // (6,29): error CS0518: Predefined type 'System.Runtime.CompilerServices.ValueTuple`3' is not defined or imported + // (6,29): error CS0518: Predefined type 'System.ValueTuple`3' is not defined or imported // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_PredefinedTypeNotFound, @"(b: 1, ""hello"", 2)").WithArguments("System.Runtime.CompilerServices.ValueTuple`3").WithLocation(6, 29), - // (6,29): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`3.Item1' + Diagnostic(ErrorCode.ERR_PredefinedTypeNotFound, @"(b: 1, ""hello"", 2)").WithArguments("System.ValueTuple`3").WithLocation(6, 29), + // (6,29): error CS0656: Missing compiler required member 'System.ValueTuple`3.Item1' // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, @"(b: 1, ""hello"", 2)").WithArguments("System.Runtime.CompilerServices.ValueTuple`3", "Item1").WithLocation(6, 29), - // (6,29): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`3.Item2' + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, @"(b: 1, ""hello"", 2)").WithArguments("System.ValueTuple`3", "Item1").WithLocation(6, 29), + // (6,29): error CS0656: Missing compiler required member 'System.ValueTuple`3.Item2' // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, @"(b: 1, ""hello"", 2)").WithArguments("System.Runtime.CompilerServices.ValueTuple`3", "Item2").WithLocation(6, 29), - // (6,29): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`3.Item3' + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, @"(b: 1, ""hello"", 2)").WithArguments("System.ValueTuple`3", "Item2").WithLocation(6, 29), + // (6,29): error CS0656: Missing compiler required member 'System.ValueTuple`3.Item3' // (int, string a) x = (b: 1, "hello", 2); - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, @"(b: 1, ""hello"", 2)").WithArguments("System.Runtime.CompilerServices.ValueTuple`3", "Item3").WithLocation(6, 29), + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, @"(b: 1, ""hello"", 2)").WithArguments("System.ValueTuple`3", "Item3").WithLocation(6, 29), // (6,29): error CS8204: PROTOTYPE This is not supported yet. // (int, string a) x = (b: 1, "hello", 2); Diagnostic(ErrorCode.ERR_PrototypeNotYetImplemented, @"(b: 1, ""hello"", 2)").WithLocation(6, 29)); @@ -892,7 +892,7 @@ public void Tuple2To7Members() { var source = trivial2uple + trivial3uple + @" -namespace System.Runtime.CompilerServices +namespace System { public struct ValueTuple { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/SemanticErrorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/SemanticErrorTests.cs index 3fb936419dd..563823ef1a5 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/SemanticErrorTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/SemanticErrorTests.cs @@ -7192,15 +7192,15 @@ public static int Main() // (7,13): error CS0246: The type or namespace name 'b' could not be found (are you missing a using directive or an assembly reference?) // (a, b) => Diagnostic(ErrorCode.ERR_SingleTypeNameNotFound, "b").WithArguments("b").WithLocation(7, 13), - // (7,9): error CS0518: Predefined type 'System.Runtime.CompilerServices.ValueTuple`2' is not defined or imported + // (7,9): error CS0518: Predefined type 'System.ValueTuple`2' is not defined or imported // (a, b) => - Diagnostic(ErrorCode.ERR_PredefinedTypeNotFound, "(a, b)").WithArguments("System.Runtime.CompilerServices.ValueTuple`2").WithLocation(7, 9), - // (7,9): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`2.Item1' + Diagnostic(ErrorCode.ERR_PredefinedTypeNotFound, "(a, b)").WithArguments("System.ValueTuple`2").WithLocation(7, 9), + // (7,9): error CS0656: Missing compiler required member 'System.ValueTuple`2.Item1' // (a, b) => - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(a, b)").WithArguments("System.Runtime.CompilerServices.ValueTuple`2", "Item1").WithLocation(7, 9), - // (7,9): error CS0656: Missing compiler required member 'System.Runtime.CompilerServices.ValueTuple`2.Item2' + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(a, b)").WithArguments("System.ValueTuple`2", "Item1").WithLocation(7, 9), + // (7,9): error CS0656: Missing compiler required member 'System.ValueTuple`2.Item2' // (a, b) => - Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(a, b)").WithArguments("System.Runtime.CompilerServices.ValueTuple`2", "Item2").WithLocation(7, 9), + Diagnostic(ErrorCode.ERR_MissingPredefinedMember, "(a, b)").WithArguments("System.ValueTuple`2", "Item2").WithLocation(7, 9), // (11,9): error CS0201: Only assignment, call, increment, decrement, and new object expressions can be used as a statement // x + y; x == 1; Diagnostic(ErrorCode.ERR_IllegalStatement, "x + y").WithLocation(11, 9), diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ValueTupleTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ValueTupleTests.cs index d8427187e37..6f430a9e4e8 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ValueTupleTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ValueTupleTests.cs @@ -12,7 +12,7 @@ class ValueTupleTests : CompilingTestBase public void TestWellKnownMembersForValueTuple() { var source = @" -namespace System.Runtime.CompilerServices +namespace System { struct ValueTuple { @@ -76,139 +76,139 @@ struct ValueTuple } }"; var comp = CreateCompilationWithMscorlib(source); - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1__Item1).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2).ToTestDisplayString()); - Assert.Equal("T3 System.Runtime.CompilerServices.ValueTuple.Item3", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2).ToTestDisplayString()); - Assert.Equal("T3 System.Runtime.CompilerServices.ValueTuple.Item3", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3).ToTestDisplayString()); - Assert.Equal("T4 System.Runtime.CompilerServices.ValueTuple.Item4", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2).ToTestDisplayString()); - Assert.Equal("T3 System.Runtime.CompilerServices.ValueTuple.Item3", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3).ToTestDisplayString()); - Assert.Equal("T4 System.Runtime.CompilerServices.ValueTuple.Item4", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4).ToTestDisplayString()); - Assert.Equal("T5 System.Runtime.CompilerServices.ValueTuple.Item5", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2).ToTestDisplayString()); - Assert.Equal("T3 System.Runtime.CompilerServices.ValueTuple.Item3", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3).ToTestDisplayString()); - Assert.Equal("T4 System.Runtime.CompilerServices.ValueTuple.Item4", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4).ToTestDisplayString()); - Assert.Equal("T5 System.Runtime.CompilerServices.ValueTuple.Item5", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5).ToTestDisplayString()); - Assert.Equal("T6 System.Runtime.CompilerServices.ValueTuple.Item6", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2).ToTestDisplayString()); - Assert.Equal("T3 System.Runtime.CompilerServices.ValueTuple.Item3", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3).ToTestDisplayString()); - Assert.Equal("T4 System.Runtime.CompilerServices.ValueTuple.Item4", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4).ToTestDisplayString()); - Assert.Equal("T5 System.Runtime.CompilerServices.ValueTuple.Item5", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5).ToTestDisplayString()); - Assert.Equal("T6 System.Runtime.CompilerServices.ValueTuple.Item6", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6).ToTestDisplayString()); - Assert.Equal("T7 System.Runtime.CompilerServices.ValueTuple.Item7", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7).ToTestDisplayString()); - - Assert.Equal("T1 System.Runtime.CompilerServices.ValueTuple.Item1", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1).ToTestDisplayString()); - Assert.Equal("T2 System.Runtime.CompilerServices.ValueTuple.Item2", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2).ToTestDisplayString()); - Assert.Equal("T3 System.Runtime.CompilerServices.ValueTuple.Item3", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3).ToTestDisplayString()); - Assert.Equal("T4 System.Runtime.CompilerServices.ValueTuple.Item4", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4).ToTestDisplayString()); - Assert.Equal("T5 System.Runtime.CompilerServices.ValueTuple.Item5", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5).ToTestDisplayString()); - Assert.Equal("T6 System.Runtime.CompilerServices.ValueTuple.Item6", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6).ToTestDisplayString()); - Assert.Equal("T7 System.Runtime.CompilerServices.ValueTuple.Item7", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7).ToTestDisplayString()); - Assert.Equal("TRest System.Runtime.CompilerServices.ValueTuple.Rest", - comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7).ToTestDisplayString()); + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1__Item1).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2__Item2).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item2).ToTestDisplayString()); + Assert.Equal("T3 System.ValueTuple.Item3", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3__Item3).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item2).ToTestDisplayString()); + Assert.Equal("T3 System.ValueTuple.Item3", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item3).ToTestDisplayString()); + Assert.Equal("T4 System.ValueTuple.Item4", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4__Item4).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item2).ToTestDisplayString()); + Assert.Equal("T3 System.ValueTuple.Item3", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item3).ToTestDisplayString()); + Assert.Equal("T4 System.ValueTuple.Item4", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item4).ToTestDisplayString()); + Assert.Equal("T5 System.ValueTuple.Item5", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5__Item5).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2).ToTestDisplayString()); + Assert.Equal("T3 System.ValueTuple.Item3", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3).ToTestDisplayString()); + Assert.Equal("T4 System.ValueTuple.Item4", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4).ToTestDisplayString()); + Assert.Equal("T5 System.ValueTuple.Item5", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5).ToTestDisplayString()); + Assert.Equal("T6 System.ValueTuple.Item6", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2).ToTestDisplayString()); + Assert.Equal("T3 System.ValueTuple.Item3", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3).ToTestDisplayString()); + Assert.Equal("T4 System.ValueTuple.Item4", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4).ToTestDisplayString()); + Assert.Equal("T5 System.ValueTuple.Item5", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5).ToTestDisplayString()); + Assert.Equal("T6 System.ValueTuple.Item6", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6).ToTestDisplayString()); + Assert.Equal("T7 System.ValueTuple.Item7", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7).ToTestDisplayString()); + + Assert.Equal("T1 System.ValueTuple.Item1", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1).ToTestDisplayString()); + Assert.Equal("T2 System.ValueTuple.Item2", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2).ToTestDisplayString()); + Assert.Equal("T3 System.ValueTuple.Item3", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3).ToTestDisplayString()); + Assert.Equal("T4 System.ValueTuple.Item4", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4).ToTestDisplayString()); + Assert.Equal("T5 System.ValueTuple.Item5", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5).ToTestDisplayString()); + Assert.Equal("T6 System.ValueTuple.Item6", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6).ToTestDisplayString()); + Assert.Equal("T7 System.ValueTuple.Item7", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7).ToTestDisplayString()); + Assert.Equal("TRest System.ValueTuple.Rest", + comp.GetWellKnownTypeMember(WellKnownMember.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7).ToTestDisplayString()); } [Fact] public void TestMissingWellKnownMembersForValueTuple() { var comp = CreateCompilationWithMscorlib(""); - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1__Item1)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7)); - - Assert.True(comp.GetWellKnownType(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest).IsErrorType()); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7)); - Assert.Null(comp.GetWellKnownTypeMember(WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest)); + 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)); } } } diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/MissingSpecialMember.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/MissingSpecialMember.cs index 8c1357c3089..706416f209f 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/MissingSpecialMember.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/MissingSpecialMember.cs @@ -557,14 +557,14 @@ public void AllWellKnownTypes() continue; case WellKnownType.System_FormattableString: case WellKnownType.System_Runtime_CompilerServices_FormattableStringFactory: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7: - case WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest: + 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: // PROTOTYPE tuples // Not yet in the platform. continue; @@ -609,49 +609,49 @@ public void AllWellKnownTypeMembers() continue; case WellKnownMember.System_Array__Empty: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1__Item1: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7: - - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7: - case WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest: + 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: // PROTOTYPE tuples // Not yet in the platform. continue; diff --git a/src/Compilers/Core/Portable/WellKnownMember.cs b/src/Compilers/Core/Portable/WellKnownMember.cs index af44d8bddaf..784c804f76d 100644 --- a/src/Compilers/Core/Portable/WellKnownMember.cs +++ b/src/Compilers/Core/Portable/WellKnownMember.cs @@ -354,49 +354,49 @@ internal enum WellKnownMember System_Runtime_GCLatencyMode__SustainedLowLatency, - System_Runtime_CompilerServices_ValueTuple_T1__Item1, - - System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2, - - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3, - - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4, - - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5, - - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6, - - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7, - - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest, + 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_String__Format_IFormatProvider, Count diff --git a/src/Compilers/Core/Portable/WellKnownMembers.cs b/src/Compilers/Core/Portable/WellKnownMembers.cs index ee1190e5fc0..249cc51a59c 100644 --- a/src/Compilers/Core/Portable/WellKnownMembers.cs +++ b/src/Compilers/Core/Portable/WellKnownMembers.cs @@ -2519,219 +2519,219 @@ static WellKnownMembers() 0, // Arity (byte)SignatureTypeCode.TypeHandle, (byte)WellKnownType.System_Runtime_GCLatencyMode, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1__Item1 + // System_ValueTuple_T1__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1 + // System_ValueTuple_T1_T2__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2 + // System_ValueTuple_T1_T2__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1 + // System_ValueTuple_T1_T2_T3__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2 + // System_ValueTuple_T1_T2_T3__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3 + // System_ValueTuple_T1_T2_T3__Item3 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 2, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1 + // System_ValueTuple_T1_T2_T3_T4__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2 + // System_ValueTuple_T1_T2_T3_T4__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3 + // System_ValueTuple_T1_T2_T3_T4__Item3 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 2, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4 + // System_ValueTuple_T1_T2_T3_T4__Item4 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 3, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1 + // System_ValueTuple_T1_T2_T3_T4_T5__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2 + // System_ValueTuple_T1_T2_T3_T4_T5__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3 + // System_ValueTuple_T1_T2_T3_T4_T5__Item3 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 2, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4 + // System_ValueTuple_T1_T2_T3_T4_T5__Item4 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 3, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5 + // System_ValueTuple_T1_T2_T3_T4_T5__Item5 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 4, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1 + // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2 + // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3 + // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 2, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4 + // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 3, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5 + // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 4, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6 + // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 5, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 2, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 3, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 4, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 5, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId + (byte)WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7, // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 6, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 0, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 1, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 2, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 3, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 4, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 5, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7 + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7 (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 6, // Field Signature - // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest + // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest (byte)MemberFlags.Field, // Flags - (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId + (byte)WellKnownType.ExtSentinel, (byte)(WellKnownType.System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest - WellKnownType.ExtSentinel), // DeclaringTypeId 0, // Arity (byte)SignatureTypeCode.GenericTypeParameter, 7, // Field Signature @@ -3042,49 +3042,49 @@ static WellKnownMembers() ".ctor", // System_ComponentModel_EditorBrowsableAttribute__ctor "SustainedLowLatency", // System_Runtime_GCLatencyMode__SustainedLowLatency - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1__Item1 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2 - "Item3", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2 - "Item3", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3 - "Item4", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2 - "Item3", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3 - "Item4", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4 - "Item5", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2 - "Item3", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3 - "Item4", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4 - "Item5", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5 - "Item6", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2 - "Item3", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3 - "Item4", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4 - "Item5", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5 - "Item6", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6 - "Item7", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7 - - "Item1", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1 - "Item2", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2 - "Item3", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3 - "Item4", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4 - "Item5", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5 - "Item6", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6 - "Item7", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7 - "Rest", // System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest + "Item1", // System_ValueTuple_T1__Item1 + + "Item1", // System_ValueTuple_T1_T2__Item1 + "Item2", // System_ValueTuple_T1_T2__Item2 + + "Item1", // System_ValueTuple_T1_T2_T3__Item1 + "Item2", // System_ValueTuple_T1_T2_T3__Item2 + "Item3", // System_ValueTuple_T1_T2_T3__Item3 + + "Item1", // System_ValueTuple_T1_T2_T3_T4__Item1 + "Item2", // System_ValueTuple_T1_T2_T3_T4__Item2 + "Item3", // System_ValueTuple_T1_T2_T3_T4__Item3 + "Item4", // System_ValueTuple_T1_T2_T3_T4__Item4 + + "Item1", // System_ValueTuple_T1_T2_T3_T4_T5__Item1 + "Item2", // System_ValueTuple_T1_T2_T3_T4_T5__Item2 + "Item3", // System_ValueTuple_T1_T2_T3_T4_T5__Item3 + "Item4", // System_ValueTuple_T1_T2_T3_T4_T5__Item4 + "Item5", // System_ValueTuple_T1_T2_T3_T4_T5__Item5 + + "Item1", // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item1 + "Item2", // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item2 + "Item3", // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item3 + "Item4", // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item4 + "Item5", // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item5 + "Item6", // System_ValueTuple_T1_T2_T3_T4_T5_T6__Item6 + + "Item1", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1 + "Item2", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2 + "Item3", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3 + "Item4", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4 + "Item5", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5 + "Item6", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6 + "Item7", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7 + + "Item1", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1 + "Item2", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2 + "Item3", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3 + "Item4", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4 + "Item5", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5 + "Item6", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6 + "Item7", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7 + "Rest", // System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest "Format", // System_String__Format_IFormatProvider }; diff --git a/src/Compilers/Core/Portable/WellKnownTypes.cs b/src/Compilers/Core/Portable/WellKnownTypes.cs index 73b16d5c81d..44c377954d2 100644 --- a/src/Compilers/Core/Portable/WellKnownTypes.cs +++ b/src/Compilers/Core/Portable/WellKnownTypes.cs @@ -245,17 +245,17 @@ internal enum WellKnownType System_Runtime_GCLatencyMode, - System_Runtime_CompilerServices_ValueTuple_T1, - System_Runtime_CompilerServices_ValueTuple_T1_T2, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, + 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, ExtSentinel, // Not a real type, just a marker for types above 255 and strictly below 512 - System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest, + System_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest, System_IFormatProvider, @@ -499,17 +499,17 @@ internal static class WellKnownTypes "System.Runtime.GCLatencyMode", - "System.Runtime.CompilerServices.ValueTuple`1", - "System.Runtime.CompilerServices.ValueTuple`2", - "System.Runtime.CompilerServices.ValueTuple`3", - "System.Runtime.CompilerServices.ValueTuple`4", - "System.Runtime.CompilerServices.ValueTuple`5", - "System.Runtime.CompilerServices.ValueTuple`6", - "System.Runtime.CompilerServices.ValueTuple`7", + "System.ValueTuple`1", + "System.ValueTuple`2", + "System.ValueTuple`3", + "System.ValueTuple`4", + "System.ValueTuple`5", + "System.ValueTuple`6", + "System.ValueTuple`7", "", // extension marker - "System.Runtime.CompilerServices.ValueTuple`8", + "System.ValueTuple`8", "System.IFormatProvider", }; diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WellKnownTypeValidationTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WellKnownTypeValidationTests.vb index 51cc8db2eca..b8c1f263fcd 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WellKnownTypeValidationTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WellKnownTypeValidationTests.vb @@ -500,14 +500,14 @@ End Namespace Continue For Case WellKnownType.System_FormattableString, WellKnownType.System_Runtime_CompilerServices_FormattableStringFactory, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest ' PROTOTYPE tuples + 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 ' Not available on all platforms. Continue For Case WellKnownType.ExtSentinel @@ -540,14 +540,14 @@ End Namespace Continue For Case WellKnownType.System_FormattableString, WellKnownType.System_Runtime_CompilerServices_FormattableStringFactory, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7, - WellKnownType.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest ' PROTOTYPE tuples + 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 ' Not available on all platforms. Continue For Case WellKnownType.ExtSentinel @@ -585,42 +585,42 @@ End Namespace ' Not a real value. Continue For Case WellKnownMember.System_Array__Empty, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest + 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 ' PROTOTYPE tuples ' Not available yet, but will be in upcoming release. Continue For @@ -699,42 +699,42 @@ End Namespace ' The type is not embedded, so the member is not available. Continue For Case WellKnownMember.System_Array__Empty, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7__Item7, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item1, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item2, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item3, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item4, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item5, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item6, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Item7, - WellKnownMember.System_Runtime_CompilerServices_ValueTuple_T1_T2_T3_T4_T5_T6_T7_TRest__Rest + 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 ' PROTOTYPE tuples ' Not available yet, but will be in upcoming release. Continue For -- GitLab