diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2019-06-05 21:44:47 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-06-05 21:44:46 +0300 |
| commit | c5ed9bfc0d1b393c1dc6d97fc3caf8b5b09ab443 (patch) | |
| tree | df8a7247d92d41252595d47089ebfddecfaa0f66 /mcs/class/Facades | |
| parent | f7042d48a54fe7660a5157f52bed412030c922d5 (diff) | |
Reflect recent NS2.1 changes (#14679)
Due to few recent updates to dotnet/standard (NETStandard 2.1) we had 40 apicompat issues.
Mostly copy-pasted from dotnet/corefx.
Didn't implement Cryptography stuff yet.
Checked all profiles.
Implements #14609
Diffstat (limited to 'mcs/class/Facades')
| -rw-r--r-- | mcs/class/Facades/netstandard/TypeForwarders.cs | 4 | ||||
| -rwxr-xr-x | mcs/class/Facades/netstandard/apicheck.sh | 25 |
2 files changed, 22 insertions, 7 deletions
diff --git a/mcs/class/Facades/netstandard/TypeForwarders.cs b/mcs/class/Facades/netstandard/TypeForwarders.cs index 9f0d115980b..022b3190442 100644 --- a/mcs/class/Facades/netstandard/TypeForwarders.cs +++ b/mcs/class/Facades/netstandard/TypeForwarders.cs @@ -1482,6 +1482,7 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.DisablePrivateReflectionAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.DiscardableAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.DynamicAttribute))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.EnumeratorCancellationAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ExtensionAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.FixedAddressValueTypeAttribute))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.FixedBufferAttribute))] @@ -2535,6 +2536,8 @@ [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.Security.Cryptography.PbeParameters))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.PbeEncryptionAlgorithm))] [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))] @@ -2546,4 +2549,5 @@ [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.Threading.Tasks.TaskAsyncEnumerableExtensions))] #endif diff --git a/mcs/class/Facades/netstandard/apicheck.sh b/mcs/class/Facades/netstandard/apicheck.sh index fc30b227259..770182dc043 100755 --- a/mcs/class/Facades/netstandard/apicheck.sh +++ b/mcs/class/Facades/netstandard/apicheck.sh @@ -1,11 +1,22 @@ #!/bin/sh -# Cloned and Build location of https://github.com/dotnet/standard -STANDARD=/Users/cloned-location-of/dotnet/standard +# https://github.com/dotnet/standard +STANDARD_REPO=/path/to/standard -# 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 +# https://github.com/dotnet/arcade +ARCARDE_REPO=/path/to/arcade -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 +APICOMPAT=$ARCARDE_REPO/artifacts/bin/Microsoft.DotNet.ApiCompat/Debug/net472/Microsoft.DotNet.ApiCompat.exe +NSAPI=$STANDARD_REPO/artifacts/bin/ref/netstandard/Debug/netstandard.dll + +# uncomment to run only for net_4_x: +# mono $APICOMPAT $NSAPI --impl-dirs "../../lib/net_4_x/Facades/,../../lib/net_4_x/" --exclude-non-browsable > ns21_diff_net_4_x.txt + +# run ApiCompat for all profiles (runtime should be built with `--runtime-preset=all` flag) +for profile in net_4_x monodroid monotouch monotouch_watch testing_aot_full_interp testing_aot_full testing_aot_hybrid unreal wasm winaot xammac xammac_net_4_5; do + profile_path=../../lib/$profile + if [ -d "$profile_path" ]; then + echo "checking $(basename $profile_path) ..." + mono $APICOMPAT $NSAPI --impl-dirs "$profile_path/Facades/,$profile_path/" --exclude-non-browsable > ns21_diff_$(basename $profile_path).txt + fi +done
\ No newline at end of file |