Skip to content

Commit f7f7034

Browse files
authored
Merge pull request #4173 from dotnet/publish-27177
Merge master into live
2 parents b0947fe + 62ea723 commit f7f7034

File tree

15 files changed

+253
-171
lines changed

15 files changed

+253
-171
lines changed

samples/snippets/csharp/VS_Snippets_CLR_System/system.string.tochararray/cs/ToCharArray1.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ public class Example
55
{
66
public static void Main()
77
{
8-
String s = "AaBbCcDd";
9-
var chars = s.ToCharArray();
8+
string s = "AaBbCcDd";
9+
char[] chars = s.ToCharArray();
1010
Console.WriteLine("Original string: {0}", s);
1111
Console.WriteLine("Character array:");
1212
for (int ctr = 0; ctr < chars.Length; ctr++)
13+
{
1314
Console.WriteLine(" {0}: {1}", ctr, chars[ctr]);
15+
}
1416
}
1517
}
1618

xml/System.Collections.Generic/Dictionary`2.xml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Type Name="Dictionary&lt;TKey,TValue&gt;" FullName="System.Collections.Generic.Dictionary&lt;TKey,TValue&gt;">
1+
<Type Name="Dictionary&lt;TKey,TValue&gt;" FullName="System.Collections.Generic.Dictionary&lt;TKey,TValue&gt;">
22
<TypeSignature Language="C#" Value="public class Dictionary&lt;TKey,TValue&gt; : System.Collections.Generic.ICollection&lt;System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;&gt;, System.Collections.Generic.IDictionary&lt;TKey,TValue&gt;, System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;&gt;, System.Collections.Generic.IReadOnlyCollection&lt;System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;&gt;, System.Collections.Generic.IReadOnlyDictionary&lt;TKey,TValue&gt;, System.Collections.IDictionary" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.6" />
33
<TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit Dictionary`2&lt;TKey, TValue&gt; extends System.Object implements class System.Collections.Generic.ICollection`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;!TKey, !TValue&gt;&gt;, class System.Collections.Generic.IDictionary`2&lt;!TKey, !TValue&gt;, class System.Collections.Generic.IEnumerable`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;!TKey, !TValue&gt;&gt;, class System.Collections.Generic.IReadOnlyCollection`1&lt;valuetype System.Collections.Generic.KeyValuePair`2&lt;!TKey, !TValue&gt;&gt;, class System.Collections.Generic.IReadOnlyDictionary`2&lt;!TKey, !TValue&gt;, class System.Collections.ICollection, class System.Collections.IDictionary, class System.Collections.IEnumerable" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.6" />
44
<TypeSignature Language="DocId" Value="T:System.Collections.Generic.Dictionary`2" />
@@ -331,9 +331,13 @@
331331
<Parameter Name="collection" Type="System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;&gt;" Index="0" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0" />
332332
</Parameters>
333333
<Docs>
334-
<param name="collection">To be added.</param>
335-
<summary>To be added.</summary>
334+
<param name="collection">The <see cref="T:System.Collections.Generic.IEnumerable`1" /> whose elements are copied to the new <see cref="T:System.Collections.Generic.Dictionary`2" />.</param>
335+
<summary>Initializes a new instance of the <see cref="T:System.Collections.Generic.Dictionary`2" /> class that contains elements copied from the specified <see cref="T:System.Collections.Generic.IEnumerable`1" />.</summary>
336336
<remarks>To be added.</remarks>
337+
<exception cref="T:System.ArgumentNullException">
338+
<paramref name="collection" /> is <see langword="null" />.</exception>
339+
<exception cref="T:System.ArgumentException">
340+
<paramref name="collection" /> contains one or more duplicated keys.</exception>
337341
</Docs>
338342
</Member>
339343
<Member MemberName=".ctor">
@@ -567,10 +571,14 @@
567571
<Parameter Name="comparer" Type="System.Collections.Generic.IEqualityComparer&lt;TKey&gt;" Index="1" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0" />
568572
</Parameters>
569573
<Docs>
570-
<param name="collection">To be added.</param>
571-
<param name="comparer">To be added.</param>
572-
<summary>To be added.</summary>
574+
<param name="collection">The <see cref="T:System.Collections.Generic.IEnumerable`1" /> whose elements are copied to the new <see cref="T:System.Collections.Generic.Dictionary`2" />.</param>
575+
<param name="comparer">The <see cref="T:System.Collections.Generic.IEqualityComparer`1" /> implementation to use when comparing keys, or <see langword="null" /> to use the default <see cref="T:System.Collections.Generic.EqualityComparer`1" /> for the type of the key.</param>
576+
<summary>Initializes a new instance of the <see cref="T:System.Collections.Generic.Dictionary`2" /> class that contains elements copied from the specified <see cref="T:System.Collections.Generic.IEnumerable`1" /> and uses the specified <see cref="T:System.Collections.Generic.IEqualityComparer`1" />.</summary>
573577
<remarks>To be added.</remarks>
578+
<exception cref="T:System.ArgumentNullException">
579+
<paramref name="collection" /> is <see langword="null" />.</exception>
580+
<exception cref="T:System.ArgumentException">
581+
<paramref name="collection" /> contains one or more duplicated keys.</exception>
574582
</Docs>
575583
</Member>
576584
<Member MemberName=".ctor">
@@ -1506,11 +1514,14 @@
15061514
<Parameter Name="value" Type="TValue" RefType="out" Index="1" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0" />
15071515
</Parameters>
15081516
<Docs>
1509-
<param name="key">To be added.</param>
1510-
<param name="value">To be added.</param>
1511-
<summary>To be added.</summary>
1512-
<returns>To be added.</returns>
1517+
<param name="key">The key of the element to remove.</param>
1518+
<param name="value">The removed element.</param>
1519+
<summary>Removes the value with the specified key from the <see cref="T:System.Collections.Generic.Dictionary`2" />, and copies the element to the <paramref name="value" /> parameter.</summary>
1520+
<returns>
1521+
<see langword="true" /> if the element is successfully found and removed; otherwise, <see langword="false" />.</returns>
15131522
<remarks>To be added.</remarks>
1523+
<exception cref="T:System.ArgumentNullException">
1524+
<paramref name="key" /> is <see langword="null" />.</exception>
15141525
</Docs>
15151526
</Member>
15161527
<Member MemberName="System.Collections.Generic.ICollection&lt;System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;&gt;.Add">

xml/System.Collections.Generic/KeyValuePair`2.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Type Name="KeyValuePair&lt;TKey,TValue&gt;" FullName="System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;">
1+
<Type Name="KeyValuePair&lt;TKey,TValue&gt;" FullName="System.Collections.Generic.KeyValuePair&lt;TKey,TValue&gt;">
22
<TypeSignature Language="C#" Value="public struct KeyValuePair&lt;TKey,TValue&gt;" />
33
<TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit KeyValuePair`2&lt;TKey, TValue&gt; extends System.ValueType" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
44
<TypeSignature Language="DocId" Value="T:System.Collections.Generic.KeyValuePair`2" />
@@ -159,9 +159,9 @@
159159
<Parameter Name="value" Type="TValue" RefType="out" Index="1" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0" />
160160
</Parameters>
161161
<Docs>
162-
<param name="key">To be added.</param>
163-
<param name="value">To be added.</param>
164-
<summary>To be added.</summary>
162+
<param name="key">The key of the current <see cref="T:System.Collections.Generic.KeyValuePair`2" />.</param>
163+
<param name="value">The value of the current <see cref="T:System.Collections.Generic.KeyValuePair`2" />.</param>
164+
<summary>Deconstructs the current <see cref="T:System.Collections.Generic.KeyValuePair`2" />.</summary>
165165
<remarks>To be added.</remarks>
166166
</Docs>
167167
</Member>

xml/System.Collections.Generic/LinkedList`1.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@
187187
188188
## Examples
189189
The following code example creates and initializes a <xref:System.Collections.Generic.LinkedList%601> of type <xref:System.String>, adds several nodes, and then displays its contents.
190-
191-
[!code-cpp[System.Collections.Generic.LinkedList.ctor#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Collections.Generic.LinkedList.ctor/CPP/llctor.cpp#1)]
192-
[!code-csharp[System.Collections.Generic.LinkedList.ctor#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Collections.Generic.LinkedList.ctor/CS/llctor.cs#1)]
193-
[!code-vb[System.Collections.Generic.LinkedList.ctor#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Collections.Generic.LinkedList.ctor/VB/llctor.vb#1)]
190+
191+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Collections.Generic.LinkedList.ctor/CPP/llctor.cpp" id="Snippet1":::
192+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Collections.Generic.LinkedList.ctor/CS/llctor.cs" interactive="try-dotnet" id="Snippet1":::
193+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Collections.Generic.LinkedList.ctor/VB/llctor.vb" id="Snippet1":::
194194
195195
]]></format>
196196
</remarks>

0 commit comments

Comments
 (0)