* ToolTask.cs (LogEventsFromTextOutput): Log message even if its not

[mono.git] / mcs / class / System.Web / System.Web.Profile / ProfileParser.cs

diff --git a/mcs/class/System.Web/System.Web.Profile/ProfileParser.cs b/mcs/class/System.Web/System.Web.Profile/ProfileParser.cs
index 76a63c1f7630ee90e82b46e0bd84edd01776a112..2eb199ccaf45bff2501894698eae46d3691c36e8 100644 (file)
--- a/mcs/class/System.Web/System.Web.Profile/ProfileParser.cs
+++ b/mcs/class/System.Web/System.Web.Profile/ProfileParser.cs
@@ -1,5 +1,5 @@
 //
-// System.Web.UI.MasterPageParser
+// System.Web.UI.ProfileParser
 //
 // Authors:
 //     Vladimir Krasnov (vladimirk@mainsoft.com)
@@ -44,7 +44,13 @@ namespace System.Web.Profile
 
                public static Type GetProfileCommonType (HttpContext context)
                {
-                       Type profileBaseType = Type.GetType ("ProfileCommon");
+                       string typeName;
+                       if (AppCodeCompiler.DefaultAppCodeAssemblyName != null)
+                               typeName = String.Concat ("ProfileCommon, ", AppCodeCompiler.DefaultAppCodeAssemblyName);
+                       else
+                               typeName = "ProfileCommon";
+                       
+                       Type profileBaseType = Type.GetType (typeName);
                        if (profileBaseType == null) {
                                //Compiler call
                        }
@@ -53,7 +59,13 @@ namespace System.Web.Profile
 
                public static Type GetProfileGroupType (HttpContext context, string groupName)
                {
-                       Type profileGroupType = Type.GetType ("ProfileGroup" + groupName);
+                       string typeName;
+                       if (AppCodeCompiler.DefaultAppCodeAssemblyName != null)
+                               typeName = String.Concat ("ProfileCommon", groupName, ", ", AppCodeCompiler.DefaultAppCodeAssemblyName);
+                       else
+                               typeName = String.Concat ("ProfileCommon", groupName);
+                       
+                       Type profileGroupType = Type.GetType (typeName);
                        if (profileGroupType == null) {
                                //Compiler call
                        }
@@ -62,4 +74,4 @@ namespace System.Web.Profile
        }
 }
 
-#endif
\ No newline at end of file
+#endif