New test.

[mono.git] / mcs / class / System.Web / System.Web.UI / UserControlControlBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs
index 11566a4ea1df4df0a9c75a46cf9febae0919a7e0..ae1c8b9d068f6d32ca4ccf91be4556b62e342edb 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs
@@ -5,10 +5,35 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2003 Ximian, Inc (http://www.ximian.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Security.Permissions;
+
+namespace System.Web.UI {
 
-namespace System.Web.UI
-{
+       // CAS
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        public class UserControlControlBuilder : ControlBuilder
        {
                public override bool NeedsTagInnerText ()
@@ -21,6 +46,12 @@ namespace System.Web.UI
                {
                        // Do something with the text
                }
+#if NET_2_0
+               [MonoTODO ("why override?")]
+               public override object BuildObject ()
+               {
+                       return base.BuildObject ();
+               }
+#endif
        }
 }
-