Browse Source

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.
Radek Doulik 12 years ago
parent
commit
50dacc2e31

+ 1 - 4
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 \

+ 0 - 1
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

+ 0 - 2
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

+ 2 - 3
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,