Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.ComponentModel;
@ -56,7 +55,6 @@ namespace System.Web.Configuration
static ConfigurationProperty shutdownTimeoutProp;
static ConfigurationProperty useFullyQualifiedRedirectUrlProp;
static ConfigurationProperty waitChangeNotificationProp;
#if NET_4_0
static ConfigurationProperty requestPathInvalidCharactersProp;
static ConfigurationProperty requestValidationTypeProp;
static ConfigurationProperty requestValidationModeProp;
@ -64,10 +62,7 @@ namespace System.Web.Configuration
static ConfigurationProperty maxUrlLengthProp;
static ConfigurationProperty encoderTypeProp;
static ConfigurationProperty relaxedUrlToFileSystemMappingProp;
#endif
#if NET_4_5
static ConfigurationProperty targetFrameworkProp;
#endif
static ConfigurationPropertyCollection properties;
static HttpRuntimeSection ()
@ -120,7 +115,6 @@ namespace System.Web.Configuration
TypeDescriptor.GetConverter (typeof (int)),
PropertyHelper.IntFromZeroToMaxValidator,
ConfigurationPropertyOptions.None);
#if NET_4_0
requestPathInvalidCharactersProp = new ConfigurationProperty ("requestPathInvalidCharacters", typeof (string), "<,>,*,%,&,:,\\,?");
requestValidationTypeProp = new ConfigurationProperty ("requestValidationType", typeof (string),"System.Web.Util.RequestValidator",
TypeDescriptor.GetConverter (typeof (string)),
@ -143,13 +137,10 @@ namespace System.Web.Configuration
PropertyHelper.NonEmptyStringValidator,
ConfigurationPropertyOptions.None);
relaxedUrlToFileSystemMappingProp = new ConfigurationProperty ("relaxedUrlToFileSystemMapping", typeof (bool), false);
#endif
#if NET_4_5
targetFrameworkProp = new ConfigurationProperty ("targetFramework", typeof (Version), new Version (4, 0),
PropertyHelper.VersionConverter,
PropertyHelper.DefaultValidator,
ConfigurationPropertyOptions.None);
#endif
properties = new ConfigurationPropertyCollection();
properties.Add (apartmentThreadingProp);
@ -170,7 +161,6 @@ namespace System.Web.Configuration
properties.Add (shutdownTimeoutProp);
properties.Add (useFullyQualifiedRedirectUrlProp);
properties.Add (waitChangeNotificationProp);
#if NET_4_0
properties.Add (requestPathInvalidCharactersProp);
properties.Add (requestValidationTypeProp);
properties.Add (requestValidationModeProp);
@ -178,10 +168,7 @@ namespace System.Web.Configuration
properties.Add (maxUrlLengthProp);
properties.Add (encoderTypeProp);
properties.Add (relaxedUrlToFileSystemMappingProp);
#endif
#if NET_4_5
properties.Add (targetFrameworkProp);
#endif
}
public HttpRuntimeSection()
@ -307,7 +294,6 @@ namespace System.Web.Configuration
set { base[waitChangeNotificationProp] = value; }
}
#if NET_4_0
[ConfigurationProperty ("requestPathInvalidCharacters", DefaultValue = ",*,%,&,:,\\,?")]
public string RequestPathInvalidCharacters {
get { return (string) base [requestPathInvalidCharactersProp]; }
@ -354,19 +340,15 @@ namespace System.Web.Configuration
get { return (bool) base [relaxedUrlToFileSystemMappingProp]; }
set { base [relaxedUrlToFileSystemMappingProp] = value; }
}
#endif
#if NET_4_5
[ConfigurationProperty ("targetFramework", DefaultValue = "4.0")]
[TypeConverter ("System.Web.Configuration.VersionConverter")]
public Version TargetFramework {
get { return (Version) base [targetFrameworkProp]; }
set { base [targetFrameworkProp] = value; }
}
#endif
protected internal override ConfigurationPropertyCollection Properties {
get { return properties; }
}
}
}
#endif