Skip to content

Commit 6e7795f

Browse files
authored
Merge pull request #3416 from dotnet/master
Update live with current master
2 parents d4927e9 + f7a9427 commit 6e7795f

File tree

28 files changed

+71
-94
lines changed

28 files changed

+71
-94
lines changed

xml/Microsoft.VisualBasic.ApplicationServices/AssemblyInfo.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@
407407
408408
]]></format>
409409
</remarks>
410-
<altCompliant cref="None." />
411410
<exception cref="T:System.AppDomainUnloadedException">The application domain is not loaded.</exception>
412411
<altmember cref="P:Microsoft.VisualBasic.ApplicationServices.ApplicationBase.Info" />
413412
<altmember cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />

xml/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,6 @@
669669
670670
]]></format>
671671
</remarks>
672-
<altCompliant cref="None." />
673672
<altmember cref="P:Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.EnableVisualStyles" />
674673
<altmember cref="M:Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.ShowSplashScreen" />
675674
<altmember cref="M:Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase.OnCreateSplashScreen" />

xml/Microsoft.VisualBasic.Devices/Ports.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,6 @@
630630
631631
]]></format>
632632
</remarks>
633-
<altCompliant cref="None." />
634633
<altmember cref="Overload:Microsoft.VisualBasic.Devices.Ports.OpenSerialPort" />
635634
<altmember cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />
636635
<related type="Article" href="~/docs/visual-basic/language-reference/objects/index.md">Objects (Visual Basic)</related>

xml/Microsoft.VisualBasic.FileIO/FileSystem.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,6 @@
14521452
14531453
]]></format>
14541454
</remarks>
1455-
<altCompliant cref="None" />
14561455
<permission cref="T:System.Security.Permissions.FileIOPermission">Controls the ability to access files and folders. Associated enumeration: <see cref="F:System.Security.Permissions.PermissionState.Unrestricted" />.</permission>
14571456
<altmember cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />
14581457
<altmember cref="T:System.IO.DriveInfo" />
@@ -1577,7 +1576,6 @@
15771576
15781577
]]></format>
15791578
</remarks>
1580-
<altCompliant cref="None." />
15811579
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with <c>\\.\</c>).</exception>
15821580
<exception cref="T:System.ArgumentNullException">
15831581
<paramref name="directory" /> is <see langword="Nothing" /> or an empty string.</exception>
@@ -1658,7 +1656,6 @@
16581656
16591657
]]></format>
16601658
</remarks>
1661-
<altCompliant cref="None." />
16621659
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with <c>\\.\</c>).</exception>
16631660
<exception cref="T:System.ArgumentNullException">
16641661
<paramref name="directory" /> is <see langword="Nothing" /> or an empty string.</exception>
@@ -1736,7 +1733,6 @@
17361733
17371734
]]></format>
17381735
</remarks>
1739-
<altCompliant cref="None." />
17401736
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
17411737
<exception cref="T:System.ArgumentNullException">
17421738
<paramref name="directory" /> is <see langword="Nothing" /> or an empty string.</exception>
@@ -1819,7 +1815,6 @@
18191815
18201816
]]></format>
18211817
</remarks>
1822-
<altCompliant cref="None." />
18231818
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
18241819
<exception cref="T:System.ArgumentNullException">One or more of the specified wildcard characters is <see langword="Nothing" />, an empty string, or contains only spaces.</exception>
18251820
<exception cref="T:System.IO.DirectoryNotFoundException">The specified directory does not exist.</exception>
@@ -2077,7 +2072,6 @@
20772072
20782073
]]></format>
20792074
</remarks>
2080-
<altCompliant cref="None." />
20812075
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
20822076
<exception cref="T:System.ArgumentNullException">
20832077
<paramref name="directory" /> is <see langword="Nothing" />.</exception>
@@ -2165,7 +2159,6 @@
21652159
21662160
]]></format>
21672161
</remarks>
2168-
<altCompliant cref="None." />
21692162
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
21702163
<exception cref="T:System.ArgumentNullException">
21712164
<paramref name="directory" /> is <see langword="Nothing" />.</exception>

xml/Microsoft.VisualBasic.MyServices.Internal/ContextValue`1.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
3636
]]></format>
3737
</remarks>
38-
<altCompliant cref="None" />
3938
<forInternalUseOnly />
4039
<related type="Article" href="https://msdn.microsoft.com/library/f1d04509-5e46-4551-9f9f-94334a121fca">Development with My</related>
4140
</Docs>

xml/Microsoft.VisualBasic.MyServices/FileSystemProxy.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,6 @@
14321432
14331433
]]></format>
14341434
</remarks>
1435-
<altCompliant cref="None." />
14361435
<permission cref="T:System.Security.Permissions.FileIOPermission">Controls the ability to access files and folders. Associated enumeration: <see cref="F:System.Security.Permissions.PermissionState.Unrestricted" />.</permission>
14371436
<altmember cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" />
14381437
<altmember cref="T:System.IO.DriveInfo" />
@@ -1554,7 +1553,6 @@
15541553
15551554
]]></format>
15561555
</remarks>
1557-
<altCompliant cref="None." />
15581556
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with <c>\\.\</c>).</exception>
15591557
<exception cref="T:System.ArgumentNullException">
15601558
<paramref name="directory" /> is <see langword="Nothing" /> or an empty string.</exception>
@@ -1636,7 +1634,6 @@
16361634
16371635
]]></format>
16381636
</remarks>
1639-
<altCompliant cref="None." />
16401637
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with <c>\\.\</c>).</exception>
16411638
<exception cref="T:System.ArgumentNullException">
16421639
<paramref name="directory" /> is <see langword="Nothing" /> or an empty string.</exception>
@@ -1710,7 +1707,6 @@
17101707
17111708
]]></format>
17121709
</remarks>
1713-
<altCompliant cref="None." />
17141710
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
17151711
<exception cref="T:System.ArgumentNullException">
17161712
<paramref name="directory" /> is <see langword="Nothing" /> or an empty string.</exception>
@@ -1788,7 +1784,6 @@
17881784
17891785
]]></format>
17901786
</remarks>
1791-
<altCompliant cref="None." />
17921787
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
17931788
<exception cref="T:System.ArgumentNullException">One or more of the specified wildcard characters is <see langword="Nothing" />, an empty string, or contains only spaces.</exception>
17941789
<exception cref="T:System.IO.DirectoryNotFoundException">The specified directory does not exist.</exception>
@@ -2042,7 +2037,6 @@
20422037
20432038
]]></format>
20442039
</remarks>
2045-
<altCompliant cref="None." />
20462040
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
20472041
<exception cref="T:System.ArgumentNullException">
20482042
<paramref name="directory" /> is <see langword="Nothing" />.</exception>
@@ -2127,7 +2121,6 @@
21272121
21282122
]]></format>
21292123
</remarks>
2130-
<altCompliant cref="None." />
21312124
<exception cref="T:System.ArgumentException">The path is not valid for one of the following reasons: it is a zero-length string; it contains only white space; it contains invalid characters; or it is a device path (starts with \\\\.\\).</exception>
21322125
<exception cref="T:System.ArgumentNullException">
21332126
<paramref name="directory" /> is <see langword="Nothing" />.</exception>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3605,7 +3605,7 @@ Public Function StartsWith(e As Employee) As Boolean
36053605
36063606
This method uses the <xref:System.Array.Sort%2A?displayProperty=nameWithType> method, which applies the introspective sort as follows:
36073607
3608-
- If the partition size is fewer than 16 elements, it uses an insertion sort algorithm.
3608+
- If the partition size is less than or equal to 16 elements, it uses an insertion sort algorithm.
36093609
36103610
- If the number of partitions exceeds 2 log *n*, where *n* is the range of the input array, it uses a Heapsort algorithm.
36113611
@@ -3687,7 +3687,7 @@ Public Function StartsWith(e As Employee) As Boolean
36873687
36883688
This method uses the <xref:System.Array.Sort%2A?displayProperty=nameWithType> method, which applies the introspective sort as follows:
36893689
3690-
- If the partition size is fewer than 16 elements, it uses an insertion sort algorithm.
3690+
- If the partition size is less than or equal to 16 elements, it uses an insertion sort algorithm.
36913691
36923692
- If the number of partitions exceeds 2 log *n*, where *n* is the range of the input array, it uses a Heapsort algorithm.
36933693
@@ -3765,7 +3765,7 @@ Public Function StartsWith(e As Employee) As Boolean
37653765
37663766
This method uses <xref:System.Array.Sort%2A?displayProperty=nameWithType>, which applies the introspective sort as follows:
37673767
3768-
- If the partition size is fewer than 16 elements, it uses an insertion sort algorithm
3768+
- If the partition size is less than or equal to 16 elements, it uses an insertion sort algorithm
37693769
37703770
- If the number of partitions exceeds 2 log *n*, where *n* is the range of the input array, it uses a [Heapsort](https://en.wikipedia.org/wiki/Heapsort) algorithm.
37713771
@@ -3851,7 +3851,7 @@ Public Function StartsWith(e As Employee) As Boolean
38513851
38523852
This method uses <xref:System.Array.Sort%2A?displayProperty=nameWithType>, which applies the introspective sort as follows:
38533853
3854-
- If the partition size is fewer than 16 elements, it uses an insertion sort algorithm
3854+
- If the partition size is less than or equal to 16 elements, it uses an insertion sort algorithm
38553855
38563856
- If the number of partitions exceeds 2 log *n*, where *n* is the range of the input array, it uses a [Heapsort](https://en.wikipedia.org/wiki/Heapsort) algorithm.
38573857

xml/System.Data.Common/DbCommand.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
<ReturnType>System.Int32</ReturnType>
207207
</ReturnValue>
208208
<Docs>
209-
<summary>When overridden in a derived class, gets or sets the wait time before terminating the attempt to execute a command and generating an error.</summary>
209+
<summary>When overridden in a derived class, gets or sets the wait time (in seconds) before terminating the attempt to execute a command and generating an error.</summary>
210210
<value>The time in seconds to wait for the command to execute.</value>
211211
<remarks>
212212
<format type="text/markdown"><![CDATA[

xml/System.Data.Common/DbConnection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@
640640
<ReturnType>System.Int32</ReturnType>
641641
</ReturnValue>
642642
<Docs>
643-
<summary>Gets the time to wait while establishing a connection before terminating the attempt and generating an error.</summary>
643+
<summary>Gets the time to wait (in seconds) while establishing a connection before terminating the attempt and generating an error.</summary>
644644
<value>The time (in seconds) to wait for a connection to open. The default value is determined by the specific type of connection that you are using.</value>
645645
<remarks>To be added.</remarks>
646646
<related type="Article" href="~/docs/framework/data/adonet/ado-net-overview.md">ADO.NET Overview</related>

xml/System.Data.Common/DbProviderFactories.xml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@
251251
</ReturnValue>
252252
<Parameters />
253253
<Docs>
254-
<summary>To be added.</summary>
255-
<returns>To be added.</returns>
254+
<summary>Returns the invariant provider names for all registered instances of <see cref="T:System.Data.Common.DbProviderFactory" />.</summary>
255+
<returns>The invariant provider names for all registered instances of <see cref="T:System.Data.Common.DbProviderFactory" />.</returns>
256256
<remarks>To be added.</remarks>
257257
</Docs>
258258
</Member>
@@ -283,10 +283,10 @@
283283
<Parameter Name="factory" Type="System.Data.Common.DbProviderFactory" Index="1" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1" />
284284
</Parameters>
285285
<Docs>
286-
<param name="providerInvariantName">To be added.</param>
287-
<param name="factory">To be added.</param>
288-
<summary>To be added.</summary>
289-
<remarks>To be added.</remarks>
286+
<param name="providerInvariantName">The invariant provider name under which to register the provider.</param>
287+
<param name="factory">The instance of the provider factory to be registered.</param>
288+
<summary>Registers an instance of <see cref="T:System.Data.Common.DbProviderFactory" /> under the specified invariant provider name.</summary>
289+
<remarks>If a provider is already registered under <paramref name="providerInvariantName" />, that registration will be overwritten.</remarks>
290290
</Docs>
291291
</Member>
292292
<Member MemberName="RegisterFactory">
@@ -316,10 +316,10 @@
316316
<Parameter Name="factoryTypeAssemblyQualifiedName" Type="System.String" Index="1" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1" />
317317
</Parameters>
318318
<Docs>
319-
<param name="providerInvariantName">To be added.</param>
320-
<param name="factoryTypeAssemblyQualifiedName">To be added.</param>
321-
<summary>To be added.</summary>
322-
<remarks>To be added.</remarks>
319+
<param name="providerInvariantName">The invariant provider name under which to register the provider.</param>
320+
<param name="factoryTypeAssemblyQualifiedName">The assembly-qualified name for a <see cref="T:System.Data.Common.DbProviderFactory" />.</param>
321+
<summary>Registers a <see cref="T:System.Data.Common.DbProviderFactory" /> with the given assembly-qualified name under the specified invariant provider name.</summary>
322+
<remarks>If a provider is already registered under <paramref name="providerInvariantName" />, that registration will be overwritten.</remarks>
323323
</Docs>
324324
</Member>
325325
<Member MemberName="RegisterFactory">
@@ -349,10 +349,10 @@
349349
<Parameter Name="providerFactoryClass" Type="System.Type" Index="1" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1" />
350350
</Parameters>
351351
<Docs>
352-
<param name="providerInvariantName">To be added.</param>
353-
<param name="providerFactoryClass">To be added.</param>
354-
<summary>To be added.</summary>
355-
<remarks>To be added.</remarks>
352+
<param name="providerInvariantName">The invariant provider name under which to register the provider.</param>
353+
<param name="providerFactoryClass">The type representing a <see cref="T:System.Data.Common.DbProviderFactory" />.</param>
354+
<summary>Registers a <see cref="T:System.Data.Common.DbProviderFactory" /> with the given type under the specified invariant provider name.</summary>
355+
<remarks>If a provider is already registered under <paramref name="providerInvariantName" />, that registration will be overwritten.</remarks>
356356
</Docs>
357357
</Member>
358358
<Member MemberName="TryGetFactory">
@@ -382,10 +382,11 @@
382382
<Parameter Name="factory" Type="System.Data.Common.DbProviderFactory" RefType="out" Index="1" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1" />
383383
</Parameters>
384384
<Docs>
385-
<param name="providerInvariantName">To be added.</param>
386-
<param name="factory">To be added.</param>
387-
<summary>To be added.</summary>
388-
<returns>To be added.</returns>
385+
<param name="providerInvariantName">The invariant provider name to look up.</param>
386+
<param name="factory">When this method returns, contains the <see cref="T:System.Data.Common.DbProviderFactory" /> associated with the specified invariant provider name, if the name is found; otherwise, <see langword="null" />. This parameter is passed uninitialized.</param>
387+
<summary>Attempts to get the <see cref="T:System.Data.Common.DbProviderFactory" /> registered under the specified invariant provider name.</summary>
388+
<returns>
389+
<see langword="true" /> if a provider is registered under the specified invariant provider name; otherwise, <see langword="false" />.</returns>
389390
<remarks>To be added.</remarks>
390391
</Docs>
391392
</Member>
@@ -415,9 +416,10 @@
415416
<Parameter Name="providerInvariantName" Type="System.String" Index="0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1" />
416417
</Parameters>
417418
<Docs>
418-
<param name="providerInvariantName">To be added.</param>
419-
<summary>To be added.</summary>
420-
<returns>To be added.</returns>
419+
<param name="providerInvariantName">The invariant provider name of the registration to remove.</param>
420+
<summary>Removes a <see cref="T:System.Data.Common.DbProviderFactory" /> registration for the given provider invariant name.</summary>
421+
<returns>
422+
<see langword="true" /> if the registration is successfully found and removed; otherwise, <see langword="false" />. This method returns <see langword="false" /> if a registration for <paramref name="providerInvariantName" /> is not found.</returns>
421423
<remarks>To be added.</remarks>
422424
</Docs>
423425
</Member>

0 commit comments

Comments
 (0)