Author: andrews
Date: 2006-11-07 09:07:22 -0500 (Tue, 07 Nov 2006)
New Revision: 67456
Modified:
trunk/mcs/class/System/ChangeLog
trunk/mcs/class/System/System.Configuration/AppSettingsReader.cs
trunk/mcs/class/System/System.Configuration/ApplicationSettingsBase.cs
trunk/mcs/class/System/System.Configuration/ConfigurationSettings.cs
trunk/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
Log:
exclude using PrebuiltSystem on TARGET_JVM
Modified: trunk/mcs/class/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/ChangeLog 2006-11-07 14:01:58 UTC (rev 67455)
+++ trunk/mcs/class/System/ChangeLog 2006-11-07 14:07:22 UTC (rev 67456)
@@ -1,3 +1,9 @@
+2006-11-07 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * ApplicationSettingsBase.cs, AppSettingsReader.cs,
+ ConfigurationSettings.cs, LocalFileSettingsProvider.cs: exclude using
+ PrebuiltSystem on TARGET_JVM
+
2006-10-31 Sebastien Pouliot <[EMAIL PROTECTED]>
* System.dll.sources: Add System.Net.Mail.SmtpPermission[Attribute] to
Modified: trunk/mcs/class/System/System.Configuration/AppSettingsReader.cs
===================================================================
--- trunk/mcs/class/System/System.Configuration/AppSettingsReader.cs
2006-11-07 14:01:58 UTC (rev 67455)
+++ trunk/mcs/class/System/System.Configuration/AppSettingsReader.cs
2006-11-07 14:07:22 UTC (rev 67456)
@@ -28,7 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if CONFIGURATION_DEP
+#if CONFIGURATION_DEP && !TARGET_JVM
extern alias PrebuiltSystem;
using NameValueCollection =
PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
Modified: trunk/mcs/class/System/System.Configuration/ApplicationSettingsBase.cs
===================================================================
--- trunk/mcs/class/System/System.Configuration/ApplicationSettingsBase.cs
2006-11-07 14:01:58 UTC (rev 67455)
+++ trunk/mcs/class/System/System.Configuration/ApplicationSettingsBase.cs
2006-11-07 14:07:22 UTC (rev 67456)
@@ -21,7 +21,7 @@
//
#if NET_2_0
-#if CONFIGURATION_DEP
+#if CONFIGURATION_DEP && !TARGET_JVM
extern alias PrebuiltSystem;
using NameValueCollection =
PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
Modified: trunk/mcs/class/System/System.Configuration/ConfigurationSettings.cs
===================================================================
--- trunk/mcs/class/System/System.Configuration/ConfigurationSettings.cs
2006-11-07 14:01:58 UTC (rev 67455)
+++ trunk/mcs/class/System/System.Configuration/ConfigurationSettings.cs
2006-11-07 14:07:22 UTC (rev 67456)
@@ -32,7 +32,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if CONFIGURATION_DEP
+#if CONFIGURATION_DEP && !TARGET_JVM
extern alias PrebuiltSystem;
using NameValueCollection =
PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
Modified:
trunk/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
===================================================================
--- trunk/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
2006-11-07 14:01:58 UTC (rev 67455)
+++ trunk/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
2006-11-07 14:07:22 UTC (rev 67456)
@@ -27,7 +27,7 @@
//
#if NET_2_0
-#if CONFIGURATION_DEP
+#if CONFIGURATION_DEP && !TARGET_JVM
extern alias PrebuiltSystem;
using NameValueCollection =
PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
