Skip to content

Commit 2b78f05

Browse files
author
Ron Petrusha
authored
Merge pull request #3281 from dotnet/master
Update live with current master
2 parents 06cd98b + 7ae2979 commit 2b78f05

File tree

256 files changed

+2960
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+2960
-259
lines changed

‎docfx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"build": {
3-
"markdownEngineName": "dfm-latest",
3+
"markdownEngineName": "markdig",
44
"content": [
55
{
66
"files": [

‎xml/FrameworksIndex/dotnet-plat-ext-2.1.xml

Lines changed: 107 additions & 5 deletions
Large diffs are not rendered by default.

‎xml/FrameworksIndex/dotnet-plat-ext-2.2.xml

Lines changed: 107 additions & 5 deletions
Large diffs are not rendered by default.

‎xml/FrameworksIndex/dotnet-plat-ext-3.0.xml

Lines changed: 94 additions & 5 deletions
Large diffs are not rendered by default.

‎xml/FrameworksIndex/netstandard-2.1.xml

Lines changed: 122 additions & 0 deletions
Large diffs are not rendered by default.

‎xml/System.Buffers/ArrayBufferWriter`1.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<AssemblyName>System.Memory</AssemblyName>
1010
<AssemblyVersion>4.2.0.0</AssemblyVersion>
1111
</AssemblyInfo>
12+
<AssemblyInfo>
13+
<AssemblyName>netstandard</AssemblyName>
14+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
15+
</AssemblyInfo>
1216
<TypeParameters>
1317
<TypeParameter Name="T" />
1418
</TypeParameters>
@@ -37,6 +41,10 @@
3741
<AssemblyName>System.Memory</AssemblyName>
3842
<AssemblyVersion>4.2.0.0</AssemblyVersion>
3943
</AssemblyInfo>
44+
<AssemblyInfo>
45+
<AssemblyName>netstandard</AssemblyName>
46+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
47+
</AssemblyInfo>
4048
<Parameters />
4149
<Docs>
4250
<summary>Creates an instance of an <see cref="T:System.Buffers.ArrayBufferWriter`1" /> to which data can be written, with the default initial capacity.</summary>
@@ -55,6 +63,10 @@
5563
<AssemblyName>System.Memory</AssemblyName>
5664
<AssemblyVersion>4.2.0.0</AssemblyVersion>
5765
</AssemblyInfo>
66+
<AssemblyInfo>
67+
<AssemblyName>netstandard</AssemblyName>
68+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
69+
</AssemblyInfo>
5870
<Parameters>
5971
<Parameter Name="initialCapacity" Type="System.Int32" />
6072
</Parameters>
@@ -82,6 +94,10 @@
8294
<AssemblyName>System.Memory</AssemblyName>
8395
<AssemblyVersion>4.2.0.0</AssemblyVersion>
8496
</AssemblyInfo>
97+
<AssemblyInfo>
98+
<AssemblyName>netstandard</AssemblyName>
99+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
100+
</AssemblyInfo>
85101
<ReturnValue>
86102
<ReturnType>System.Void</ReturnType>
87103
</ReturnValue>
@@ -117,6 +133,10 @@ You must request a new buffer after calling `Advance` to continue writing more d
117133
<AssemblyName>System.Memory</AssemblyName>
118134
<AssemblyVersion>4.2.0.0</AssemblyVersion>
119135
</AssemblyInfo>
136+
<AssemblyInfo>
137+
<AssemblyName>netstandard</AssemblyName>
138+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
139+
</AssemblyInfo>
120140
<ReturnValue>
121141
<ReturnType>System.Int32</ReturnType>
122142
</ReturnValue>
@@ -138,6 +158,10 @@ You must request a new buffer after calling `Advance` to continue writing more d
138158
<AssemblyName>System.Memory</AssemblyName>
139159
<AssemblyVersion>4.2.0.0</AssemblyVersion>
140160
</AssemblyInfo>
161+
<AssemblyInfo>
162+
<AssemblyName>netstandard</AssemblyName>
163+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
164+
</AssemblyInfo>
141165
<ReturnValue>
142166
<ReturnType>System.Void</ReturnType>
143167
</ReturnValue>
@@ -163,6 +187,10 @@ You must clear the <xref:System.Buffers.ArrayBufferWriter`1> before trying to re
163187
<AssemblyName>System.Memory</AssemblyName>
164188
<AssemblyVersion>4.2.0.0</AssemblyVersion>
165189
</AssemblyInfo>
190+
<AssemblyInfo>
191+
<AssemblyName>netstandard</AssemblyName>
192+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
193+
</AssemblyInfo>
166194
<ReturnValue>
167195
<ReturnType>System.Int32</ReturnType>
168196
</ReturnValue>
@@ -186,6 +214,10 @@ You must clear the <xref:System.Buffers.ArrayBufferWriter`1> before trying to re
186214
<AssemblyName>System.Memory</AssemblyName>
187215
<AssemblyVersion>4.2.0.0</AssemblyVersion>
188216
</AssemblyInfo>
217+
<AssemblyInfo>
218+
<AssemblyName>netstandard</AssemblyName>
219+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
220+
</AssemblyInfo>
189221
<ReturnValue>
190222
<ReturnType>System.Memory&lt;T&gt;</ReturnType>
191223
</ReturnValue>
@@ -220,6 +252,10 @@ This method never returns <xref:System.Memory%601.Empty?displayProperty=nameWith
220252
<AssemblyName>System.Memory</AssemblyName>
221253
<AssemblyVersion>4.2.0.0</AssemblyVersion>
222254
</AssemblyInfo>
255+
<AssemblyInfo>
256+
<AssemblyName>netstandard</AssemblyName>
257+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
258+
</AssemblyInfo>
223259
<ReturnValue>
224260
<ReturnType>System.Span&lt;T&gt;</ReturnType>
225261
</ReturnValue>
@@ -252,6 +288,10 @@ This method never returns <xref:System.Memory%601.Empty?displayProperty=nameWith
252288
<AssemblyName>System.Memory</AssemblyName>
253289
<AssemblyVersion>4.2.0.0</AssemblyVersion>
254290
</AssemblyInfo>
291+
<AssemblyInfo>
292+
<AssemblyName>netstandard</AssemblyName>
293+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
294+
</AssemblyInfo>
255295
<ReturnValue>
256296
<ReturnType>System.Int32</ReturnType>
257297
</ReturnValue>
@@ -273,6 +313,10 @@ This method never returns <xref:System.Memory%601.Empty?displayProperty=nameWith
273313
<AssemblyName>System.Memory</AssemblyName>
274314
<AssemblyVersion>4.2.0.0</AssemblyVersion>
275315
</AssemblyInfo>
316+
<AssemblyInfo>
317+
<AssemblyName>netstandard</AssemblyName>
318+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
319+
</AssemblyInfo>
276320
<ReturnValue>
277321
<ReturnType>System.ReadOnlyMemory&lt;T&gt;</ReturnType>
278322
</ReturnValue>
@@ -294,6 +338,10 @@ This method never returns <xref:System.Memory%601.Empty?displayProperty=nameWith
294338
<AssemblyName>System.Memory</AssemblyName>
295339
<AssemblyVersion>4.2.0.0</AssemblyVersion>
296340
</AssemblyInfo>
341+
<AssemblyInfo>
342+
<AssemblyName>netstandard</AssemblyName>
343+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
344+
</AssemblyInfo>
297345
<ReturnValue>
298346
<ReturnType>System.ReadOnlySpan&lt;T&gt;</ReturnType>
299347
</ReturnValue>

‎xml/System.Buffers/ReadOnlySequence`1.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ The consumer is expected to manage the lifetime of memory until <see cref="T:Sys
250250
</AssemblyInfo>
251251
<AssemblyInfo>
252252
<AssemblyName>netstandard</AssemblyName>
253+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
253254
</AssemblyInfo>
254255
<ReturnValue>
255256
<ReturnType>System.ReadOnlySpan&lt;T&gt;</ReturnType>

‎xml/System.Buffers/SequenceReaderExtensions.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<AssemblyName>System.Memory</AssemblyName>
1010
<AssemblyVersion>4.2.0.0</AssemblyVersion>
1111
</AssemblyInfo>
12+
<AssemblyInfo>
13+
<AssemblyName>netstandard</AssemblyName>
14+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
15+
</AssemblyInfo>
1216
<Base>
1317
<BaseTypeName>System.Object</BaseTypeName>
1418
</Base>
@@ -30,6 +34,10 @@
3034
<AssemblyName>System.Memory</AssemblyName>
3135
<AssemblyVersion>4.2.0.0</AssemblyVersion>
3236
</AssemblyInfo>
37+
<AssemblyInfo>
38+
<AssemblyName>netstandard</AssemblyName>
39+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
40+
</AssemblyInfo>
3341
<ReturnValue>
3442
<ReturnType>System.Boolean</ReturnType>
3543
</ReturnValue>
@@ -58,6 +66,10 @@
5866
<AssemblyName>System.Memory</AssemblyName>
5967
<AssemblyVersion>4.2.0.0</AssemblyVersion>
6068
</AssemblyInfo>
69+
<AssemblyInfo>
70+
<AssemblyName>netstandard</AssemblyName>
71+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
72+
</AssemblyInfo>
6173
<ReturnValue>
6274
<ReturnType>System.Boolean</ReturnType>
6375
</ReturnValue>
@@ -86,6 +98,10 @@
8698
<AssemblyName>System.Memory</AssemblyName>
8799
<AssemblyVersion>4.2.0.0</AssemblyVersion>
88100
</AssemblyInfo>
101+
<AssemblyInfo>
102+
<AssemblyName>netstandard</AssemblyName>
103+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
104+
</AssemblyInfo>
89105
<ReturnValue>
90106
<ReturnType>System.Boolean</ReturnType>
91107
</ReturnValue>
@@ -114,6 +130,10 @@
114130
<AssemblyName>System.Memory</AssemblyName>
115131
<AssemblyVersion>4.2.0.0</AssemblyVersion>
116132
</AssemblyInfo>
133+
<AssemblyInfo>
134+
<AssemblyName>netstandard</AssemblyName>
135+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
136+
</AssemblyInfo>
117137
<ReturnValue>
118138
<ReturnType>System.Boolean</ReturnType>
119139
</ReturnValue>
@@ -142,6 +162,10 @@
142162
<AssemblyName>System.Memory</AssemblyName>
143163
<AssemblyVersion>4.2.0.0</AssemblyVersion>
144164
</AssemblyInfo>
165+
<AssemblyInfo>
166+
<AssemblyName>netstandard</AssemblyName>
167+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
168+
</AssemblyInfo>
145169
<ReturnValue>
146170
<ReturnType>System.Boolean</ReturnType>
147171
</ReturnValue>
@@ -170,6 +194,10 @@
170194
<AssemblyName>System.Memory</AssemblyName>
171195
<AssemblyVersion>4.2.0.0</AssemblyVersion>
172196
</AssemblyInfo>
197+
<AssemblyInfo>
198+
<AssemblyName>netstandard</AssemblyName>
199+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
200+
</AssemblyInfo>
173201
<ReturnValue>
174202
<ReturnType>System.Boolean</ReturnType>
175203
</ReturnValue>

0 commit comments

Comments
 (0)