[Facades] Add System.Security.Cryptography.Algorithms to net_4_x profile

diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs b/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs
index 167626a697ef69495185a9630a8e8eaf5814e7e8..ab52feebf6068bd89960b467b4ddd7c00c6796c6 100644 (file)
--- 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 c1cc21dbd5779a22555e29a5e3d9bbf1c9c25133..d00bddce80139356049744bff22cfb3314859166 100644 (file)
--- 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 40374b884f5386bc7e10d571682e4c1f65320933..b7b97e8fe828833b53e122c6cb20d93899ee80a3 100644 (file)
--- 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 e7159043f32a06e6ec081a9a8ac23a5f635517e8..5230121be65a3f834224dcf735fd081441ebc01f 100644 (file)
--- 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 88042d1f441267302f56a9a6d929dfedc24729c1..f0ab84b9b1a073091576a270bd5fab2713881958 100644 (file)
--- 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 14c895e597a9cd4a1297218e0c03a649bd95296d..a1248fee72feeba01395a7215489bfa180dd5187 100644 (file)
--- 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