Merge pull request #1500 from criteo-forks/criteo

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

diff --git a/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs b/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs
index 6d966470021d729282b4883fadcee2c0b5b77e09..71b328f5148f58076a99937a82106206125b743c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs
+++ b/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs
@@ -5,8 +5,7 @@
 //     Ben Maurer (bmaurer@users.sourceforge.net)
 //
 // (C) 2003 Ben Maurer
-//
-
+// Copyright (C) 2005-2010 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
@@ -27,23 +26,34 @@
 // 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
+
 namespace System.Web.UI {
-       public sealed class WebResourceAttribute : Attribute {
-               public WebResourceAttribute (string webResource, string contentType) : this (webResource, contentType, false) {}
-               public WebResourceAttribute (string webResource, string contentType, bool performSubstitution)
+
+       [AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
+       public sealed class WebResourceAttribute : Attribute
+       {
+               public WebResourceAttribute (string webResource, string contentType)
                {
                        this.webResource = webResource;
                        this.contentType = contentType;
-                       this.performSubstitution = performSubstitution;
                }
+
                
-               public string ContentType { get { return contentType; } }
-               public bool PerformSubstitution { get { return performSubstitution; } }
-               public string WebResource { get { return webResource; } }
-               
+               public string ContentType {
+                       get { return contentType; }
+               }
+
+               public bool PerformSubstitution {
+                       get { return performSubstitution; }
+                       set { performSubstitution = value; }
+               }
+
+               public string WebResource {
+                       get { return webResource; }
+               }
+
+
                bool performSubstitution;
                string webResource, contentType;
        }
 }
-#endif
\ No newline at end of file