Merge pull request #2454 from tastywheattasteslikechicken/FixVtableAbort

[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 062cd850ba3bc51bf1f5d45401672271799ce8c4..af01c303c0d5d59fa243957da06b229e4dcac6ac 100644 (file)
--- a/mcs/class/System.Web/System.Web.Profile/ProfileParser.cs
+++ b/mcs/class/System.Web/System.Web.Profile/ProfileParser.cs
@@ -25,7 +25,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Collections;
@@ -44,7 +43,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 +58,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 ("ProfileGroup", groupName, ", ", AppCodeCompiler.DefaultAppCodeAssemblyName);
+                       else
+                               typeName = String.Concat ("ProfileGroup", groupName);
+
+                       Type profileGroupType = Type.GetType (typeName);
                        if (profileGroupType == null) {
                                //Compiler call
                        }
@@ -62,4 +73,3 @@ namespace System.Web.Profile
        }
 }
 
-#endif