Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 using System.IO;
@@ -249,4 +248,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IConfigErrorInfo.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -39,4 +38,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IConfigSystem.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -40,4 +39,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IConfigurationManagerHelper.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -39,4 +38,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IConfigurationManagerInternal.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -49,4 +48,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigClientHost.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -44,4 +43,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigConfigurationFactory.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -40,4 +39,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigHost.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 using System.IO;
@@ -82,4 +81,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigRecord.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -47,4 +46,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigRoot.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -48,4 +47,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigSettingsFactory.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -40,4 +39,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigSystem.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -42,4 +41,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/InternalConfigEventArgs.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -48,4 +47,3 @@ namespace System.Configuration.Internal
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/InternalConfigEventHandler.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -35,4 +34,3 @@ namespace System.Configuration.Internal
 	public delegate void InternalConfigEventHandler (object sender, InternalConfigEventArgs e);
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Internal/StreamChangeCallback.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 
 using System;
 
@@ -35,4 +34,3 @@ namespace System.Configuration.Internal
 	public delegate void StreamChangeCallback (string streamName);
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Provider/ProviderBase.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Collections.Specialized;
 
@@ -75,4 +74,3 @@ namespace System.Configuration.Provider
 	}
 }
 
-#endif

mcs/class/System.Configuration/System.Configuration.Provider/ProviderCollection.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Collections;
 
 namespace System.Configuration.Provider {
@@ -133,4 +132,3 @@ namespace System.Configuration.Provider {
 	 
 	}
 }
-#endif

mcs/class/System.Configuration/System.Configuration.Provider/ProviderException.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Runtime.Serialization;
 
 namespace System.Configuration.Provider {
@@ -56,4 +55,3 @@ namespace System.Configuration.Provider {
 		}
 	}
 }
-#endif

mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyOptions.cs

@@ -34,6 +34,9 @@ namespace System.Configuration
                 None = 0,
                 IsDefaultCollection = 1,
                 IsRequired = 2,
-                IsKey = 4
+                IsKey = 4,
+                IsTypeStringTransformationRequired  = 8,
+                IsAssemblyStringTransformationRequired = 16,
+                IsVersionCheckRequired = 32
         }
 }

mcs/class/System.Configuration/System.Configuration/ConfigurationSectionCollection.cs

@@ -39,7 +39,8 @@ namespace System.Configuration
 	{
 		SectionGroupInfo group;
 		Configuration config;
-		
+		static readonly object lockObject = new object();
+		 
 		internal ConfigurationSectionCollection (Configuration config, SectionGroupInfo group)
 			: base (StringComparer.Ordinal)
 		{
@@ -60,15 +61,17 @@ namespace System.Configuration
 		public ConfigurationSection this [string name]
 		{
 			get {
-				ConfigurationSection sec = BaseGet (name) as ConfigurationSection;
-				if (sec == null) {
-					SectionInfo secData = group.Sections [name] as SectionInfo;
-					if (secData == null) return null;
-					sec = config.GetSectionInstance (secData, true);
-					if (sec == null) return null;
-					BaseSet (name, sec);
+				lock(lockObject) {
+					ConfigurationSection sec = BaseGet (name) as ConfigurationSection;
+					if (sec == null) {
+						SectionInfo secData = group.Sections [name] as SectionInfo;
+						if (secData == null) return null;
+						sec = config.GetSectionInstance (secData, true);
+						if (sec == null) return null;
+						BaseSet (name, sec);
+					}
+					return sec;
 				}
-				return sec;
 			}
 		}