Skip to content

Commit 2f5aa13

Browse files
BillWagnerBillWagner
authored
Merge pull request #4096 from dotnet/publish-28284
Merge master into live
2 parents b867156 + d5b5895 commit 2f5aa13

File tree

5 files changed

+43
-46
lines changed

5 files changed

+43
-46
lines changed

‎.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
/xml/System.Threading.Tasks**/** @tarekgh @stephentoub
7373
/xml/System.Transactions**/** @dasetser @HongGit
7474
/xml/System.Web**/** @scottaddie
75-
/xml/System.Windows**/** @vatsan-madhavan
75+
/xml/System.Windows**/** @dotnet/wpf-developers
7676
/xml/System.Windows.Forms**/** @RussKie @merriemcgaw
77-
/xml/System.Xaml**/** @vatsan-madhavan
77+
/xml/System.Xaml**/** @dotnet/wpf-developers
7878
/xml/System.Xml**/** @buyaa-n @krwq
7979

8080
# System.Console

‎xml/Microsoft.Extensions.DependencyInjection/ServiceCollectionContainerBuilderExtensions.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,8 @@
7878
</Parameters>
7979
<Docs>
8080
<param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> containing service descriptors.</param>
81-
<param name="options">
82-
Configures various service provider behaviors.
83-
</param>
84-
<summary>Creates a <see cref="T:Microsoft.Extensions.DependencyInjection.ServiceProvider" /> containing services from the provided <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" />
85-
optionally enabling scope validation.</summary>
81+
<param name="options">Configures various service provider behaviors including service-creation and scope validation.</param>
82+
<summary>Creates a <see cref="T:Microsoft.Extensions.DependencyInjection.ServiceProvider" /> containing services from the provided <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> optionally enabling service-creation and scope validation.</summary>
8683
<returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.ServiceProvider" />.</returns>
8784
<remarks>To be added.</remarks>
8885
</Docs>

‎xml/Microsoft.Extensions.DependencyInjection/ServiceProviderOptions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</ReturnValue>
6262
<Docs>
6363
<summary>
64-
<see langword="true" /> to perform check verifying that all services can be created during <code>BuildServiceProvider</code> call; otherwise, <see langword="false" />. Defaults to <see langword="false" />.
64+
<see langword="true" /> to perform check verifying that all services can be created during <see cref="MM:Microsoft.Extensions.DependencyInjection.ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.DependencyInjection.ServiceProviderOptions)" /> call; otherwise, <see langword="false" />. Defaults to <see langword="false" />.
6565
NOTE: this check doesn't verify open generics services.</summary>
6666
<value>To be added.</value>
6767
<remarks>To be added.</remarks>

‎xml/System/Int32.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,9 +1193,9 @@
11931193
<returns>A signed number indicating the relative values of this instance and <paramref name="value" />.
11941194
<list type="table"><listheader><term>Return Value</term><description>Description</description></listheader><item><term>Less than zero</term><description>This instance is less than <paramref name="value" />.</description></item><item><term>Zero</term><description>This instance is equal to <paramref name="value" />.</description></item><item><term>Greater than zero</term><description>This instance is greater than <paramref name="value" />.
11951195

1196-
-or-
1196+
-or-
11971197

1198-
<paramref name="value" /> is <see langword="null" />.</description></item></list></returns>
1198+
<paramref name="value" /> is <see langword="null" />.</description></item></list></returns>
11991199
<remarks>
12001200
<format type="text/markdown"><![CDATA[
12011201

‎xml/System/Math.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -609,10 +609,10 @@
609609
610610
## Examples
611611
The following example uses the <xref:System.Math.Acos%2A> method to assist in the computation of the inner angles of a given trapezoid.
612-
613-
[!code-cpp[MathSample#1](~/samples/snippets/cpp/VS_Snippets_CLR/MathSample/CPP/mathsample.cpp#1)]
614-
[!code-csharp[MathSample#1](~/samples/snippets/csharp/VS_Snippets_CLR/MathSample/CS/mathsample.cs#1)]
615-
[!code-vb[MathSample#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb#1)]
612+
613+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR/MathSample/CPP/mathsample.cpp" id="Snippet1":::
614+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/MathSample/CS/mathsample.cs" interactive="try-dotnet" id="Snippet1":::
615+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb" id="Snippet1":::
616616
617617
]]></format>
618618
</remarks>
@@ -730,10 +730,10 @@
730730
731731
## Examples
732732
The following example uses <xref:System.Math.Asin%2A> to assist in the computation of the inner angles of a given trapezoid.
733-
734-
[!code-cpp[MathSample#1](~/samples/snippets/cpp/VS_Snippets_CLR/MathSample/CPP/mathsample.cpp#1)]
735-
[!code-csharp[MathSample#1](~/samples/snippets/csharp/VS_Snippets_CLR/MathSample/CS/mathsample.cs#1)]
736-
[!code-vb[MathSample#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb#1)]
733+
734+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR/MathSample/CPP/mathsample.cpp" id="Snippet1":::
735+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/MathSample/CS/mathsample.cs" interactive="try-dotnet" id="Snippet1":::
736+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb" id="Snippet1":::
737737
738738
]]></format>
739739
</remarks>
@@ -1051,10 +1051,10 @@
10511051
10521052
## Examples
10531053
The following example demonstrates the use of the <xref:System.Math.BigMul%2A> method to calculate the product of two integer values.
1054-
1055-
[!code-cpp[math.bigmul#1](~/samples/snippets/cpp/VS_Snippets_CLR/math.bigmul/CPP/bigmul.cpp#1)]
1056-
[!code-csharp[math.bigmul#1](~/samples/snippets/csharp/VS_Snippets_CLR/math.bigmul/CS/bigmul.cs#1)]
1057-
[!code-vb[math.bigmul#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/math.bigmul/VB/bigmul.vb#1)]
1054+
1055+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR/math.bigmul/CPP/bigmul.cpp" id="Snippet1":::
1056+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/math.bigmul/CS/bigmul.cs" interactive="try-dotnet" id="Snippet1":::
1057+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/math.bigmul/VB/bigmul.vb" id="Snippet1":::
10581058
10591059
]]></format>
10601060
</remarks>
@@ -2115,9 +2115,9 @@ Dim i2 As Integer = CInt(Math.Ceiling(d2)) ' Result: 7969
21152115
## Examples
21162116
The following example uses <xref:System.Math.Cosh%2A> to evaluate certain hyperbolic identities for selected values.
21172117
2118-
[!code-cpp[System.Math.SinhCosh#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.SinhCosh/CPP/sinhcosh.cpp#1)]
2119-
[!code-csharp[System.Math.SinhCosh#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.SinhCosh/CS/sinhcosh.cs#1)]
2120-
[!code-vb[System.Math.SinhCosh#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.SinhCosh/VB/sinhcosh.vb#1)]
2118+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.SinhCosh/CPP/sinhcosh.cpp" id="Snippet1":::
2119+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.SinhCosh/CS/sinhcosh.cs" interactive="try-dotnet" id="Snippet1":::
2120+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.SinhCosh/VB/sinhcosh.vb" id="Snippet1":::
21212121
21222122
]]></format>
21232123
</remarks>
@@ -2320,10 +2320,10 @@ Dim i2 As Integer = CInt(Math.Ceiling(d2)) ' Result: 7969
23202320
23212321
## Examples
23222322
The following example compares <xref:System.Math.E> with the value calculated from a power series.
2323-
2324-
[!code-cpp[System.Math.E#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.E/CPP/efield.cpp#1)]
2325-
[!code-csharp[System.Math.E#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.E/CS/efield.cs#1)]
2326-
[!code-vb[System.Math.E#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.E/VB/efield.vb#1)]
2323+
2324+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.E/CPP/efield.cpp" id="Snippet1":::
2325+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.E/CS/efield.cs" interactive="try-dotnet" id="Snippet1":::
2326+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.E/VB/efield.vb" id="Snippet1":::
23272327
23282328
]]></format>
23292329
</remarks>
@@ -2687,8 +2687,8 @@ Remainder = (Math.Abs(dividend) - (Math.Abs(divisor) *
26872687
## Examples
26882688
The following example contrasts the remainder returned by the <xref:System.Math.IEEERemainder%2A> method with the remainder returned by the [remainder operator](~/docs/csharp/language-reference/operators/remainder-operator.md).
26892689
2690-
[!code-csharp[System.Math.IEEERemainder#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.math.ieeeremainder/cs/ieeeremainder1.cs#1)]
2691-
[!code-vb[System.Math.IEEERemainder#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.math.ieeeremainder/vb/ieeeremainder1.vb#1)]
2690+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.math.ieeeremainder/cs/ieeeremainder1.cs" interactive="try-dotnet" id="Snippet1":::
2691+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.math.ieeeremainder/vb/ieeeremainder1.vb" id="Snippet1":::
26922692
26932693
]]></format>
26942694
</remarks>
@@ -3060,9 +3060,9 @@ Remainder = (Math.Abs(dividend) - (Math.Abs(divisor) *
30603060
30613061
## Examples
30623062
The following example uses the <xref:System.Math.Log10%2A> method to return the base 10 logarithm for selected values.
3063-
3064-
[!code-csharp[System.Math.Log10#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.Log10/CS/log10.cs#1)]
3065-
[!code-vb[System.Math.Log10#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.Log10/VB/log10.vb#1)]
3063+
3064+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.Log10/CS/log10.cs" interactive="try-dotnet" id="Snippet1":::
3065+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.Log10/VB/log10.vb" id="Snippet1":::
30663066
30673067
]]></format>
30683068
</remarks>
@@ -6174,10 +6174,10 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
61746174
61756175
## Examples
61766176
The following example uses <xref:System.Math.Sinh%2A> to evaluate certain hyperbolic identities for selected values.
6177-
6178-
[!code-cpp[System.Math.SinhCosh#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.SinhCosh/CPP/sinhcosh.cpp#1)]
6179-
[!code-csharp[System.Math.SinhCosh#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.SinhCosh/CS/sinhcosh.cs#1)]
6180-
[!code-vb[System.Math.SinhCosh#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.SinhCosh/VB/sinhcosh.vb#1)]
6177+
6178+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.SinhCosh/CPP/sinhcosh.cpp" id="Snippet1":::
6179+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.SinhCosh/CS/sinhcosh.cs" interactive="try-dotnet" id="Snippet1":::
6180+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.SinhCosh/VB/sinhcosh.vb" id="Snippet1":::
61816181
61826182
]]></format>
61836183
</remarks>
@@ -6319,10 +6319,10 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
63196319
63206320
## Examples
63216321
The following example demonstrates how to calculate the tangent of an angle and display it to the console.
6322-
6323-
[!code-cpp[math.atanx#1](~/samples/snippets/cpp/VS_Snippets_CLR/math.atanx/CPP/atan.cpp#1)]
6324-
[!code-csharp[math.atanx#1](~/samples/snippets/csharp/VS_Snippets_CLR/math.atanx/CS/atan.cs#1)]
6325-
[!code-vb[math.atanx#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb#1)]
6322+
6323+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR/math.atanx/CPP/atan.cpp" id="Snippet1":::
6324+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/math.atanx/CS/atan.cs" interactive="try-dotnet" id="Snippet1":::
6325+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb" id="Snippet1":::
63266326
63276327
]]></format>
63286328
</remarks>
@@ -6386,10 +6386,10 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
63866386
63876387
## Examples
63886388
The following example uses <xref:System.Math.Tanh%2A> to evaluate certain hyperbolic tangent identities for selected values.
6389-
6390-
[!code-cpp[System.Math.Tanh#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.Tanh/CPP/tanh.cpp#1)]
6391-
[!code-csharp[System.Math.Tanh#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.Tanh/CS/tanh.cs#1)]
6392-
[!code-vb[System.Math.Tanh#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.Tanh/VB/tanh.vb#1)]
6389+
6390+
:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Math.Tanh/CPP/tanh.cpp" id="Snippet1":::
6391+
:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Math.Tanh/CS/tanh.cs" interactive="try-dotnet" id="Snippet1":::
6392+
:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Math.Tanh/VB/tanh.vb" id="Snippet1":::
63936393
63946394
]]></format>
63956395
</remarks>

0 commit comments

Comments
 (0)