From 2a57c92fa04d23bce8dbfc561a9b551a5f14bcf3 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 2 Dec 2016 16:11:52 +0100 Subject: [PATCH] [Facades] Add System.Security.Cryptography.Algorithms to net_4_x profile --- .../System.Security.Cryptography.Algorithms/TypeForwarders.cs | 1 - mcs/class/Facades/subdirs.make | 4 ++-- mcs/class/System.Core/System.Security.Cryptography/ECCurve.cs | 4 ---- .../System.Core/System.Security.Cryptography/ECParameters.cs | 4 ---- mcs/class/System.Core/System.Security.Cryptography/ECPoint.cs | 4 ---- .../corlib/System.Security.Cryptography/IncrementalHash.cs | 4 ---- 6 files changed, 2 insertions(+), 19 deletions(-) diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs b/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs index 167626a697e..ab52feebf60 100644 --- a/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs +++ b/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs @@ -42,7 +42,6 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.TripleDES))] - [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))] diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index c1cc21dbd57..d00bddce801 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -27,7 +27,7 @@ System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win3 System.IO.FileSystem.AccessControl System.Reflection.TypeExtensions System.Reflection.Emit.Lightweight System.Reflection.Emit.ILGeneration System.Reflection.Emit \ System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.Xml.XPath.XDocument \ System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \ -System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes +System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes System.Security.Cryptography.Algorithms # common_SUBDIRS dependencies common_DEPS_SUBDIRS = System.Security.Cryptography.X509Certificates System.ServiceModel.Primitives System.Runtime.Serialization.Primitives System.Runtime.Serialization.Xml @@ -70,6 +70,6 @@ monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \ System.Security.Cryptography.Cng -mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.Algorithms System.Security.Cryptography.OpenSsl +mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl PROFILE_PARALLEL_SUBDIRS = $(net_4_x_PARALLEL_SUBDIRS) diff --git a/mcs/class/System.Core/System.Security.Cryptography/ECCurve.cs b/mcs/class/System.Core/System.Security.Cryptography/ECCurve.cs index 40374b884f5..b7b97e8fe82 100644 --- a/mcs/class/System.Core/System.Security.Cryptography/ECCurve.cs +++ b/mcs/class/System.Core/System.Security.Cryptography/ECCurve.cs @@ -26,8 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NETSTANDARD - namespace System.Security.Cryptography { [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] @@ -85,5 +83,3 @@ namespace System.Security.Cryptography } } } - -#endif \ No newline at end of file diff --git a/mcs/class/System.Core/System.Security.Cryptography/ECParameters.cs b/mcs/class/System.Core/System.Security.Cryptography/ECParameters.cs index e7159043f32..5230121be65 100644 --- a/mcs/class/System.Core/System.Security.Cryptography/ECParameters.cs +++ b/mcs/class/System.Core/System.Security.Cryptography/ECParameters.cs @@ -26,8 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NETSTANDARD - namespace System.Security.Cryptography { [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] @@ -39,5 +37,3 @@ namespace System.Security.Cryptography public void Validate () { throw new NotImplementedException (); } } } - -#endif \ No newline at end of file diff --git a/mcs/class/System.Core/System.Security.Cryptography/ECPoint.cs b/mcs/class/System.Core/System.Security.Cryptography/ECPoint.cs index 88042d1f441..f0ab84b9b1a 100644 --- a/mcs/class/System.Core/System.Security.Cryptography/ECPoint.cs +++ b/mcs/class/System.Core/System.Security.Cryptography/ECPoint.cs @@ -26,8 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NETSTANDARD - namespace System.Security.Cryptography { [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] @@ -37,5 +35,3 @@ namespace System.Security.Cryptography public byte[] Y; } } - -#endif \ No newline at end of file diff --git a/mcs/class/corlib/System.Security.Cryptography/IncrementalHash.cs b/mcs/class/corlib/System.Security.Cryptography/IncrementalHash.cs index 14c895e597a..a1248fee72f 100644 --- a/mcs/class/corlib/System.Security.Cryptography/IncrementalHash.cs +++ b/mcs/class/corlib/System.Security.Cryptography/IncrementalHash.cs @@ -26,8 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NETSTANDARD - namespace System.Security.Cryptography { public sealed class IncrementalHash : IDisposable @@ -42,5 +40,3 @@ namespace System.Security.Cryptography public byte[] GetHashAndReset () { throw new NotImplementedException (); } } } - -#endif \ No newline at end of file -- 2.25.1