Skip to content

Commit 1502e2b

Browse files
cxwtoolcxwtool
committed
Merge branch 'master' into publish-12333
2 parents edada29 + 1c2f680 commit 1502e2b

File tree

5 files changed

+72
-10
lines changed

5 files changed

+72
-10
lines changed

‎samples/snippets/csharp/VS_Snippets_CLR_System/system.security.cryptography.symmetricalgorithm.blocksize/cs/program.cs

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static void Main(string[] args)
8080
}
8181
}
8282
}
83-
//This sample produces the following output:
83+
//This sample produces the following output when run on .NET Framework:
8484
//AesManaged
8585
// Legal min key size = 128
8686
// Legal max key size = 256
@@ -106,4 +106,31 @@ static void Main(string[] args)
106106
// Legal max key size = 192
107107
// Legal min block size = 64
108108
// Legal max block size = 64
109+
//
110+
//This sample produces the following output when run on .NET Core:
111+
//AesManaged
112+
// Legal min key size = 128
113+
// Legal max key size = 256
114+
// Legal min block size = 128
115+
// Legal max block size = 128
116+
//DESCryptoServiceProvider
117+
// Legal min key size = 64
118+
// Legal max key size = 64
119+
// Legal min block size = 64
120+
// Legal max block size = 64
121+
//RC2CryptoServiceProvider
122+
// Legal min key size = 40
123+
// Legal max key size = 128
124+
// Legal min block size = 64
125+
// Legal max block size = 64
126+
//RijndaelManaged
127+
// Legal min key size = 128
128+
// Legal max key size = 256
129+
// Legal min block size = 128
130+
// Legal max block size = 128
131+
//TripleDESCryptoServiceProvider
132+
// Legal min key size = 128
133+
// Legal max key size = 192
134+
// Legal min block size = 64
135+
// Legal max block size = 64
109136
//</Snippet1>

‎samples/snippets/visualbasic/VS_Snippets_CLR_System/system.security.cryptography.symmetricalgorithm.blocksize/vb/program.vb

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Class Program
8282

8383
End Sub
8484
End Class
85-
'This sample produces the following output:
85+
'This sample produces the following output when run on .NET Framework:
8686
'AesManaged
8787
' Legal min key size = 128
8888
' Legal max key size = 256
@@ -108,4 +108,31 @@ End Class
108108
' Legal max key size = 192
109109
' Legal min block size = 64
110110
' Legal max block size = 64
111+
'
112+
'This sample produces the following output when run on .NET Core:
113+
'AesManaged
114+
' Legal min key size = 128
115+
' Legal max key size = 256
116+
' Legal min block size = 128
117+
' Legal max block size = 128
118+
'DESCryptoServiceProvider
119+
' Legal min key size = 64
120+
' Legal max key size = 64
121+
' Legal min block size = 64
122+
' Legal max block size = 64
123+
'RC2CryptoServiceProvider
124+
' Legal min key size = 40
125+
' Legal max key size = 128
126+
' Legal min block size = 64
127+
' Legal max block size = 64
128+
'RijndaelManaged
129+
' Legal min key size = 128
130+
' Legal max key size = 256
131+
' Legal min block size = 128
132+
' Legal max block size = 128
133+
'TripleDESCryptoServiceProvider
134+
' Legal min key size = 128
135+
' Legal max key size = 192
136+
' Legal min block size = 64
137+
' Legal max block size = 64
111138
'</Snippet1>

‎xml/System.Net.Http/HttpMethod.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,8 @@
471471
<ReturnType>System.Net.Http.HttpMethod</ReturnType>
472472
</ReturnValue>
473473
<Docs>
474-
<summary>To be added.</summary>
475-
<value>To be added.</value>
474+
<summary>Gets the HTTP PATCH protocol method.</summary>
475+
<value>The HTTP PATCH protocol method.</value>
476476
<remarks>To be added.</remarks>
477477
</Docs>
478478
</Member>

‎xml/System.Runtime.CompilerServices/RuntimeHelpers.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@
8686
<Parameter Name="size" Type="System.Int32" Index="1" FrameworkAlternate="net-5.0" />
8787
</Parameters>
8888
<Docs>
89-
<param name="type">To be added.</param>
90-
<param name="size">To be added.</param>
91-
<summary>To be added.</summary>
92-
<returns>To be added.</returns>
89+
<param name="type">The type associated with the allocated memory.</param>
90+
<param name="size">The amount of memory to allocate, in bytes.</param>
91+
<summary>Allocates memory that's associated with the <paramref name="type" /> and is freed if and when the <see cref="T:System.Type" /> is unloaded.</summary>
92+
<returns>The allocated memory.</returns>
9393
<remarks>To be added.</remarks>
9494
</Docs>
9595
</Member>

‎xml/System.Runtime.CompilerServices/SkipLocalsInitAttribute.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,16 @@
1919
</Attribute>
2020
</Attributes>
2121
<Docs>
22-
<summary>To be added.</summary>
23-
<remarks>To be added.</remarks>
22+
<summary>Indicates to the compiler that the .locals init flag should not be set in nested method headers when emitting to metadata.</summary>
23+
<remarks>
24+
<format type="text/markdown"><![CDATA[
25+
26+
## Remarks
27+
28+
This attribute is unsafe, because it may reveal uninitialized memory to the application in certain instances (for example, reading from uninitialized stack-allocated memory). If applied to a method directly, the attribute applies to that method and all its nested functions, including lambdas and local functions. If applied to a type or module, it applies to all methods nested inside. This attribute is intentionally not permitted on assemblies. To apply the attribute to multiple type declarations, use it at the module level instead.
29+
30+
]]></format>
31+
</remarks>
2432
</Docs>
2533
<Members>
2634
<Member MemberName=".ctor">

0 commit comments

Comments
 (0)