diff options
author | Egor Bogatov <egorbo@gmail.com> | 2019-02-15 00:40:58 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2019-02-15 00:40:58 +0300 |
commit | cf69b4725976e51416bfdff22f3e1834006af00a (patch) | |
tree | 4691c00f7b3ec2724358070abacde69c117252d6 /mcs/class/Facades | |
parent | 572d9928c06ea1c77249b9e43c68253d138acd74 (diff) |
NS2.1: System.IO, System.Reflection.Emit, etc (#12854)
* System.IO, System.Data
* lots of small ns21 improvements
* More changes (System.Reflection.Emit)
* Add IEquatable to S.R.Emit types
* bump corefx
* fix unix build
* more NS21 changes
* more changes
* bump corefx
* Fix failing tests (Sockets)
* bump corefx
* tmp workaround
* move DispatchProxyGenerator to net_4_x
* Bump API snapshot submodule
* [csproj] Update project files
Diffstat (limited to 'mcs/class/Facades')
-rw-r--r-- | mcs/class/Facades/netstandard/Facades_netstandard.csproj | 5 | ||||
-rw-r--r-- | mcs/class/Facades/netstandard/Makefile | 5 | ||||
-rw-r--r-- | mcs/class/Facades/netstandard/TypeForwarders.cs | 41 | ||||
-rwxr-xr-x | mcs/class/Facades/netstandard/apicheck.sh | 8 |
4 files changed, 39 insertions, 20 deletions
diff --git a/mcs/class/Facades/netstandard/Facades_netstandard.csproj b/mcs/class/Facades/netstandard/Facades_netstandard.csproj index 5211945989f..3110448800c 100644 --- a/mcs/class/Facades/netstandard/Facades_netstandard.csproj +++ b/mcs/class/Facades/netstandard/Facades_netstandard.csproj @@ -6,7 +6,7 @@ <Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
<ProjectGuid>{E4596A34-AFBC-4744-8352-E6996AC34C16}</ProjectGuid>
<OutputType>Library</OutputType>
- <NoWarn>1699,1616,1699,618</NoWarn>
+ <NoWarn>1699</NoWarn>
<LangVersion>latest</LangVersion>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">macos</HostPlatform>
@@ -17,7 +17,6 @@ <AssemblyName>netstandard</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<SignAssembly>true</SignAssembly>
- <DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>../../Open.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
@@ -29,7 +28,7 @@ <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</DefineConstants>
+ <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NS21</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
diff --git a/mcs/class/Facades/netstandard/Makefile b/mcs/class/Facades/netstandard/Makefile index dde2d80ddd2..b8be19fd64b 100644 --- a/mcs/class/Facades/netstandard/Makefile +++ b/mcs/class/Facades/netstandard/Makefile @@ -31,6 +31,11 @@ endif endif +ifeq ($(PROFILE),net_4_x) +# TODO: remove once mobile profile supports NS 2.1 +LIB_MCS_FLAGS := -d:NS21 +endif + ifeq ($(PROFILE),monodroid) # XA implements System.Drawing API inside Mono.Android API_BIN_REFS := Mono.Android diff --git a/mcs/class/Facades/netstandard/TypeForwarders.cs b/mcs/class/Facades/netstandard/TypeForwarders.cs index 4305148bfc0..0d00088c70a 100644 --- a/mcs/class/Facades/netstandard/TypeForwarders.cs +++ b/mcs/class/Facades/netstandard/TypeForwarders.cs @@ -130,6 +130,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Guid))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.HttpStyleUriParser))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IAsyncResult))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IAsyncDisposable))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ICloneable))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IComparable))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IComparable<>))] @@ -1424,6 +1425,16 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.TypeFilter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.TypeInfo))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.FlowControl))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.DynamicILInfo))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.EventToken))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ExceptionHandler))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.FieldToken))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.MethodToken))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ParameterToken))] +// [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.PropertyToken))] +// [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.Reflection.Emit.OpCode))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.OpCodes))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.OpCodeType))] @@ -2440,23 +2451,25 @@ [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))] -//[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))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchType))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliDecoder))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliEncoder))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliStream))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEntry))] -//[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.Globalization.ISOWeek))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.EnumerationOptions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchCasing))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchType))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliDecoder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliEncoder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliStream))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEntry))] +[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.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))] @@ -2467,7 +2480,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector2))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector3))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector4))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.DispatchProxy))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.DispatchProxy))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.AssemblyBuilder))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.AssemblyBuilderAccess))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ConstructorBuilder))] @@ -2512,11 +2525,11 @@ [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.CryptographicOperations))] +[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.X509Certificates.CertificateRequest))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.DSACertificateExtensions))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder))] //[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.X509SignatureGenerator))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.ValueTask))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.ValueTask<>))] diff --git a/mcs/class/Facades/netstandard/apicheck.sh b/mcs/class/Facades/netstandard/apicheck.sh index 8c45c633c78..fc30b227259 100755 --- a/mcs/class/Facades/netstandard/apicheck.sh +++ b/mcs/class/Facades/netstandard/apicheck.sh @@ -3,7 +3,9 @@ # Cloned and Build location of https://github.com/dotnet/standard STANDARD=/Users/cloned-location-of/dotnet/standard -APICOMPAT=$STANDARD/Tools/ApiCompat.exe -NSAPI=$STANDARD/bin/ref/netstandard/2.0.0.0/netstandard.dll +# Microsoft.DotNet.ApiCompat.exe can be built in https://github.com/dotnet/arcade +APICOMPAT=Microsoft.DotNet.ApiCompat.exe +NSAPI=$(STANDARD)/artifacts/bin/ref/netstandard/Debug/netstandard.dll -dotnet $APICOMPAT $NSAPI -implDirs:../../lib/net_4_x/Facades/,../../lib/net_4_x/
\ No newline at end of file +dotnet $APICOMPAT $NSAPI --impl-dirs "../../lib/net_4_x/Facades/,../../lib/net_4_x/" --exclude-non-browsable +# --exclude-non-browsable ignores `EditorBrowsableAttribute` issues
\ No newline at end of file |