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.Configuration;
using System.ComponentModel;
@ -56,9 +55,7 @@ namespace System.Web.Configuration
static ConfigurationProperty urlLinePragmasProp;
static ConfigurationProperty codeSubDirectoriesProp;
static ConfigurationProperty optimizeCompilationsProp;
#if NET_4_0
static ConfigurationProperty targetFrameworkProp;
#endif
static CompilationSection ()
{
@ -97,11 +94,9 @@ namespace System.Web.Configuration
// this hotfix: http://support.microsoft.com/kb/961884
optimizeCompilationsProp = new ConfigurationProperty ("optimizeCompilations", typeof (bool), false);
#if NET_4_0
// Mono ignores this as there is no way to switch the runtime version
// dynamically while application is running
targetFrameworkProp = new ConfigurationProperty ("targetFramework", typeof (string), null);
#endif
properties = new ConfigurationPropertyCollection ();
properties.Add (assembliesProp);
@ -122,9 +117,7 @@ namespace System.Web.Configuration
properties.Add (tempDirectoryProp);
properties.Add (urlLinePragmasProp);
properties.Add (optimizeCompilationsProp);
#if NET_4_0
properties.Add (targetFrameworkProp);
#endif
}
public CompilationSection ()
@ -235,13 +228,11 @@ namespace System.Web.Configuration
set { base [strictProp] = value; }
}
#if NET_4_0
[ConfigurationProperty ("targetFramework", DefaultValue = null)]
public string TargetFramework {
get { return (string) base [targetFrameworkProp]; }
set { base [targetFrameworkProp] = value; }
}
#endif
[ConfigurationProperty ("tempDirectory", DefaultValue = "")]
public string TempDirectory {
@ -260,5 +251,4 @@ namespace System.Web.Configuration
}
}
}
#endif // NET_2_0