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

@ -35,12 +35,7 @@ using System.Web.Util;
namespace System.Web.UI.WebControls {
[TypeConverter(typeof (UnitConverter))]
#if NET_2_0
[Serializable]
#else
// CAS
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
#endif
public struct Unit {
enum ParsingStage
{
@ -381,7 +376,6 @@ namespace System.Web.UI.WebControls {
return ToString (Helpers.InvariantCulture);
}
#if NET_2_0
public string ToString (IFormatProvider provider)
{
if (type == 0)
@ -391,7 +385,6 @@ namespace System.Web.UI.WebControls {
return value.ToString (provider) + ex;
}
#endif
}
}