Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web/System.Web.Configuration_2.0/AdapterDictionary.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;
 using System.Runtime.Serialization;
@@ -51,4 +50,3 @@ namespace System.Web.Configuration
 	}
 }
 
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/AnonymousIdentificationSection.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Configuration;
@@ -148,4 +147,3 @@ namespace System.Web.Configuration
 	}
 }
 
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/ApplicationSettingsConfigurationFileMap.cs

@@ -25,7 +25,6 @@
 // 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 NET_2_0
 using System;
 using System.Configuration;
 using System.Web;
@@ -48,4 +47,3 @@ namespace System.Web.Configuration
 		}
 	}
 }
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs

@@ -29,7 +29,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Configuration;
@@ -92,4 +91,3 @@ namespace System.Web.Configuration
 	}
 }
 
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyInfo.cs

@@ -29,7 +29,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel;
@@ -74,4 +73,3 @@ namespace System.Web.Configuration
 	}
 }
 
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/AuthenticationSection.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Configuration;
@@ -78,9 +77,7 @@ namespace System.Web.Configuration
 		}
 		
 		[ConfigurationProperty ("passport")]
-#if NET_4_0
 		[Obsolete ("This property is obsolete. The Passport authentication product is no longer supported and has been superseded by Live ID.")]
-#endif
 		public PassportAuthentication Passport {
 			get { return (PassportAuthentication) base [passportProp]; }
 		}
@@ -98,4 +95,3 @@ namespace System.Web.Configuration
 	}
 }
 
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs

@@ -37,7 +37,6 @@ using System.Xml;
 using System.Globalization;
 using System.Web.Util;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -266,5 +265,4 @@ namespace System.Web.Configuration {
 
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleAction.cs

@@ -26,7 +26,6 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 namespace System.Web.Configuration
 {
         public enum AuthorizationRuleAction
@@ -35,4 +34,3 @@ namespace System.Web.Configuration
                 Allow
         }
 }
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleCollection.cs

@@ -31,7 +31,6 @@
 using System;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -124,5 +123,4 @@ namespace System.Web.Configuration {
 
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationSection.cs

@@ -32,7 +32,6 @@ using System;
 using System.Configuration;
 using System.Security.Principal;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -84,5 +83,4 @@ namespace System.Web.Configuration {
 
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/BufferModeSettings.cs

@@ -32,7 +32,6 @@ using System;
 using System.ComponentModel;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -175,5 +174,4 @@ namespace System.Web.Configuration {
 
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/BufferModesCollection.cs

@@ -31,7 +31,6 @@
 using System;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -86,4 +85,3 @@ namespace System.Web.Configuration {
 
 }
 
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/BuildProvider.cs

@@ -29,7 +29,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System;
 using System.ComponentModel;
 using System.Configuration;
@@ -108,5 +107,4 @@ namespace System.Web.Configuration
 	}
 	
 }
-#endif // NET_2_0
 

mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs

@@ -103,35 +103,12 @@ namespace System.Web.Configuration
 
 		internal Type GetProviderTypeForExtension (string extension)
 		{
-#if NET_4_0
 			return global::System.Web.Compilation.BuildProvider.GetProviderTypeForExtension (extension);
-#else
-			if (String.IsNullOrEmpty (extension))
-				return null;
-
-			BuildProvider provider = this [extension];
-			if (provider == null)
-				return null;
-			
-			Type type = HttpApplication.LoadType (provider.Type);
-			if (type == null)
-				return null;
-
-			return type;
-#endif
 		}
 		
 		internal global::System.Web.Compilation.BuildProvider GetProviderInstanceForExtension (string extension)
 		{
-#if NET_4_0
 			return global::System.Web.Compilation.BuildProvider.GetProviderInstanceForExtension (extension);
-#else
-			Type type = GetProviderTypeForExtension (extension);
-			if (type == null)
-				return null;
-			
-			return Activator.CreateInstance (type, null) as global::System.Web.Compilation.BuildProvider;
-#endif
 		}
 	}
 }

mcs/class/System.Web/System.Web.Configuration_2.0/CacheSection.cs

@@ -32,7 +32,6 @@ using System;
 using System.ComponentModel;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -115,5 +114,4 @@ namespace System.Web.Configuration {
 
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/CapabilitiesBuild.cs

@@ -1,4 +1,3 @@
-#if NET_2_0
 /*
 Used to determine Browser Capabilities by the Browsers UserAgent String and related
 Browser supplied Headers.
@@ -76,4 +75,3 @@ namespace System.Web.Configuration
 		public abstract System.Web.Configuration.CapabilitiesResult Process(System.Collections.Specialized.NameValueCollection header, System.Collections.IDictionary initialCapabilities);
 	}
 }
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/CapabilitiesResult.cs

@@ -1,4 +1,3 @@
-#if NET_2_0
 /*
 Used to determine Browser Capabilities by the Browsers UserAgent String and related
 Browser supplied Headers.
@@ -130,4 +129,3 @@ namespace System.Web.Configuration
 		}
 	}
 }
-#endif

mcs/class/System.Web/System.Web.Configuration_2.0/ClientTarget.cs

@@ -32,7 +32,6 @@ using System;
 using System.ComponentModel;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -87,5 +86,4 @@ namespace System.Web.Configuration {
 
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/ClientTargetCollection.cs

@@ -31,7 +31,6 @@
 using System;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -109,5 +108,4 @@ namespace System.Web.Configuration {
 	}
 }
 
-#endif
 

mcs/class/System.Web/System.Web.Configuration_2.0/ClientTargetSection.cs

@@ -31,7 +31,6 @@
 using System;
 using System.Configuration;
 
-#if NET_2_0
 
 namespace System.Web.Configuration {
 
@@ -62,4 +61,3 @@ namespace System.Web.Configuration {
 	}
 }
 
-#endif