diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2019-07-17 14:08:29 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-17 14:08:29 +0300 |
| commit | 4febac951ee1c04a024f3a64e0f2380903a7954d (patch) | |
| tree | 20185c1ed28a0803a34939a443b38b7748ca818a /mcs/class/Facades | |
| parent | b61a4368c0f432755bf8930d29cee07b7278025c (diff) | |
[bcl] Sync recent NS2.1 changes (#15696)
1) Copied changes from corefx for System.Data (also https://github.com/mono/corefx/pull/310)
2) New Tracing api is left empty (because the current API is empty too)
3) New AES types throw PNSE
Bump netstandard.dll AssemblyVersion to 2.1 (fixes https://github.com/mono/mono/issues/13412)
Diffstat (limited to 'mcs/class/Facades')
| -rw-r--r-- | mcs/class/Facades/netstandard/AssemblyInfo.cs | 6 | ||||
| -rw-r--r-- | mcs/class/Facades/netstandard/TypeForwarders.cs | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mcs/class/Facades/netstandard/AssemblyInfo.cs b/mcs/class/Facades/netstandard/AssemblyInfo.cs index 031c3e8a1b1..898941d520f 100644 --- a/mcs/class/Facades/netstandard/AssemblyInfo.cs +++ b/mcs/class/Facades/netstandard/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Mono development team")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("(c) Various Mono authors")] -[assembly: AssemblyVersion ("2.0.0.0")] -[assembly: AssemblyInformationalVersion ("2.0.0.0")] -[assembly: AssemblyFileVersion ("2.0.0.0")] +[assembly: AssemblyVersion ("2.1.0.0")] +[assembly: AssemblyInformationalVersion ("2.1.0.0")] +[assembly: AssemblyFileVersion ("2.1.0.0")] diff --git a/mcs/class/Facades/netstandard/TypeForwarders.cs b/mcs/class/Facades/netstandard/TypeForwarders.cs index 022b3190442..8342a6a8454 100644 --- a/mcs/class/Facades/netstandard/TypeForwarders.cs +++ b/mcs/class/Facades/netstandard/TypeForwarders.cs @@ -2444,8 +2444,13 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.CollectionExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.KeyValuePair))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.DiagnosticCounter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.EventSourceCreatedEventArgs))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.IncrementingEventCounter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.IncrementingPollingCounter))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.PollingCounter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.KnownColor))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.DataReaderExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Common.DbProviderFactories))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.ColorConverter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.PointConverter))] @@ -2508,6 +2513,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.SignatureToken))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.StringToken))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.TypeToken))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.AmbiguousImplementationException))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))] @@ -2534,6 +2540,8 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibVersionAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatters.IFieldInfo))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AesCcm))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.AesGcm))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CryptographicOperations))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECDiffieHellman))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.PbeParameters))] |