netstandard dependant facades update after 2.0 release (#5371)

diff --git a/external/api-snapshot b/external/api-snapshot
index 2563306d41f7f7fa30421c629d0f3b60b08b1169..bf03a7c5cf6b692fa662f1568ad66de35166b8ea 160000 (submodule)
--- a/external/api-snapshot
+++ b/external/api-snapshot
@@ -1 +1 @@
-Subproject commit 2563306d41f7f7fa30421c629d0f3b60b08b1169
+Subproject commit bf03a7c5cf6b692fa662f1568ad66de35166b8ea

diff --git a/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs b/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs
index d8f7bb5be561ec55cdacd76549276d2ff8925382..fa807fa7aa2d587386e2335a188f5f0b295ff1f9 100644 (file)
--- a/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs
+++ b/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs
@@ -30,6 +30,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlBulkCopyColumnMappingCollection))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlBulkCopyOptions))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlClientFactory))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlClientMetaDataCollectionNames))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlCommand))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlConnection))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlConnectionStringBuilder))]

diff --git a/mcs/class/Facades/System.Security.Cryptography.Cng/TypeForwarders.cs b/mcs/class/Facades/System.Security.Cryptography.Cng/TypeForwarders.cs
index 309d6fb5ce34cb7bdd3c5fa7162cc29ab342bf77..ade174b59d5caa4caa116833c0aa976168c9e4c4 100644 (file)
--- a/mcs/class/Facades/System.Security.Cryptography.Cng/TypeForwarders.cs
+++ b/mcs/class/Facades/System.Security.Cryptography.Cng/TypeForwarders.cs
@@ -41,6 +41,8 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CngProvider))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CngUIPolicy))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CngUIProtectionLevels))]
+// TODO: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSACng))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDsaCng))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECKeyXmlFormat))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSACng))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.TripleDESCng))]

diff --git a/mcs/class/Facades/System.ServiceModel.Http/TypeForwarders.cs b/mcs/class/Facades/System.ServiceModel.Http/TypeForwarders.cs
index 4aa28e9e49f0bc660137f259cfe73a0b8d799c84..597267838d2f9cfe170d462411e6ed88ba60518a 100644 (file)
--- a/mcs/class/Facades/System.ServiceModel.Http/TypeForwarders.cs
+++ b/mcs/class/Facades/System.ServiceModel.Http/TypeForwarders.cs
@@ -36,6 +36,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.WebSocketTransportUsage))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.HttpBindingBase))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.HttpClientCredentialType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.HttpProxyCredentialType))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.HttpTransportSecurity))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.NetHttpBinding))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.NetHttpsBinding))]

diff --git a/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptHandle.cs b/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptHandle.cs
index cbf1491612fcb12ef9a378c26e6cf214b0d30835..da4d7f36b9e769e5003eefda2ca57534f8862bf1 100644 (file)
--- a/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptHandle.cs
+++ b/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptHandle.cs
@@ -37,6 +37,12 @@ namespace Microsoft.Win32.SafeHandles
                {
                }
 
+               protected SafeNCryptHandle (IntPtr handle, System.Runtime.InteropServices.SafeHandle parentHandle)
+                       : base (false)
+               {
+                       throw new NotImplementedException ();
+               }
+
                public override bool IsInvalid { get { throw new NotImplementedException (); } }
 
                protected override bool ReleaseHandle ()

diff --git a/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptKeyHandle.cs b/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptKeyHandle.cs
index 3dcbfae8d6d2728bf032b18b4e48108bd6bad687..06840259bf63c1222250deed9864449bd017d4c1 100644 (file)
--- a/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptKeyHandle.cs
+++ b/mcs/class/System.Core/Microsoft.Win32.SafeHandles/SafeNCryptKeyHandle.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System;
+
 namespace Microsoft.Win32.SafeHandles
 {
        public sealed class SafeNCryptKeyHandle : SafeNCryptHandle
@@ -34,6 +36,12 @@ namespace Microsoft.Win32.SafeHandles
                {
                }
 
+               public SafeNCryptKeyHandle (IntPtr handle, System.Runtime.InteropServices.SafeHandle parentHandle)
+                       : base (handle, parentHandle)
+               {
+
+               }
+
                protected override bool ReleaseNativeHandle ()
                {
                        return false;

diff --git a/mcs/class/System.Core/common_System.Core.dll.sources b/mcs/class/System.Core/common_System.Core.dll.sources
index b521fe7b41c251c2dc89474990f179692f499c79..cfe271aeee0f79bab2d76540c229f345d706f046 100644 (file)
--- a/mcs/class/System.Core/common_System.Core.dll.sources
+++ b/mcs/class/System.Core/common_System.Core.dll.sources
@@ -71,6 +71,7 @@ corefx/SR.missing.cs
 ../referencesource/System.Core/System/Security/Cryptography/ECDiffieHellmanPublicKey.cs
 ../referencesource/System.Core/System/Security/Cryptography/ECDsa.cs
 ../referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
+../referencesource/System.Core/System/Security/Cryptography/ECKeyXmlFormat.cs
 ../referencesource/System.Core/System/Security/Cryptography/NCryptNative.cs
 ../referencesource/System.Core/System/Security/Cryptography/RsaCng.cs
 

diff --git a/mcs/class/System.Core/net_4_x_System.Core.dll.sources b/mcs/class/System.Core/net_4_x_System.Core.dll.sources
index 215215e76a2d7eb8b64eadeb1b8a0ba800294625..5cc42d8a3cf3be4a42c55d4f1d66778dee6eda00 100644 (file)
--- a/mcs/class/System.Core/net_4_x_System.Core.dll.sources
+++ b/mcs/class/System.Core/net_4_x_System.Core.dll.sources
@@ -14,6 +14,5 @@ System.Security.Cryptography/SHA512Cng.cs
 
 ../referencesource/System.Core/System/Security/Cryptography/AesManaged.cs
 ../referencesource/System.Core/System/Security/Cryptography/ECDiffieHellman.cs
-../referencesource/System.Core/System/Security/Cryptography/ECKeyXmlFormat.cs
 
 ../referencesource/System.Core/System/threading/ReaderWriterLockSlim/LockRecursionException.cs

diff --git a/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs b/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
index cd8283a9f64a650ba537e8053d5ec1d951e0ce5d..39ad193190cc159a1f79e91ca9072a06511c6506 100644 (file)
--- a/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
+++ b/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
@@ -35,6 +35,8 @@ namespace System.Security.Cryptography {
             throw new NotImplementedException ();
         }
 
+        public CngAlgorithm HashAlgorithm { get; set; }
+
         public CngKey Key {
             get {
                 throw new NotImplementedException ();
@@ -52,6 +54,38 @@ namespace System.Security.Cryptography {
         public override bool VerifyHash(byte[] hash, byte[] signature) {
             throw new NotImplementedException();
         }
+
+        public void FromXmlString (string xml, ECKeyXmlFormat format) {
+            throw new NotImplementedException();
+        }
+
+        public byte[] SignData (byte[] data) {
+            throw new NotImplementedException();
+        }
+
+        public byte[] SignData (System.IO.Stream data) {
+            throw new NotImplementedException();
+        }
+
+        public byte[] SignData (byte[] data, int offset, int count) {
+            throw new NotImplementedException();
+        }
+
+        public string ToXmlString (ECKeyXmlFormat format) {
+            throw new NotImplementedException();
+        }
+
+        public bool VerifyData (byte[] data, byte[] signature) {
+            throw new NotImplementedException();
+        }
+
+        public bool VerifyData (System.IO.Stream data, byte[] signature) {
+            throw new NotImplementedException();
+        }
+
+        public bool VerifyData (byte[] data, int offset, int count, byte[] signature) {
+            throw new NotImplementedException();
+        }
 #else
         private static KeySizes[] s_legalKeySizes = new KeySizes[] { new KeySizes(256, 384, 128), new KeySizes(521, 521, 0) };
 

diff --git a/tools/nuget-hash-extractor/Makefile b/tools/nuget-hash-extractor/Makefile
index 05b30f25975919693cfcac349c3fad47f9c08492..4df4d768ff470719ccc2cc23dcc2cbc0a586c797 100644 (file)
--- a/tools/nuget-hash-extractor/Makefile
+++ b/tools/nuget-hash-extractor/Makefile
@@ -10,13 +10,16 @@ nuget-hash-extractor.exe: $(SOURCES)
 
 download: .download_stamp_file
 
-run: download nuget-hash-extractor.exe exec-ver exec-asm
+run: download nuget-hash-extractor.exe exec-ver exec-asm exec-msbuild
 
 run-asm: download nuget-hash-extractor.exe exec-asm
 
 exec-asm:
        mono nuget-hash-extractor.exe nugets asm
 
+exec-msbuild:
+       mono nuget-hash-extractor.exe nugets guids_for_msbuild
+
 run-ver: download nuget-hash-extractor.exe exec-ver
 
 exec-ver:

diff --git a/tools/nuget-hash-extractor/download.sh b/tools/nuget-hash-extractor/download.sh
index aee4e36d21271fd6c9d0af819edcb1ca8a57bb57..375666e3b6b0702371cc3eb210239f1a4853db09 100755 (executable)
--- a/tools/nuget-hash-extractor/download.sh
+++ b/tools/nuget-hash-extractor/download.sh
@@ -1,5 +1,14 @@
 mkdir nugets
 
+##
+## Following are nugets which have net4* implementation but that implementation is Windows specific and won’t work on Mono or
+## with any profile derived from Mono net_4_x profile like Xamarin.Mac. This is due to no TFM for Mono or Xamarin.Mac which
+## would allow us to customize the behaviors.
+##
+## We don’t want to fix all broken nugets we only focus on few system-like that are likely to be used by broad audience and
+## we have working implementation available in one of Mono assemblies.
+##
+
 #System.Runtime.InteropServices.RuntimeInformation
 wget https://www.nuget.org/api/v2/package/System.Runtime.InteropServices.RuntimeInformation/4.3.0 -O nugets/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg
 wget https://www.nuget.org/api/v2/package/System.Runtime.InteropServices.RuntimeInformation/4.0.0 -O nugets/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg
@@ -23,20 +32,14 @@ wget https://www.nuget.org/api/v2/package/System.Net.Http/4.1.0 -O nugets/system
 wget https://www.nuget.org/api/v2/package/System.Net.Http/4.0.0 -O nugets/system.net.http.4.0.0.nupkg
 
 #System.Text.Encoding.CodePages
+wget https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.4.0 -O nugets/system.text.encoding.codepages.4.4.0.nupkg
 wget https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.3.0 -O nugets/system.text.encoding.codepages.4.3.0.nupkg
 wget https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.0.1 -O nugets/system.text.encoding.codepages.4.0.1.nupkg
 wget https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.0.0 -O nugets/system.text.encoding.codepages.4.0.0.nupkg
 
-#System.Reflection.DispatchProxy
-wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.3.0 -O nugets/system.reflection.dispatchproxy.4.3.0.nupkg
-wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.0.1 -O nugets/system.reflection.dispatchproxy.4.0.1.nupkg
-wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.0.0 -O nugets/system.reflection.dispatchproxy.4.0.0.nupkg
-
 #System.Threading.Overlapped
 wget https://www.nuget.org/api/v2/package/System.Threading.Overlapped/4.3.0 -O nugets/system.threading.overlapped.4.3.0.nupkg
 wget https://www.nuget.org/api/v2/package/System.Threading.Overlapped/4.0.1 -O nugets/system.threading.overlapped.4.0.1.nupkg
 wget https://www.nuget.org/api/v2/package/System.Threading.Overlapped/4.0.0 -O nugets/system.threading.overlapped.4.0.0.nupkg
 
-#System.Security.Cryptography.OpenSsl when .net 4.6.2 + 1 is out
-
 touch .download_stamp_file