Skip to content

Commit 5ff40cc

Browse files
mairawmairaw
authored
Merge pull request #3354 from dotnet/master
Update live with current master
2 parents c573d53 + 1ed96ca commit 5ff40cc

File tree

7 files changed

+34
-12
lines changed

7 files changed

+34
-12
lines changed

‎.ghal.rules.json

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
{
2-
"labels": {
3-
"defaults": [ ":watch: Not Triaged" ],
4-
"product": {
5-
"(?i).*": "Source - Docs.ms"
6-
},
7-
"contentsource": {
8-
"(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.net.*": ":card_file_box: Technology - NCL",
9-
"(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.windows\\.forms.*": ":card_file_box: Technology - WinForms",
10-
"(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.security.*": ":card_file_box: Technology - Security"
2+
"version": 3,
3+
"configRevision": 1,
4+
5+
"issue": {
6+
"opened": {
7+
"processor-default": {
8+
"labels-add": [ ":watch: Not Triaged" ]
9+
},
10+
"processor-meta-docs": {
11+
"contentsource": {
12+
"(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.net.*": {
13+
"labels-add": ":card_file_box: Technology - NCL"
14+
},
15+
"(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.windows\\.forms.*": {
16+
"labels-add": ":card_file_box: Technology - WinForms"
17+
},
18+
"(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.security.*": {
19+
"labels-add": ":card_file_box: Technology - Security"
20+
}
21+
}
22+
}
1123
}
1224
}
1325
}

‎xml/System.Globalization/StringInfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To instantiate a <xref:System.Globalization.StringInfo> object that represents a
6464
6565
The following example illustrates both ways of working with the text elements in a string. It creates two strings:
6666
67-
- `strCombining`, which is a string of Arabic characters that includes three text elements with multiple <xref:System.Char> objects. The first text element is the base character ARABIC LETTER ALEF (U+-627) followed by ARABIC HAMZA BELOW (U+-655) and ARABIC KASRA (U+0650). The second text element is ARABIC LETTER HEH (U+0647) followed by ARABIC FATHA (U+-64E). The third text element is ARABIC LETTTER BEH (U+0628) followed by ARABIC DAMMATAN (U+064C).
67+
- `strCombining`, which is a string of Arabic characters that includes three text elements with multiple <xref:System.Char> objects. The first text element is the base character ARABIC LETTER ALEF (U+-627) followed by ARABIC HAMZA BELOW (U+-655) and ARABIC KASRA (U+0650). The second text element is ARABIC LETTER HEH (U+0647) followed by ARABIC FATHA (U+-64E). The third text element is ARABIC LETTER BEH (U+0628) followed by ARABIC DAMMATAN (U+064C).
6868
6969
- `strSurrogates`, which is a string that includes three surrogate pairs: GREEK ACROPHONIC FIVE TALENTS (U+10148) from the Supplementary Multilingual Plane, U+20026 from the Supplementary Ideographic Plane, and U+F1001 from the private user area. The UTF-16 encoding of each character is a surrogate pair that consists of a high surrogate followed by a low surrogate.
7070

‎xml/System.Security.Cryptography/Aes.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
5050
[!code-csharp[AesSample#1](~/samples/snippets/csharp/VS_Snippets_CLR/aessample/cs/program.cs#1)]
5151
[!code-vb[AesSample#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/aessample/vb/program.vb#1)]
52+
[!code-fsharp[AesSample#1](~/samples/snippets/fsharp/VS_Snippets_CLR/aessample/fs/program.fs#1)]
5253
5354
]]></format>
5455
</remarks>
@@ -94,6 +95,7 @@
9495
9596
[!code-csharp[AesSample#1](~/samples/snippets/csharp/VS_Snippets_CLR/aessample/cs/program.cs#1)]
9697
[!code-vb[AesSample#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/aessample/vb/program.vb#1)]
98+
[!code-fsharp[AesSample#1](~/samples/snippets/fsharp/VS_Snippets_CLR/aessample/fs/program.fs#1)]
9799
98100
]]></format>
99101
</remarks>

‎xml/System.Security.Cryptography/AesCryptoServiceProvider.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
4141
[!code-csharp[AesCryptoServProvider#1](~/samples/snippets/csharp/VS_Snippets_CLR/aescryptoservprovider/cs/program.cs#1)]
4242
[!code-vb[AesCryptoServProvider#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb#1)]
43+
[!code-fsharp[AesCryptoServProvider#1](~/samples/snippets/fsharp/VS_Snippets_CLR/aescryptoservprovider/fs/program.fs#1)]
4344
4445
]]></format>
4546
</remarks>
@@ -223,6 +224,7 @@
223224
224225
[!code-csharp[AesCryptoServProvider#3](~/samples/snippets/csharp/VS_Snippets_CLR/aescryptoservprovider/cs/program.cs#3)]
225226
[!code-vb[AesCryptoServProvider#3](~/samples/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb#3)]
227+
[!code-fsharp[AesCryptoServProvider#3](~/samples/snippets/fsharp/VS_Snippets_CLR/aescryptoservprovider/fs/program.fs#3)]
226228
227229
]]></format>
228230
</remarks>
@@ -350,6 +352,7 @@
350352
351353
[!code-csharp[AesCryptoServProvider#2](~/samples/snippets/csharp/VS_Snippets_CLR/aescryptoservprovider/cs/program.cs#2)]
352354
[!code-vb[AesCryptoServProvider#2](~/samples/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb#2)]
355+
[!code-fsharp[AesCryptoServProvider#2](~/samples/snippets/fsharp/VS_Snippets_CLR/aescryptoservprovider/fs/program.fs#2)]
353356
354357
]]></format>
355358
</remarks>

‎xml/System.Security.Cryptography/AesManaged.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
4949
[!code-csharp[AesManaged#1](~/samples/snippets/csharp/VS_Snippets_CLR/aesmanaged/cs/program.cs#1)]
5050
[!code-vb[AesManaged#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb#1)]
51+
[!code-fsharp[AesManaged#1](~/samples/snippets/fsharp/VS_Snippets_CLR/aesmanaged/fs/program.fs#1)]
5152
5253
]]></format>
5354
</remarks>
@@ -217,6 +218,7 @@
217218
218219
[!code-csharp[AesManaged#3](~/samples/snippets/csharp/VS_Snippets_CLR/aesmanaged/cs/program.cs#3)]
219220
[!code-vb[AesManaged#3](~/samples/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb#3)]
221+
[!code-fsharp[AesManaged#3](~/samples/snippets/fsharp/VS_Snippets_CLR/aesmanaged/fs/program.fs#3)]
220222
221223
]]></format>
222224
</remarks>
@@ -323,6 +325,7 @@
323325
324326
[!code-csharp[AesManaged#2](~/samples/snippets/csharp/VS_Snippets_CLR/aesmanaged/cs/program.cs#2)]
325327
[!code-vb[AesManaged#2](~/samples/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb#2)]
328+
[!code-fsharp[AesManaged#2](~/samples/snippets/fsharp/VS_Snippets_CLR/aesmanaged/fs/program.fs#2)]
326329
327330
]]></format>
328331
</remarks>

‎xml/System.Web.UI.WebControls/SiteMapDataSource.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
7777
<a name="retrieving_site_map_data"></a>
7878
## Retrieving Site Map Data
79-
Site map data is retrieved from an <xref:System.Web.SiteMapProvider> object, such as <xref:System.Web.XmlSiteMapProvider>, which is the default site map provider for ASP.NET. You can specify any provider that is configured for your site to provide the site map data to the <xref:System.Web.UI.WebControls.SiteMapDataSource> and can obtain the list of available providers by accessing the <xref:System.Web.SiteMap.Providers%2A?displayProperty=nameWithType> collection.
79+
Site map data is retrieved from a <xref:System.Web.SiteMapProvider> object, such as <xref:System.Web.XmlSiteMapProvider>, which is the default site map provider for ASP.NET. You can specify any provider that is configured for your site to provide the site map data to the <xref:System.Web.UI.WebControls.SiteMapDataSource> and can obtain the list of available providers by accessing the <xref:System.Web.SiteMap.Providers%2A?displayProperty=nameWithType> collection.
8080
8181
Like all data source controls, every instance of a <xref:System.Web.UI.WebControls.SiteMapDataSource> is associated with a single helper object, known as a data source view. The <xref:System.Web.UI.WebControls.SiteMapDataSourceView> is a view on the site map data, according to the properties of the data source, and is retrieved by calling the <xref:System.Web.UI.WebControls.SiteMapDataSource.GetHierarchicalView%2A> method. The <xref:System.Web.UI.WebControls.SiteMapDataSourceView> maintains the <xref:System.Web.SiteMapNodeCollection> object that the controls bind to.
8282

‎xml/ns-System.Collections.Immutable.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<Namespace Name="System.Collections.Immutable">
22
<Docs>
3-
<summary>The <see cref="N:System.Collections.Immutable" /> namespace contains interfaces and classes that define immutable collections. These classes are supported starting with [!INCLUDE[net_v45](~/includes/net-v45-md.md)]. Use them to build apps that target the desktop, [!INCLUDE[win8_appstore_long](~/includes/win8-appstore-long-md.md)], [!INCLUDE[net_portable](~/includes/net-portable-md.md)] and Windows Phone 8.</summary>
3+
<summary>The <see cref="N:System.Collections.Immutable" /> namespace contains interfaces and classes that define immutable collections.</summary>
44
<remarks>
55
<format type="text/markdown"><![CDATA[
6+
67
## Remarks
8+
79
With immutable collections, you can:
810
911
- Share a collection in a way that its consumer can be assured that the collection never changes.

0 commit comments

Comments
 (0)