Skip to content

Commit fca64b4

Browse files
authored
Merge pull request #3428 from dotnet/master
Update live with current master
2 parents a6c4dae + 725ea62 commit fca64b4

File tree

5 files changed

+55
-23
lines changed

5 files changed

+55
-23
lines changed

xml/System.Data.Common/DbDataReader.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
<Docs>
309309
<param name="disposing">
310310
<see langword="true" /> to release managed and unmanaged resources; <see langword="false" /> to release only unmanaged resources.</param>
311-
<summary>Releases the managed resources used by the <see cref="T:System.Data.Common.DbDataReader" /> and optionally releases the unmanaged resources.</summary>
311+
<summary>Releases the unmanaged resources used by the <see cref="T:System.Data.Common.DbDataReader" /> and optionally releases the managed resources.</summary>
312312
<remarks>
313313
<format type="text/markdown"><![CDATA[
314314

xml/System.Data.SqlClient/SqlDataReader.xml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,17 +246,18 @@
246246
<Parameter Name="disposing" Type="System.Boolean" Index="0" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0" />
247247
</Parameters>
248248
<Docs>
249-
<param name="disposing">
250-
<see langword="true" /> to release managed and unmanaged resources; <see langword="false" /> to release only unmanaged resources.</param>
251-
<summary>Releases the managed resources used by the <see cref="T:System.Data.SqlClient.SqlDataReader" /> and optionally releases the unmanaged resources.</summary>
249+
<param name="disposing"><see langword="true" /> to release managed and unmanaged resources; <see langword="false" /> to release only unmanaged resources.</param>
250+
<summary>Releases the unmanaged resources used by the <see cref="T:System.Data.SqlClient.SqlDataReader" /> and optionally releases the managed resources.</summary>
252251
<remarks>
253252
<format type="text/markdown"><![CDATA[
254-
253+
255254
## Remarks
256-
This method calls <xref:System.Data.SqlClient.SqlDataReader.Close%2A>.
257255
258-
]]></format>
256+
This method calls <xref:System.Data.Common.DbDataReader.Dispose%2A>.
257+
258+
]]></format>
259259
</remarks>
260+
<related type="Article" href="~/docs/framework/data/adonet/ado-net-overview.md">ADO.NET Overview</related>
260261
</Docs>
261262
</Member>
262263
<Member MemberName="FieldCount">
@@ -664,9 +665,17 @@
664665
</ReturnValue>
665666
<Parameters />
666667
<Docs>
667-
<summary>Gets the column schema (<see cref="T:System.Data.Common.DbColumn" /> collection).</summary>
668-
<returns>The column schema (<see cref="T:System.Data.Common.DbColumn" /> collection).</returns>
669-
<remarks>To be added.</remarks>
668+
<summary>Gets the read-only column schema collection.</summary>
669+
<returns>The read-only column schema collection.</returns>
670+
<remarks>
671+
<format type="text/markdown"><![CDATA[
672+
673+
## Remarks
674+
675+
This method is an implementation of <xref:System.Data.Common.IDbColumnSchemaGenerator.GetColumnSchema?displayProperty=nameWithType> method, which enables the use of the <xref:System.Data.Common.IDbColumnSchemaGenerator> interface to populate the <xref:System.Data.Common.DbColumn> schema metadata without using a <xref:System.Data.DataTable>.
676+
677+
]]></format>
678+
</remarks>
670679
</Docs>
671680
</Member>
672681
<Member MemberName="GetData">

xml/System.Diagnostics/Process.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4917,7 +4917,11 @@ There is a similar issue when you read all text from both the standard output an
49174917

49184918
]]></format>
49194919
</remarks>
4920-
<exception cref="T:System.ComponentModel.Win32Exception">An error occurred when opening the associated file.</exception>
4920+
<exception cref="T:System.ComponentModel.Win32Exception">An error occurred when opening the associated file.
4921+
4922+
-or-
4923+
4924+
The file specified in the <paramref name="fileName" /> could not be found.</exception>
49214925
<exception cref="T:System.ObjectDisposedException">The process object has already been disposed.</exception>
49224926
<exception cref="T:System.IO.FileNotFoundException">The PATH environment variable has a string containing quotes.</exception>
49234927
<permission cref="F:System.Security.Permissions.SecurityAction.LinkDemand">for full trust for the immediate caller. This member cannot be used by partially trusted code.</permission>
@@ -5002,6 +5006,10 @@ There is a similar issue when you read all text from both the standard output an
50025006
</remarks>
50035007
<exception cref="T:System.InvalidOperationException">The <paramref name="fileName" /> or <paramref name="arguments" /> parameter is <see langword="null" />.</exception>
50045008
<exception cref="T:System.ComponentModel.Win32Exception">An error occurred when opening the associated file.
5009+
5010+
-or-
5011+
5012+
The file specified in the <paramref name="fileName" /> could not be found.
50055013

50065014
-or-
50075015

@@ -5093,7 +5101,11 @@ There is a similar issue when you read all text from both the standard output an
50935101
]]></format>
50945102
</remarks>
50955103
<exception cref="T:System.InvalidOperationException">No file name was specified.</exception>
5096-
<exception cref="T:System.ComponentModel.Win32Exception">There was an error in opening the associated file.</exception>
5104+
<exception cref="T:System.ComponentModel.Win32Exception">There was an error in opening the associated file.
5105+
5106+
-or-
5107+
5108+
The file specified in the <paramref name="fileName" /> could not be found.</exception>
50975109
<exception cref="T:System.ObjectDisposedException">The process object has already been disposed.</exception>
50985110
<exception cref="T:System.PlatformNotSupportedException">This member is not supported on Linux or macOS (.NET Core only).</exception>
50995111
<permission cref="F:System.Security.Permissions.SecurityAction.LinkDemand">for full trust for the immediate caller. This member cannot be used by partially trusted code.</permission>
@@ -5171,6 +5183,10 @@ There is a similar issue when you read all text from both the standard output an
51715183
</remarks>
51725184
<exception cref="T:System.InvalidOperationException">No file name was specified.</exception>
51735185
<exception cref="T:System.ComponentModel.Win32Exception">An error occurred when opening the associated file.
5186+
5187+
-or-
5188+
5189+
The file specified in the <paramref name="fileName" /> could not be found.
51745190

51755191
-or-
51765192

xml/System.Diagnostics/ProcessStartInfo.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,9 +1341,16 @@ You can use asynchronous read operations to avoid these dependencies and their d
13411341
<ReturnType>System.Text.Encoding</ReturnType>
13421342
</ReturnValue>
13431343
<Docs>
1344-
<summary>To be added.</summary>
1345-
<value>To be added.</value>
1346-
<remarks>To be added.</remarks>
1344+
<summary>Gets or sets the preferred encoding for standard input.</summary>
1345+
<value>An object that represents the preferred encoding for standard input. The default is <see langword="null" />.</value>
1346+
<remarks>
1347+
<format type="text/markdown"><![CDATA[
1348+
1349+
## Remarks
1350+
If the value of the `StandardInputEncoding` property is `null`, the process uses the default standard input encoding for the standard input. The `StandardInputEncoding` property must be set before the process is started. Setting this property does not guarantee that the process will use the specified encoding. The application should be tested to determine which encodings the process supports.
1351+
1352+
]]></format>
1353+
</remarks>
13471354
</Docs>
13481355
</Member>
13491356
<Member MemberName="StandardOutputEncoding">

xml/System.IO/Directory.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ Directory::CreateDirectory("Public\\Html");
538538
<AssemblyVersion>4.1.0.0</AssemblyVersion>
539539
</AssemblyInfo>
540540
<Docs>
541-
<summary>Returns an enumerable collection of directory names that meet specified criteria.</summary>
541+
<summary>Returns an enumerable collection of directory full names that meet specified criteria.</summary>
542542
</Docs>
543543
</MemberGroup>
544544
<Member MemberName="EnumerateDirectories">
@@ -574,7 +574,7 @@ Directory::CreateDirectory("Public\\Html");
574574
</Parameters>
575575
<Docs>
576576
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
577-
<summary>Returns an enumerable collection of directory names in a specified path.</summary>
577+
<summary>Returns an enumerable collection of directory full names in a specified path.</summary>
578578
<returns>An enumerable collection of the full names (including paths) for the directories in the directory specified by <paramref name="path" />.</returns>
579579
<remarks>
580580
<format type="text/markdown"><![CDATA[
@@ -644,7 +644,7 @@ Directory::CreateDirectory("Public\\Html");
644644
<Docs>
645645
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
646646
<param name="searchPattern">The search string to match against the names of directories in <paramref name="path" />. This parameter can contain a combination of valid literal path and wildcard (* and ?) characters, but it doesn't support regular expressions.</param>
647-
<summary>Returns an enumerable collection of directory names that match a search pattern in a specified path.</summary>
647+
<summary>Returns an enumerable collection of directory full names that match a search pattern in a specified path.</summary>
648648
<returns>An enumerable collection of the full names (including paths) for the directories in the directory specified by <paramref name="path" /> and that match the specified search pattern.</returns>
649649
<remarks>
650650
<format type="text/markdown"><![CDATA[
@@ -771,7 +771,7 @@ Directory::CreateDirectory("Public\\Html");
771771
<param name="searchOption">One of the enumeration values that specifies whether the search operation should include only the current directory or should include all subdirectories.
772772

773773
The default value is <see cref="F:System.IO.SearchOption.TopDirectoryOnly" />.</param>
774-
<summary>Returns an enumerable collection of directory names that match a search pattern in a specified path, and optionally searches subdirectories.</summary>
774+
<summary>Returns an enumerable collection of directory full names that match a search pattern in a specified path, and optionally searches subdirectories.</summary>
775775
<returns>An enumerable collection of the full names (including paths) for the directories in the directory specified by <paramref name="path" /> and that match the specified search pattern and option.</returns>
776776
<remarks>
777777
<format type="text/markdown"><![CDATA[
@@ -834,7 +834,7 @@ Directory::CreateDirectory("Public\\Html");
834834
<AssemblyVersion>4.1.0.0</AssemblyVersion>
835835
</AssemblyInfo>
836836
<Docs>
837-
<summary>Returns an enumerable collection of file names that meet specified criteria.</summary>
837+
<summary>Returns an enumerable collection of full file names that meet specified criteria.</summary>
838838
</Docs>
839839
</MemberGroup>
840840
<Member MemberName="EnumerateFiles">
@@ -870,7 +870,7 @@ Directory::CreateDirectory("Public\\Html");
870870
</Parameters>
871871
<Docs>
872872
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
873-
<summary>Returns an enumerable collection of file names in a specified path.</summary>
873+
<summary>Returns an enumerable collection of full file names in a specified path.</summary>
874874
<returns>An enumerable collection of the full names (including paths) for the files in the directory specified by <paramref name="path" />.</returns>
875875
<remarks>
876876
<format type="text/markdown"><![CDATA[
@@ -945,7 +945,7 @@ Directory::CreateDirectory("Public\\Html");
945945
<Docs>
946946
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
947947
<param name="searchPattern">The search string to match against the names of files in <paramref name="path" />. This parameter can contain a combination of valid literal path and wildcard (* and ?) characters, but it doesn't support regular expressions.</param>
948-
<summary>Returns an enumerable collection of file names that match a search pattern in a specified path.</summary>
948+
<summary>Returns an enumerable collection of full file names that match a search pattern in a specified path.</summary>
949949
<returns>An enumerable collection of the full names (including paths) for the files in the directory specified by <paramref name="path" /> and that match the specified search pattern.</returns>
950950
<remarks>
951951
<format type="text/markdown"><![CDATA[
@@ -1085,7 +1085,7 @@ Directory::CreateDirectory("Public\\Html");
10851085
<param name="searchOption">One of the enumeration values that specifies whether the search operation should include only the current directory or should include all subdirectories.
10861086

10871087
The default value is <see cref="F:System.IO.SearchOption.TopDirectoryOnly" />.</param>
1088-
<summary>Returns an enumerable collection of file names that match a search pattern in a specified path, and optionally searches subdirectories.</summary>
1088+
<summary>Returns an enumerable collection of full file names that match a search pattern in a specified path, and optionally searches subdirectories.</summary>
10891089
<returns>An enumerable collection of the full names (including paths) for the files in the directory specified by <paramref name="path" /> and that match the specified search pattern and option.</returns>
10901090
<remarks>
10911091
<format type="text/markdown"><![CDATA[

0 commit comments

Comments
 (0)