Merge pull request #4297 from kumpera/fix-profiler-osx-linking

[mono.git] / mcs / class / System.Web / System.Web.Compilation / GlobalAsaxCompiler.cs

diff --git a/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
index 0c70ce86c7f9b909dc2f5633ef448ba3997d54cc..621f135aa91fd9900932346112208a44477d0c57 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
@@ -30,7 +30,9 @@
 //
 using System;
 using System.Collections;
+using System.Globalization;
 using System.Web.UI;
+using System.Web.Util;
 
 namespace System.Web.Compilation
 {
@@ -54,10 +56,10 @@ namespace System.Web.Compilation
                        return generator.GetCompiledType ();
                }
 
-               protected override void CreateMethods ()
+               protected internal override void CreateMethods ()
                {
                        base.CreateMethods ();
-
+                       CreateProfileProperty ();
                        ProcessObjects (parser.RootBuilder);
                }
 
@@ -77,17 +79,17 @@ namespace System.Web.Compilation
                                        continue;
                                }
                                
-                               if (tag.Scope == "session") {
+                               if (String.Compare (tag.Scope, "session", true, Helpers.InvariantCulture) == 0) {
                                        sessionObjectTags.Add (tag);
                                        CreateApplicationOrSessionPropertyForObject (tag.Type, tag.ObjectID,
                                                                                     false, false);
-                               } else if (tag.Scope == "application") {
+                               } else if (String.Compare (tag.Scope, "application", true, Helpers.InvariantCulture) == 0) {
                                        applicationObjectTags.Add (tag);
                                        CreateFieldForObject (tag.Type, tag.ObjectID);
                                        CreateApplicationOrSessionPropertyForObject (tag.Type, tag.ObjectID,
                                                                                     true, false);
                                } else {
-                                       throw new ParseException (tag.location, "Invalid scope: " + tag.Scope);
+                                       throw new ParseException (tag.Location, "Invalid scope: " + tag.Scope);
                                }
                        }
                }