From: Radek Doulik <rodo@xamarin.com>
Date: Thu, 16 May 2013 15:27:57 +0000 (+0200)
Subject: revert my 2 last commits
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=50dacc2e314097aebbdebec5ccd00301458bb420;p=mono.git

revert my 2 last commits

        Revert "add System.Net.Http.Formatting to monodroid build"
        Revert "added System.Configuration and System.Security to monodroid build to fix it"

        This reverts commit 85cb9e31763e14f55ab60554a68e8f8b899dd6a3 and
                     commit 6566273367f79b1f928a921cddfe05db4d622e1e.
---

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index b7d39099686..45f99f40ab1 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -158,10 +158,7 @@ monodroid_dirs := \
 	Mono.CompilerServices.SymbolWriter	\
 	Mono.CSharp	\
 	Microsoft.CSharp \
-	System.Security			\
-	System.Configuration		\
-	System.Net.Http \
-	System.Net.Http.Formatting
+	System.Net.Http
 
 monotouch_runtime_dirs := \
 	corlib \
diff --git a/mcs/class/System.XML/mobile_System.Xml.dll.sources b/mcs/class/System.XML/mobile_System.Xml.dll.sources
index 377813f97ca..458410154b6 100644
--- a/mcs/class/System.XML/mobile_System.Xml.dll.sources
+++ b/mcs/class/System.XML/mobile_System.Xml.dll.sources
@@ -161,7 +161,6 @@ System.Xml/XmlWriterSettings.cs
 System.Xml/XmlTextWriter2.cs
 System.Xml/XmlInputStream.cs
 System.Xml/XmlParserInput.cs
-System.Xml/XmlSecureResolver.cs
 System.Xml.XPath/IXPathNavigable.cs
 System.Xml.XPath/XPathNavigator.cs
 System.Xml.XPath/XPathExpression.cs
diff --git a/mcs/class/System/monodroid_System.dll.sources b/mcs/class/System/monodroid_System.dll.sources
index 71133497472..019f8681bd1 100644
--- a/mcs/class/System/monodroid_System.dll.sources
+++ b/mcs/class/System/monodroid_System.dll.sources
@@ -1,5 +1,3 @@
 #include mobile_System.dll.sources
 System/AndroidPlatform.cs
 System.CodeDom.Compiler/IndentedTextWriter.cs
-System.Configuration/ConfigurationException.cs
-System.Configuration/IConfigurationSectionHandler.cs
diff --git a/mcs/class/corlib/System.IO/File.cs b/mcs/class/corlib/System.IO/File.cs
index c4ed76b34bf..79486b165a8 100644
--- a/mcs/class/corlib/System.IO/File.cs
+++ b/mcs/class/corlib/System.IO/File.cs
@@ -124,15 +124,14 @@ namespace System.IO
 				FileShare.None, bufferSize);
 		}
 
+#if !NET_2_1
 		[MonoLimitation ("FileOptions are ignored")]
 		public static FileStream Create (string path, int bufferSize,
 						 FileOptions options)
 		{
-			return new FileStream (path, FileMode.Create, FileAccess.ReadWrite,
-				FileShare.None, bufferSize, options);
+			return Create (path, bufferSize, options, null);
 		}
 		
-#if !NET_2_1
 		[MonoLimitation ("FileOptions and FileSecurity are ignored")]
 		public static FileStream Create (string path, int bufferSize,
 						 FileOptions options,