Merge pull request #8560 from AlexRadch/Deconstruction

Supporting C# 7 deconstruction of KeyValuePair and DictionaryEntry
dotnet · Dec 13, 2016 · 4c27831 · 4c27831
2 parents c7e4e10 + 81033d3
commit 4c27831
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml
@@ -640,6 +640,7 @@
  <Member Name="get_Value" />
  <Member Name="set_Key(System.Object)" />
  <Member Name="set_Value(System.Object)" />
+ <Member Name="Deconstruct(System.Object@,System.Object@)" />
  <Member MemberType="Property" Name="Key" />
  <Member MemberType="Property" Name="Value" />
  </Type>
@@ -795,6 +796,7 @@
  <Member Name="get_Key" />
  <Member Name="get_Value" />
  <Member Name="ToString" />
+ <Member Name="Deconstruct(TKey@,TValue@)" />
  <Member MemberType="Property" Name="Key" />
  <Member MemberType="Property" Name="Value" />
  </Type>

diff --git a/src/mscorlib/src/System/Collections/DictionaryEntry.cs b/src/mscorlib/src/System/Collections/DictionaryEntry.cs
@@ -51,5 +51,12 @@ public Object Value {
  _value = value;
  }
  }
+
+ // BLOCKED (do not add now): [EditorBrowsable(EditorBrowsableState.Never)]
+ public void Deconstruct(out object key, out object value)
+ {
+ key = Key;
+ value = Value;
+ }
  }
 }
diff --git a/src/mscorlib/src/System/Collections/Generic/KeyValuePair.cs b/src/mscorlib/src/System/Collections/Generic/KeyValuePair.cs
@@ -62,5 +62,12 @@ public override string ToString() {
  s.Append(']');
  return StringBuilderCache.GetStringAndRelease(s);
  }
+
+ // BLOCKED (do not add now): [EditorBrowsable(EditorBrowsableState.Never)]
+ public void Deconstruct(out TKey key, out TValue value)
+ {
+ key = Key;
+ value = Value;
+ }
  }
 }