Skip to content

Commit 3001e6b

Browse files
BillWagnerBillWagner
authored
Merge pull request #4595 from dotnet/publish-18511
Merge master into live
2 parents 22378fb + 0b7dfaa commit 3001e6b

File tree

288 files changed

+4939
-929
lines changed

Some content is hidden

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

288 files changed

+4939
-929
lines changed

‎samples/snippets/cpp/VS_Snippets_CLR_System/system.Text.Encoding.IsProps/CPP/isprops.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ CodePage identifier and name BrDisp BrSave MNDisp MNSave 1-Byte Re
167167
57009 x-iscii-ma False False False False False True
168168
57010 x-iscii-gu False False False False False True
169169
57011 x-iscii-pa False False False False False True
170-
65000 utf-7 False False True True False True
171170
65001 utf-8 True True True True False True
172171
173172
*/

‎samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.Encoding.IsProps/CS/isprops.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ 57008 x-iscii-ka False False False False False Tr
169169
57009 x-iscii-ma False False False False False True
170170
57010 x-iscii-gu False False False False False True
171171
57011 x-iscii-pa False False False False False True
172-
65000 utf-7 False False True True False True
173172
65001 utf-8 True True True True False True
174173
175174
*/

‎samples/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ static void Main(string[] args)
1717
{
1818
try
1919
{
20-
// Display each file over 10 MB;
20+
// Display each file over 10 MB.
2121
if (fi.Length > 10000000)
2222
{
23-
Console.WriteLine($"{fi.FullName}\t\t{fi.Length.ToString("NO")}");
23+
Console.WriteLine($"{fi.FullName}\t\t{fi.Length:N0}");
2424
}
2525
}
2626
catch (UnauthorizedAccessException unAuthTop)
@@ -37,10 +37,10 @@ static void Main(string[] args)
3737
{
3838
try
3939
{
40-
// Display each file over 10 MB;
40+
// Display each file over 10 MB.
4141
if (fi.Length > 10000000)
4242
{
43-
Console.WriteLine($"{fi.FullName}\t\t{fi.Length.ToString("NO")}");
43+
Console.WriteLine($"{fi.FullName}\t\t{fi.Length:N0}");
4444
}
4545
}
4646
catch (UnauthorizedAccessException unAuthFile)

‎samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.Encoding.IsProps/VB/isprops.vb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ End Class
170170
'57009 x-iscii-ma False False False False False True
171171
'57010 x-iscii-gu False False False False False True
172172
'57011 x-iscii-pa False False False False False True
173-
'65000 utf-7 False False True True False True
174173
'65001 utf-8 True True True True False True
175174
'
176175
' </Snippet1>

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

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

‎xml/Microsoft.Extensions.Caching.Distributed/DistributedCacheEntryExtensions.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<AssemblyVersion>2.2.0.0</AssemblyVersion>
1515
<AssemblyVersion>3.0.0.0</AssemblyVersion>
1616
<AssemblyVersion>3.1.0.0</AssemblyVersion>
17+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
1718
</AssemblyInfo>
1819
<Base>
1920
<BaseTypeName>System.Object</BaseTypeName>
@@ -41,6 +42,7 @@
4142
<AssemblyVersion>2.2.0.0</AssemblyVersion>
4243
<AssemblyVersion>3.0.0.0</AssemblyVersion>
4344
<AssemblyVersion>3.1.0.0</AssemblyVersion>
45+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
4446
</AssemblyInfo>
4547
<ReturnValue>
4648
<ReturnType>Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions</ReturnType>
@@ -74,6 +76,7 @@
7476
<AssemblyVersion>2.2.0.0</AssemblyVersion>
7577
<AssemblyVersion>3.0.0.0</AssemblyVersion>
7678
<AssemblyVersion>3.1.0.0</AssemblyVersion>
79+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
7780
</AssemblyInfo>
7881
<ReturnValue>
7982
<ReturnType>Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions</ReturnType>
@@ -107,6 +110,7 @@
107110
<AssemblyVersion>2.2.0.0</AssemblyVersion>
108111
<AssemblyVersion>3.0.0.0</AssemblyVersion>
109112
<AssemblyVersion>3.1.0.0</AssemblyVersion>
113+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
110114
</AssemblyInfo>
111115
<ReturnValue>
112116
<ReturnType>Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions</ReturnType>

‎xml/Microsoft.Extensions.Caching.Distributed/DistributedCacheEntryOptions.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<AssemblyVersion>2.2.0.0</AssemblyVersion>
1515
<AssemblyVersion>3.0.0.0</AssemblyVersion>
1616
<AssemblyVersion>3.1.0.0</AssemblyVersion>
17+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
1718
</AssemblyInfo>
1819
<Base>
1920
<BaseTypeName>System.Object</BaseTypeName>
@@ -40,6 +41,7 @@
4041
<AssemblyVersion>2.2.0.0</AssemblyVersion>
4142
<AssemblyVersion>3.0.0.0</AssemblyVersion>
4243
<AssemblyVersion>3.1.0.0</AssemblyVersion>
44+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
4345
</AssemblyInfo>
4446
<Parameters />
4547
<Docs>
@@ -64,6 +66,7 @@
6466
<AssemblyVersion>2.2.0.0</AssemblyVersion>
6567
<AssemblyVersion>3.0.0.0</AssemblyVersion>
6668
<AssemblyVersion>3.1.0.0</AssemblyVersion>
69+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
6770
</AssemblyInfo>
6871
<ReturnValue>
6972
<ReturnType>System.Nullable&lt;System.DateTimeOffset&gt;</ReturnType>
@@ -91,6 +94,7 @@
9194
<AssemblyVersion>2.2.0.0</AssemblyVersion>
9295
<AssemblyVersion>3.0.0.0</AssemblyVersion>
9396
<AssemblyVersion>3.1.0.0</AssemblyVersion>
97+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
9498
</AssemblyInfo>
9599
<ReturnValue>
96100
<ReturnType>System.Nullable&lt;System.TimeSpan&gt;</ReturnType>
@@ -118,6 +122,7 @@
118122
<AssemblyVersion>2.2.0.0</AssemblyVersion>
119123
<AssemblyVersion>3.0.0.0</AssemblyVersion>
120124
<AssemblyVersion>3.1.0.0</AssemblyVersion>
125+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
121126
</AssemblyInfo>
122127
<ReturnValue>
123128
<ReturnType>System.Nullable&lt;System.TimeSpan&gt;</ReturnType>

‎xml/Microsoft.Extensions.Caching.Distributed/DistributedCacheExtensions.xml‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<AssemblyVersion>2.2.0.0</AssemblyVersion>
1515
<AssemblyVersion>3.0.0.0</AssemblyVersion>
1616
<AssemblyVersion>3.1.0.0</AssemblyVersion>
17+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
1718
</AssemblyInfo>
1819
<Base>
1920
<BaseTypeName>System.Object</BaseTypeName>
@@ -41,6 +42,7 @@
4142
<AssemblyVersion>2.2.0.0</AssemblyVersion>
4243
<AssemblyVersion>3.0.0.0</AssemblyVersion>
4344
<AssemblyVersion>3.1.0.0</AssemblyVersion>
45+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
4446
</AssemblyInfo>
4547
<ReturnValue>
4648
<ReturnType>System.String</ReturnType>
@@ -99,6 +101,7 @@
99101
<AssemblyVersion>2.2.0.0</AssemblyVersion>
100102
<AssemblyVersion>3.0.0.0</AssemblyVersion>
101103
<AssemblyVersion>3.1.0.0</AssemblyVersion>
104+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
102105
</AssemblyInfo>
103106
<Attributes>
104107
<Attribute FrameworkAlternate="dotnet-plat-ext-3.1">
@@ -110,9 +113,9 @@
110113
<ReturnType>System.Threading.Tasks.Task&lt;System.String&gt;</ReturnType>
111114
</ReturnValue>
112115
<Parameters>
113-
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
114-
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
115-
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
116+
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
117+
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
118+
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
116119
</Parameters>
117120
<Docs>
118121
<param name="cache">The cache in which to store the data.</param>
@@ -140,6 +143,7 @@
140143
<AssemblyVersion>2.2.0.0</AssemblyVersion>
141144
<AssemblyVersion>3.0.0.0</AssemblyVersion>
142145
<AssemblyVersion>3.1.0.0</AssemblyVersion>
146+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
143147
</AssemblyInfo>
144148
<ReturnValue>
145149
<ReturnType>System.Void</ReturnType>
@@ -203,15 +207,16 @@
203207
<AssemblyVersion>2.2.0.0</AssemblyVersion>
204208
<AssemblyVersion>3.0.0.0</AssemblyVersion>
205209
<AssemblyVersion>3.1.0.0</AssemblyVersion>
210+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
206211
</AssemblyInfo>
207212
<ReturnValue>
208213
<ReturnType>System.Threading.Tasks.Task</ReturnType>
209214
</ReturnValue>
210215
<Parameters>
211-
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
212-
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
213-
<Parameter Name="value" Type="System.Byte[]" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
214-
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="3" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
216+
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
217+
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
218+
<Parameter Name="value" Type="System.Byte[]" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
219+
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="3" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
215220
</Parameters>
216221
<Docs>
217222
<param name="cache">The cache in which to store the data.</param>
@@ -241,6 +246,7 @@
241246
<AssemblyVersion>2.2.0.0</AssemblyVersion>
242247
<AssemblyVersion>3.0.0.0</AssemblyVersion>
243248
<AssemblyVersion>3.1.0.0</AssemblyVersion>
249+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
244250
</AssemblyInfo>
245251
<ReturnValue>
246252
<ReturnType>System.Void</ReturnType>
@@ -276,6 +282,7 @@
276282
<AssemblyVersion>2.2.0.0</AssemblyVersion>
277283
<AssemblyVersion>3.0.0.0</AssemblyVersion>
278284
<AssemblyVersion>3.1.0.0</AssemblyVersion>
285+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
279286
</AssemblyInfo>
280287
<ReturnValue>
281288
<ReturnType>System.Void</ReturnType>
@@ -374,15 +381,16 @@
374381
<AssemblyVersion>2.2.0.0</AssemblyVersion>
375382
<AssemblyVersion>3.0.0.0</AssemblyVersion>
376383
<AssemblyVersion>3.1.0.0</AssemblyVersion>
384+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
377385
</AssemblyInfo>
378386
<ReturnValue>
379387
<ReturnType>System.Threading.Tasks.Task</ReturnType>
380388
</ReturnValue>
381389
<Parameters>
382-
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
383-
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
384-
<Parameter Name="value" Type="System.String" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
385-
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="3" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
390+
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
391+
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
392+
<Parameter Name="value" Type="System.String" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
393+
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="3" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
386394
</Parameters>
387395
<Docs>
388396
<param name="cache">The cache in which to store the data.</param>
@@ -409,16 +417,17 @@
409417
<AssemblyVersion>2.2.0.0</AssemblyVersion>
410418
<AssemblyVersion>3.0.0.0</AssemblyVersion>
411419
<AssemblyVersion>3.1.0.0</AssemblyVersion>
420+
<AssemblyVersion>5.0.0.0</AssemblyVersion>
412421
</AssemblyInfo>
413422
<ReturnValue>
414423
<ReturnType>System.Threading.Tasks.Task</ReturnType>
415424
</ReturnValue>
416425
<Parameters>
417-
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
418-
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
419-
<Parameter Name="value" Type="System.String" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
420-
<Parameter Name="options" Type="Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions" Index="3" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
421-
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="4" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1" />
426+
<Parameter Name="cache" Type="Microsoft.Extensions.Caching.Distributed.IDistributedCache" RefType="this" Index="0" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
427+
<Parameter Name="key" Type="System.String" Index="1" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
428+
<Parameter Name="value" Type="System.String" Index="2" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
429+
<Parameter Name="options" Type="Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions" Index="3" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
430+
<Parameter Name="token" Type="System.Threading.CancellationToken" Index="4" FrameworkAlternate="dotnet-plat-ext-2.0;dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
422431
</Parameters>
423432
<Docs>
424433
<param name="cache">The cache in which to store the data.</param>

0 commit comments

Comments
 (0)