Skip to content

Commit a1df63c

Browse files
authored
Merge net6-rc1 to main (dotnet#7182)
1 parent a4f8912 commit a1df63c

File tree

396 files changed

+23236
-17964
lines changed

Some content is hidden

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

396 files changed

+23236
-17964
lines changed

xml/FrameworksIndex/dotnet-plat-ext-6.0.xml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Assembly Name="System.Memory.Data" Version="6.0.0.0" />
7676
<Assembly Name="System.Net.Http.WinHttpHandler" Version="6.0.0.0" />
7777
<Assembly Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0.0" />
78-
<Assembly Name="System.Reflection.Context" Version="4.0.0.0" />
78+
<Assembly Name="System.Reflection.Context" Version="4.0.3.0" />
7979
<Assembly Name="System.Reflection.MetadataLoadContext" Version="6.0.0.0" />
8080
<Assembly Name="System.Resources.Extensions" Version="6.0.0.0" />
8181
<Assembly Name="System.Runtime.Caching" Version="4.0.0.0" />
@@ -538,6 +538,7 @@
538538
<Member Id="M:Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider.#ctor" />
539539
<Member Id="M:Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider.#ctor(System.String)" />
540540
<Member Id="M:Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider.Load" />
541+
<Member Id="M:Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationProvider.ToString" />
541542
</Type>
542543
<Type Name="Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource" Id="T:Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource">
543544
<Member Id="M:Microsoft.Extensions.Configuration.EnvironmentVariables.EnvironmentVariablesConfigurationSource.#ctor" />
@@ -2824,6 +2825,12 @@
28242825
<Member Id="M:Microsoft.JSInterop.DotNetObjectReference`1.Dispose" />
28252826
<Member Id="P:Microsoft.JSInterop.DotNetObjectReference`1.Value" />
28262827
</Type>
2828+
<Type Name="Microsoft.JSInterop.DotNetStreamReference" Id="T:Microsoft.JSInterop.DotNetStreamReference">
2829+
<Member Id="M:Microsoft.JSInterop.DotNetStreamReference.#ctor(System.IO.Stream,System.Boolean)" />
2830+
<Member Id="M:Microsoft.JSInterop.DotNetStreamReference.Dispose" />
2831+
<Member Id="P:Microsoft.JSInterop.DotNetStreamReference.LeaveOpen" />
2832+
<Member Id="P:Microsoft.JSInterop.DotNetStreamReference.Stream" />
2833+
</Type>
28272834
<Type Name="Microsoft.JSInterop.IJSInProcessObjectReference" Id="T:Microsoft.JSInterop.IJSInProcessObjectReference">
28282835
<Member Id="M:Microsoft.JSInterop.IJSInProcessObjectReference.Invoke``1(System.String,System.Object[])" />
28292836
</Type>
@@ -2902,6 +2909,7 @@
29022909
<Member Id="M:Microsoft.JSInterop.JSRuntime.ReadJSDataAsStreamAsync(Microsoft.JSInterop.IJSStreamReference,System.Int64,System.Threading.CancellationToken)" />
29032910
<Member Id="M:Microsoft.JSInterop.JSRuntime.ReceiveByteArray(System.Int32,System.Byte[])" />
29042911
<Member Id="M:Microsoft.JSInterop.JSRuntime.SendByteArray(System.Int32,System.Byte[])" />
2912+
<Member Id="M:Microsoft.JSInterop.JSRuntime.TransmitStreamAsync(System.Int64,Microsoft.JSInterop.DotNetStreamReference)" />
29052913
<Member Id="P:Microsoft.JSInterop.JSRuntime.DefaultAsyncTimeout" />
29062914
<Member Id="P:Microsoft.JSInterop.JSRuntime.JsonSerializerOptions" />
29072915
</Type>
@@ -5419,9 +5427,7 @@
54195427
<Member Id="M:System.Configuration.AppSettingsSection.#ctor" />
54205428
<Member Id="M:System.Configuration.AppSettingsSection.DeserializeElement(System.Xml.XmlReader,System.Boolean)" />
54215429
<Member Id="M:System.Configuration.AppSettingsSection.GetRuntimeObject" />
5422-
<Member Id="M:System.Configuration.AppSettingsSection.IsModified" />
54235430
<Member Id="M:System.Configuration.AppSettingsSection.Reset(System.Configuration.ConfigurationElement)" />
5424-
<Member Id="M:System.Configuration.AppSettingsSection.SerializeSection(System.Configuration.ConfigurationElement,System.String,System.Configuration.ConfigurationSaveMode)" />
54255431
<Member Id="P:System.Configuration.AppSettingsSection.File" />
54265432
<Member Id="P:System.Configuration.AppSettingsSection.Properties" />
54275433
<Member Id="P:System.Configuration.AppSettingsSection.Settings" />
@@ -5617,7 +5623,6 @@
56175623
<Member Id="M:System.Configuration.ConfigurationErrorsException.GetLineNumber(System.Xml.XmlNode)" />
56185624
<Member Id="M:System.Configuration.ConfigurationErrorsException.GetLineNumber(System.Xml.XmlReader)" />
56195625
<Member Id="M:System.Configuration.ConfigurationErrorsException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)" />
5620-
<Member Id="P:System.Configuration.ConfigurationErrorsException.BareMessage" />
56215626
<Member Id="P:System.Configuration.ConfigurationErrorsException.Errors" />
56225627
<Member Id="P:System.Configuration.ConfigurationErrorsException.Filename" />
56235628
<Member Id="P:System.Configuration.ConfigurationErrorsException.Line" />
@@ -5772,13 +5777,10 @@
57725777
<Member Id="M:System.Configuration.ConfigurationSectionCollection.Get(System.String)" />
57735778
<Member Id="M:System.Configuration.ConfigurationSectionCollection.GetEnumerator" />
57745779
<Member Id="M:System.Configuration.ConfigurationSectionCollection.GetKey(System.Int32)" />
5775-
<Member Id="M:System.Configuration.ConfigurationSectionCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)" />
57765780
<Member Id="M:System.Configuration.ConfigurationSectionCollection.Remove(System.String)" />
57775781
<Member Id="M:System.Configuration.ConfigurationSectionCollection.RemoveAt(System.Int32)" />
5778-
<Member Id="P:System.Configuration.ConfigurationSectionCollection.Count" />
57795782
<Member Id="P:System.Configuration.ConfigurationSectionCollection.Item(System.Int32)" />
57805783
<Member Id="P:System.Configuration.ConfigurationSectionCollection.Item(System.String)" />
5781-
<Member Id="P:System.Configuration.ConfigurationSectionCollection.Keys" />
57825784
</Type>
57835785
<Type Name="System.Configuration.ConfigurationSectionGroup" Id="T:System.Configuration.ConfigurationSectionGroup">
57845786
<Member Id="M:System.Configuration.ConfigurationSectionGroup.#ctor" />
@@ -5801,13 +5803,10 @@
58015803
<Member Id="M:System.Configuration.ConfigurationSectionGroupCollection.Get(System.String)" />
58025804
<Member Id="M:System.Configuration.ConfigurationSectionGroupCollection.GetEnumerator" />
58035805
<Member Id="M:System.Configuration.ConfigurationSectionGroupCollection.GetKey(System.Int32)" />
5804-
<Member Id="M:System.Configuration.ConfigurationSectionGroupCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)" />
58055806
<Member Id="M:System.Configuration.ConfigurationSectionGroupCollection.Remove(System.String)" />
58065807
<Member Id="M:System.Configuration.ConfigurationSectionGroupCollection.RemoveAt(System.Int32)" />
5807-
<Member Id="P:System.Configuration.ConfigurationSectionGroupCollection.Count" />
58085808
<Member Id="P:System.Configuration.ConfigurationSectionGroupCollection.Item(System.Int32)" />
58095809
<Member Id="P:System.Configuration.ConfigurationSectionGroupCollection.Item(System.String)" />
5810-
<Member Id="P:System.Configuration.ConfigurationSectionGroupCollection.Keys" />
58115810
</Type>
58125811
<Type Name="System.Configuration.ConfigurationSettings" Id="T:System.Configuration.ConfigurationSettings">
58135812
<Member Id="M:System.Configuration.ConfigurationSettings.GetConfig(System.String)" />
@@ -6117,7 +6116,6 @@
61176116
<Type Name="System.Configuration.PropertyInformationCollection" Id="T:System.Configuration.PropertyInformationCollection">
61186117
<Member Id="M:System.Configuration.PropertyInformationCollection.CopyTo(System.Configuration.PropertyInformation[],System.Int32)" />
61196118
<Member Id="M:System.Configuration.PropertyInformationCollection.GetEnumerator" />
6120-
<Member Id="M:System.Configuration.PropertyInformationCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)" />
61216119
<Member Id="P:System.Configuration.PropertyInformationCollection.Item(System.String)" />
61226120
</Type>
61236121
<Type Name="System.Configuration.PropertyValueOrigin" Id="T:System.Configuration.PropertyValueOrigin">
@@ -6194,7 +6192,6 @@
61946192
<Member Id="M:System.Configuration.RsaProtectedConfigurationProvider.Encrypt(System.Xml.XmlNode)" />
61956193
<Member Id="M:System.Configuration.RsaProtectedConfigurationProvider.ExportKey(System.String,System.Boolean)" />
61966194
<Member Id="M:System.Configuration.RsaProtectedConfigurationProvider.ImportKey(System.String,System.Boolean)" />
6197-
<Member Id="M:System.Configuration.RsaProtectedConfigurationProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)" />
61986195
<Member Id="P:System.Configuration.RsaProtectedConfigurationProvider.CspProviderName" />
61996196
<Member Id="P:System.Configuration.RsaProtectedConfigurationProvider.KeyContainerName" />
62006197
<Member Id="P:System.Configuration.RsaProtectedConfigurationProvider.RsaPublicKey" />
@@ -6764,6 +6761,14 @@
67646761
</Type>
67656762
</Namespace>
67666763
<Namespace Name="System.Data.Odbc">
6764+
<Type Name="System.Data.Odbc.ODBC32" Id="T:System.Data.Odbc.ODBC32" />
6765+
<Type Name="System.Data.Odbc.ODBC32/RETCODE" Id="T:System.Data.Odbc.ODBC32.RETCODE">
6766+
<Member Id="F:System.Data.Odbc.ODBC32.RETCODE.ERROR" />
6767+
<Member Id="F:System.Data.Odbc.ODBC32.RETCODE.INVALID_HANDLE" />
6768+
<Member Id="F:System.Data.Odbc.ODBC32.RETCODE.NO_DATA" />
6769+
<Member Id="F:System.Data.Odbc.ODBC32.RETCODE.SUCCESS" />
6770+
<Member Id="F:System.Data.Odbc.ODBC32.RETCODE.SUCCESS_WITH_INFO" />
6771+
</Type>
67676772
<Type Name="System.Data.Odbc.OdbcCommand" Id="T:System.Data.Odbc.OdbcCommand">
67686773
<Member Id="M:System.Data.Odbc.OdbcCommand.#ctor" />
67696774
<Member Id="M:System.Data.Odbc.OdbcCommand.#ctor(System.String)" />
@@ -17181,6 +17186,7 @@
1718117186
<Member Id="M:System.Security.HostProtectionException.#ctor(System.String)" />
1718217187
<Member Id="M:System.Security.HostProtectionException.#ctor(System.String,System.Exception)" />
1718317188
<Member Id="M:System.Security.HostProtectionException.#ctor(System.String,System.Security.Permissions.HostProtectionResource,System.Security.Permissions.HostProtectionResource)" />
17189+
<Member Id="M:System.Security.HostProtectionException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)" />
1718417190
<Member Id="M:System.Security.HostProtectionException.ToString" />
1718517191
<Member Id="P:System.Security.HostProtectionException.DemandedResources" />
1718617192
<Member Id="P:System.Security.HostProtectionException.ProtectedResources" />
@@ -17631,6 +17637,7 @@
1763117637
<Member Id="M:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId.#ctor" />
1763217638
<Member Id="M:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId.#ctor(System.Byte[])" />
1763317639
<Member Id="M:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId.#ctor(System.ReadOnlySpan{System.Byte})" />
17640+
<Member Id="M:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId.CopyFrom(System.Security.Cryptography.AsnEncodedData)" />
1763417641
<Member Id="P:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId.KeyId" />
1763517642
</Type>
1763617643
<Type Name="System.Security.Cryptography.Pkcs.Pkcs9MessageDigest" Id="T:System.Security.Cryptography.Pkcs.Pkcs9MessageDigest">
@@ -17836,6 +17843,12 @@
1783617843
<Member Id="M:System.Security.Cryptography.Xml.CipherReference.GetXml" />
1783717844
<Member Id="M:System.Security.Cryptography.Xml.CipherReference.LoadXml(System.Xml.XmlElement)" />
1783817845
</Type>
17846+
<Type Name="System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException" Id="T:System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException">
17847+
<Member Id="M:System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException.#ctor" />
17848+
<Member Id="M:System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)" />
17849+
<Member Id="M:System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException.#ctor(System.String)" />
17850+
<Member Id="M:System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException.#ctor(System.String,System.Exception)" />
17851+
</Type>
1783917852
<Type Name="System.Security.Cryptography.Xml.DataObject" Id="T:System.Security.Cryptography.Xml.DataObject">
1784017853
<Member Id="M:System.Security.Cryptography.Xml.DataObject.#ctor" />
1784117854
<Member Id="M:System.Security.Cryptography.Xml.DataObject.#ctor(System.String,System.String,System.String,System.Xml.XmlElement)" />

xml/FrameworksIndex/msbuild-16-netcore.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3209,15 +3209,6 @@
32093209
<Member Id="P:Microsoft.Build.Tasks.SGen.UseKeep" />
32103210
<Member Id="P:Microsoft.Build.Tasks.SGen.UseProxyTypes" />
32113211
</Type>
3212-
<Type Name="Microsoft.Build.Tasks.SignFile" Id="T:Microsoft.Build.Tasks.SignFile">
3213-
<Member Id="M:Microsoft.Build.Tasks.SignFile.#ctor" />
3214-
<Member Id="M:Microsoft.Build.Tasks.SignFile.Execute" />
3215-
<Member Id="P:Microsoft.Build.Tasks.SignFile.CertificateThumbprint" />
3216-
<Member Id="P:Microsoft.Build.Tasks.SignFile.SigningTarget" />
3217-
<Member Id="P:Microsoft.Build.Tasks.SignFile.TargetFrameworkIdentifier" />
3218-
<Member Id="P:Microsoft.Build.Tasks.SignFile.TargetFrameworkVersion" />
3219-
<Member Id="P:Microsoft.Build.Tasks.SignFile.TimestampUrl" />
3220-
</Type>
32213212
<Type Name="Microsoft.Build.Tasks.TaskExtension" Id="T:Microsoft.Build.Tasks.TaskExtension">
32223213
<Member Id="P:Microsoft.Build.Tasks.TaskExtension.Log" />
32233214
</Type>

0 commit comments

Comments
 (0)