diff options
author | Egor Bogatov <egorbo@gmail.com> | 2019-03-06 10:55:16 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2019-03-06 10:55:16 +0300 |
commit | e42bf95d14b7ea16abcdff99d769e9f250ec2fd0 (patch) | |
tree | e98658bd49b77b58df3c021199fa2ffa9ca8b228 /mcs/class/Facades | |
parent | b31a445e85523a9a41b0975203f7ccd1d6f185a8 (diff) |
NS2.1 Sync new changes, mobile profiles (#13198)
* Add RuntimeHelpers.GetSubArray. Add missing types to NS's TypeForwarders.cs
* more NS2.1 changes
* ios changes
* Update Decimal (it's now readonly struct)
* fix mcs
* add ROMC.cs
* Fix tests, finish monodroid profile
* Make SRE-not-supported NS2.1 compatible
* Make monotouch_tv and watch NS2.1 compatible
* make some SRE types more NS21 compatible (non-abstract now)
* bump corefx
* More NS21 fixes
* bump coreclr acceptance tests
* Bump API snapshot submodule
* [csproj] Update project files
Diffstat (limited to 'mcs/class/Facades')
4 files changed, 72 insertions, 12 deletions
diff --git a/mcs/class/Facades/System.Drawing.Common/TypeForwarders.cs b/mcs/class/Facades/System.Drawing.Common/TypeForwarders.cs index 00817000720..9c031e985ff 100644 --- a/mcs/class/Facades/System.Drawing.Common/TypeForwarders.cs +++ b/mcs/class/Facades/System.Drawing.Common/TypeForwarders.cs @@ -568,7 +568,57 @@ namespace System.Drawing public System.Drawing.Size ToSize() { throw new PlatformNotSupportedException(); } public override string ToString() { throw new PlatformNotSupportedException(); } } +#else // MONODROID + // Added for NS2.1 support + public partial class SizeFConverter : System.ComponentModel.TypeConverter + { + public SizeFConverter() => throw new PlatformNotSupportedException(); + public override bool CanConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Type sourceType) => throw new PlatformNotSupportedException(); + public override bool CanConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object ConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value) => throw new PlatformNotSupportedException(); + public override object ConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object CreateInstance(System.ComponentModel.ITypeDescriptorContext context, System.Collections.IDictionary propertyValues) => throw new PlatformNotSupportedException(); + public override bool GetCreateInstanceSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + public override System.ComponentModel.PropertyDescriptorCollection GetProperties(System.ComponentModel.ITypeDescriptorContext context, object value, System.Attribute[] attributes) => throw new PlatformNotSupportedException(); + public override bool GetPropertiesSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + } + public partial class RectangleConverter : System.ComponentModel.TypeConverter + { + public RectangleConverter() => throw new PlatformNotSupportedException(); + public override bool CanConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Type sourceType) => throw new PlatformNotSupportedException(); + public override bool CanConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object ConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value) => throw new PlatformNotSupportedException(); + public override object ConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object CreateInstance(System.ComponentModel.ITypeDescriptorContext context, System.Collections.IDictionary propertyValues) => throw new PlatformNotSupportedException(); + public override bool GetCreateInstanceSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + public override System.ComponentModel.PropertyDescriptorCollection GetProperties(System.ComponentModel.ITypeDescriptorContext context, object value, System.Attribute[] attributes) => throw new PlatformNotSupportedException(); + public override bool GetPropertiesSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + } + public partial class SizeConverter : System.ComponentModel.TypeConverter + { + public SizeConverter() => throw new PlatformNotSupportedException(); + public override bool CanConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Type sourceType) => throw new PlatformNotSupportedException(); + public override bool CanConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object ConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value) => throw new PlatformNotSupportedException(); + public override object ConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object CreateInstance(System.ComponentModel.ITypeDescriptorContext context, System.Collections.IDictionary propertyValues) => throw new PlatformNotSupportedException(); + public override bool GetCreateInstanceSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + public override System.ComponentModel.PropertyDescriptorCollection GetProperties(System.ComponentModel.ITypeDescriptorContext context, object value, System.Attribute[] attributes) => throw new PlatformNotSupportedException(); + public override bool GetPropertiesSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + } + public partial class PointConverter : System.ComponentModel.TypeConverter + { + public PointConverter() => throw new PlatformNotSupportedException(); + public override bool CanConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Type sourceType) => throw new PlatformNotSupportedException(); + public override bool CanConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object ConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value) => throw new PlatformNotSupportedException(); + public override object ConvertTo(System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, System.Type destinationType) => throw new PlatformNotSupportedException(); + public override object CreateInstance(System.ComponentModel.ITypeDescriptorContext context, System.Collections.IDictionary propertyValues) => throw new PlatformNotSupportedException(); + public override bool GetCreateInstanceSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + public override System.ComponentModel.PropertyDescriptorCollection GetProperties(System.ComponentModel.ITypeDescriptorContext context, object value, System.Attribute[] attributes) => throw new PlatformNotSupportedException(); + public override bool GetPropertiesSupported(System.ComponentModel.ITypeDescriptorContext context) => throw new PlatformNotSupportedException(); + } #endif // !MONODROID } diff --git a/mcs/class/Facades/netstandard/Facades_netstandard.csproj b/mcs/class/Facades/netstandard/Facades_netstandard.csproj index fef97b6a0f3..ade3ab65815 100644 --- a/mcs/class/Facades/netstandard/Facades_netstandard.csproj +++ b/mcs/class/Facades/netstandard/Facades_netstandard.csproj @@ -28,12 +28,12 @@ <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' "> <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath> <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath> - <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NS21</DefineConstants> + <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SYSTEM_DRAWING</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'monodroid' "> <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath> <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath> - <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants> + <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;SYSTEM_DRAWING</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'monotouch' "> <OutputPath>./../../../class/lib/monotouch/Facades</OutputPath> diff --git a/mcs/class/Facades/netstandard/Makefile b/mcs/class/Facades/netstandard/Makefile index 00c08b4f36b..9a75c93c67a 100644 --- a/mcs/class/Facades/netstandard/Makefile +++ b/mcs/class/Facades/netstandard/Makefile @@ -11,7 +11,7 @@ LIBRARY = netstandard.dll KEYFILE = ../../Open.snk LIBRARY_SNK = $(KEYFILE) -SIGN_FLAGS = /delaysign /nowarn:1616,1699 /nowarn:618 +SIGN_FLAGS = /delaysign /nowarn:1616,1699,618 LIB_REFS = System System.Xml System.Xml.Linq System.Core System.Numerics System.Net.Http \ System.IO.Compression System.ComponentModel.Composition System.IO.Compression.FileSystem @@ -32,14 +32,14 @@ endif endif ifeq ($(PROFILE),net_4_x) -# TODO: remove once mobile profile supports NS 2.1 -LIB_MCS_FLAGS := -d:NS21 +LIB_MCS_FLAGS := -d:SYSTEM_DRAWING endif ifeq ($(PROFILE),monodroid) # XA implements System.Drawing API inside Mono.Android API_BIN_REFS := Mono.Android LIB_REFS += Facades/System.Drawing.Common +LIB_MCS_FLAGS := -d:SYSTEM_DRAWING endif ifeq ($(PROFILE),monotouch) diff --git a/mcs/class/Facades/netstandard/TypeForwarders.cs b/mcs/class/Facades/netstandard/TypeForwarders.cs index 52a59a92c28..a3cb72cd5fa 100644 --- a/mcs/class/Facades/netstandard/TypeForwarders.cs +++ b/mcs/class/Facades/netstandard/TypeForwarders.cs @@ -2405,7 +2405,17 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Xsl.XslTransform))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Xsl.XsltSettings))] -#if NS21 +#if !BOOTSTRAP_BASIC // NS2.1: +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Range))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Index))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.IAsyncEnumerable<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.IAsyncEnumerator<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncIteratorMethodBuilder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ConfiguredAsyncDisposable))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.SwitchExpressionException))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.HashCode))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MathF))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))] @@ -2433,14 +2443,16 @@ [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.Data.Common.DbProviderFactories))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.EventSourceCreatedEventArgs))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.ColorConverter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.KnownColor))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Common.DbProviderFactories))] +#if SYSTEM_DRAWING +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.ColorConverter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.PointConverter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.RectangleConverter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.SizeConverter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.SizeFConverter))] +#endif [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Globalization.ISOWeek))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.EnumerationOptions))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchCasing))] @@ -2452,14 +2464,12 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEnumerable<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEnumerator<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemName))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Http.ReadOnlyMemoryContent))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Http.ReadOnlyMemoryContent))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.ServerCertificateSelectionCallback))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.SslApplicationProtocol))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.SslClientAuthenticationOptions))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.SslServerAuthenticationOptions))] -#if !BOOTSTRAP_BASIC [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Sockets.UnixDomainSocketEndPoint))] -#endif [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.WebSockets.ValueWebSocketReceiveResult))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Matrix3x2))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Matrix4x4))] @@ -2527,6 +2537,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))] [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.Xml.Serialization.SchemaImporter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.CertificateRequest))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.DSACertificateExtensions))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder))] @@ -2537,5 +2548,4 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Serialization.SchemaImporter))] #endif |