Skip to content

Commit 8b09499

Browse files
authored
Merge pull request #3829 from dotnet/master
Update live with current master
2 parents 80e1d09 + 5ca98a0 commit 8b09499

File tree

9 files changed

+21
-10
lines changed

9 files changed

+21
-10
lines changed

xml/System.Data.Common/DbParameter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ FieldName = @OriginalFieldName
758758
</ReturnValue>
759759
<Docs>
760760
<summary>For a description of this member, see <see cref="P:System.Data.IDbDataParameter.Scale" />.</summary>
761-
<value>The number of decimal places to which <see cref="T:System.Data.OleDb.OleDbParameter.Value" /> is resolved. The default is 0.</value>
761+
<value>The number of decimal places to which <see cref="P:System.Data.OleDb.OleDbParameter.Value" /> is resolved. The default is 0.</value>
762762
<remarks>
763763
<format type="text/markdown"><![CDATA[
764764

xml/System.IO/FileSystemInfo.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,13 @@
274274
<exception cref="T:System.IO.FileNotFoundException">The specified file doesn't exist. Only thrown when setting the property value.</exception>
275275
<exception cref="T:System.IO.DirectoryNotFoundException">The specified path is invalid. For example, it's on an unmapped drive. Only thrown when setting the property value.</exception>
276276
<exception cref="T:System.Security.SecurityException">The caller doesn't have the required permission.</exception>
277+
<exception cref="T:System.UnauthorizedAccessException">.NET Core only: The user attempts to set an attribute value but doesn't have write permission.</exception>
278+
<exception cref="T:System.IO.PathTooLongException">The specified path, file name, or both exceed the system-defined maximum length.</exception>
277279
<exception cref="T:System.ArgumentException">The caller attempts to set an invalid file attribute.
278280

279281
-or-
280282

281-
The user attempts to set an attribute value but doesn't have write permission.</exception>
283+
.NET Framework only: The user attempts to set an attribute value but doesn't have write permission.</exception>
282284
<exception cref="T:System.IO.IOException">
283285
<see cref="M:System.IO.FileSystemInfo.Refresh" /> cannot initialize the data.</exception>
284286
<permission cref="T:System.Security.Permissions.FileIOPermission">for writing files and directories. Associated enumeration: <see cref="F:System.Security.Permissions.FileIOPermissionAccess.Write" /> Security action: <see cref="F:System.Security.Permissions.SecurityAction.Demand" /></permission>

xml/System.Text/Encoding.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4336,7 +4336,7 @@ The goal is to save this file, then open and decode it as a binary stream.
43364336
<paramref name="bytes" /> is a null pointer.</exception>
43374337
<exception cref="T:System.ArgumentOutOfRangeException">
43384338
<paramref name="byteCount" /> is less than zero.</exception>
4339-
<exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see [Character Encoding in .NET](~/docs/standard/base-types/character-encoding.md) for a complete explanation)
4339+
<exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see <see href="~/docs/standard/base-types/character-encoding.md">Character Encoding in .NET</see>) for a complete explanation)
43404340

43414341
-and-
43424342

xml/System.Web.DynamicData/MetaModel.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@
443443
444444
The example consists of a page and its code-behind file.
445445
446-
[!code-aspx-csharp[System.Web.DynamicData.MetaModel#3](~/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.DynamicData.MetaModel/CS/GetTable.aspx#3)] -->
447-
[!code-aspx-vb[System.Web.DynamicData.MetaModel#3](~/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.DynamicData.MetaModel/VB/GetTable.aspx#3)] -->
446+
[!code-aspx-csharp[System.Web.DynamicData.MetaModel#3](~/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.DynamicData.MetaModel/CS/GetTable.aspx)]
447+
[!code-aspx-vb[System.Web.DynamicData.MetaModel#3](~/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.DynamicData.MetaModel/VB/GetTable.aspx)]
448448
449449
[!code-csharp[System.Web.DynamicData.MetaModel#4](~/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.DynamicData.MetaModel/CS/GetTable.aspx.cs#4)]
450450
[!code-vb[System.Web.DynamicData.MetaModel#4](~/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.DynamicData.MetaModel/VB/gettable.aspx.vb#4)]

xml/System/Memory`1.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ In addition to `Memory<T>`, you can use <xref:System.ReadOnlyMemory%601?displayP
5151
5252
]]></format>
5353
</remarks>
54+
<related type="article" href="~/docs/standard/memory-and-spans/index.md">Memory- and span-related types</related>
55+
<related type="article" href="~/docs/standard/memory-and-spans/memory-t-usage-guidelines.md">Memory&lt;T&gt; and Span&lt;T&gt; usage guidelines</related>
5456
</Docs>
5557
<Members>
5658
<Member MemberName=".ctor">

xml/System/ReadOnlyMemory`1.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<typeparam name="T">The object type from which the contiguous region of memory will be read.</typeparam>
3838
<summary>Represents a contiguous region of memory, similar to <see cref="T:System.ReadOnlySpan`1" />. Unlike <see cref="T:System.ReadOnlySpan`1" />, it is not a byref-like type.</summary>
3939
<remarks>To be added.</remarks>
40+
<related type="article" href="~/docs/standard/memory-and-spans/index.md">Memory- and span-related types</related>
41+
<related type="article" href="~/docs/standard/memory-and-spans/memory-t-usage-guidelines.md">Memory&lt;T&gt; and Span&lt;T&gt; usage guidelines</related>
4042
</Docs>
4143
<Members>
4244
<Member MemberName=".ctor">

xml/System/ReadOnlySpan`1.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
4242
A `ReadOnlySpan<T>` instance is often used to reference the elements of an array or a portion of an array. Unlike an array, however, a `ReadOnlySpan<T>` instance can point to managed memory, native memory, or memory managed on the stack.]]></format>
4343
</remarks>
44+
<related type="article" href="~/docs/standard/memory-and-spans/index.md">Memory- and span-related types</related>
45+
<related type="article" href="~/docs/standard/memory-and-spans/memory-t-usage-guidelines.md">Memory&lt;T&gt; and Span&lt;T&gt; usage guidelines</related>
4446
</Docs>
4547
<Members>
4648
<Member MemberName=".ctor">

xml/System/Span`1.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ This allocation and copy operation can be eliminated by using either `Span<T>` o
8787
8888
]]></format>
8989
</remarks>
90+
<related type="article" href="~/docs/standard/memory-and-spans/index.md">Memory- and span-related types</related>
91+
<related type="article" href="~/docs/standard/memory-and-spans/memory-t-usage-guidelines.md">Memory&lt;T&gt; and Span&lt;T&gt; usage guidelines</related>
9092
</Docs>
9193
<Members>
9294
<Member MemberName=".ctor">

xml/System/Type.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10689,11 +10689,6 @@ GetType(Array).IsAssignableFrom(type)
1068910689

1069010690
- <paramref name="c" /> is a generic type parameter, and the current instance represents one of the constraints of <paramref name="c" />.
1069110691

10692-
In the following example, the current instance is a <see cref="T:System.Type" /> object that represents the <see cref="T:System.IO.Stream" /> class. <c>GenericWithConstraint</c> is a generic type whose generic type parameter must be of type <see cref="T:System.IO.Stream" />. Passing its generic type parameter to the <see cref="M:System.Type.IsAssignableFrom(System.Type)" /> indicates that an instance of the generic type parameter can be assigned to an <see cref="T:System.IO.Stream" /> object.
10693-
10694-
[!code-csharp[System.Type.IsAssignableFrom#2](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.type.isassignablefrom/cs/IsAssignableFrom2.cs#2)]
10695-
[!code-vb[System.Type.IsAssignableFrom#2](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.type.isassignablefrom/vb/IsAssignableFrom2.vb#2)]
10696-
1069710692
- <paramref name="c" /> represents a value type, and the current instance represents <c>Nullable&lt;c&gt;</c> (<c>Nullable(Of c)</c> in Visual Basic).
1069810693

1069910694
<see langword="false" /> if none of these conditions are true, or if <paramref name="c" /> is <see langword="null" />.</returns>
@@ -10729,6 +10724,12 @@ GetType(Array).IsAssignableFrom(type)
1072910724
[!code-cpp[TestIsAssignableFrom#1](~/samples/snippets/cpp/VS_Snippets_CLR/TestIsAssignableFrom/cpp/testisassignablefrom.cpp#1)]
1073010725
[!code-csharp[TestIsAssignableFrom#1](~/samples/snippets/csharp/VS_Snippets_CLR/TestIsAssignableFrom/CS/testisassignablefrom.cs#1)]
1073110726
[!code-vb[TestIsAssignableFrom#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/TestIsAssignableFrom/VB/testisassignablefrom.vb#1)]
10727+
10728+
In the following example, the current instance is a <xref:System.Type> object that represents the <xref:System.IO.Stream> class. `GenericWithConstraint` is a generic type whose generic type parameter must be of type <xref:System.IO.Stream>. Passing its generic type parameter to the `IsAssignableFrom` method indicates that an instance of the generic type parameter can be assigned to an <xref:System.IO.Stream> object.
10729+
10730+
[!code-csharp[System.Type.IsAssignableFrom#2](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.type.isassignablefrom/cs/IsAssignableFrom2.cs#2)]
10731+
[!code-vb[System.Type.IsAssignableFrom#2](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.type.isassignablefrom/vb/IsAssignableFrom2.vb#2)]
10732+
1073210733

1073310734
]]></format>
1073410735
</remarks>

0 commit comments

Comments
 (0)