Imported Upstream version 4.8.0.459

Former-commit-id: 2a5b9df2014f72665850c7f885e7aed54704a53a

mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs

@@ -165,13 +165,13 @@ namespace Mono.Security.Interface
 
 		#region Obsolete APIs
 
-		[Obsolete]
+		[Obsolete ("Use GetProvider() instead.")]
 		public static MonoTlsProvider GetDefaultProvider ()
 		{
 			return GetProvider ();
 		}
 
-		[Obsolete]
+		[Obsolete ("Use Initialize(string provider) instead.")]
 		public static void SetDefaultProvider (string name)
 		{
 			Initialize (name);

mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs

@@ -387,7 +387,7 @@ namespace Mono.Security.X509 {
 			if (!CheckStore (path, false))
 				return coll;	// empty collection
 
-			string[] files = Directory.GetFiles (path, "*.cer");
+			string[] files = Directory.GetFiles (path, _newFormat ? "*.0" : "*.cer");
 			if ((files != null) && (files.Length > 0)) {
 				foreach (string file in files) {
 					try {

mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs

@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.Configuration;

mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs

@@ -32,7 +32,7 @@ using System.Data.Common;
 using System.Data.SqlClient;
 
 /*--For Bug 853 Test Begin--*/
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using Mono.Data.Sqlite;
 #endif
 /*--For Bug 853 Test End--*/
@@ -189,7 +189,7 @@ namespace MonoTests.System.Data.Common
 				Assert.IsNotNull (ex.Message, "#4");
 			}
 		}
-#if !MOBILE	
+#if !MOBILE && !MONOMAC
 		[Test]
 		[Category ("NotWorking")] // Requires newer sqlite than is on wrench
 		public void XimarinBugzillaBug853Test()

mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs

@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System.IO;
 using System.Xml;

mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs

@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug666333Test.cs

@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.Runtime.Serialization;

mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/WsdlHelper.cs

@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.IO;

mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractExporterTest2.cs

@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs

@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Activation/WebScriptServiceHostFactoryTest.cs

@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.ServiceModel;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Channels/WebMessageEncodingBindingElementTest.cs

@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.IO;
 using System.ServiceModel;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Configuration/WebHttpBindingElementTest.cs

@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.ServiceModel.Configuration;
 using NUnit.Framework;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs

@@ -74,7 +74,7 @@ namespace MonoTests.System.ServiceModel.Description
 			Assert.AreEqual (0, pl.Count, "#1");
 		}
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 		[Test]
 		public void ApplyDispatchBehavior ()
 		{

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs

@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.IO;
 using System.Runtime.Serialization;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebScriptEnablingBehaviorTest.cs

@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.Net;
 using System.Runtime.Serialization;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Dispatcher/WebHttpDispatchOperationSelectorTest.cs

@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.Globalization;
 using System.Runtime.Serialization;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs

@@ -74,7 +74,7 @@ namespace MonoTests.System.ServiceModel.Web
 			ch.Close ();
 		}
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 		[Test]
 		public void CreateAtom10Response ()
 		{

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs

@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.Collections.Generic;
 using System.Linq;

mcs/class/System.ServiceModel.Web/Test/System.ServiceModel/WebHttpBindingTest.cs

@@ -16,7 +16,7 @@ namespace MonoTests.System.ServiceModel
 			Assert.AreEqual ("http", b.Scheme, "#1");
 			Assert.AreEqual (Encoding.UTF8, b.WriteEncoding, "#2");
 			Assert.AreEqual (0x10000, b.MaxBufferSize, "#3");
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 			Assert.AreEqual (0x80000, b.MaxBufferPoolSize, "#4");
 #endif
 			Assert.AreEqual (0x10000, b.MaxReceivedMessageSize, "#5");