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 00bec67f50b985e036af1f36cdd38789863537d2..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;
@@ -46,7 +45,7 @@ namespace System.Web.Profile
                {
                        string typeName;
                        if (AppCodeCompiler.DefaultAppCodeAssemblyName != null)
-                               typeName = String.Format ("ProfileCommon, {0}", AppCodeCompiler.DefaultAppCodeAssemblyName);
+                               typeName = String.Concat ("ProfileCommon, ", AppCodeCompiler.DefaultAppCodeAssemblyName);
                        else
                                typeName = "ProfileCommon";
                        
@@ -61,12 +60,10 @@ namespace System.Web.Profile
                {
                        string typeName;
                        if (AppCodeCompiler.DefaultAppCodeAssemblyName != null)
-                               typeName = String.Format ("ProfileCommon{0}, {1}",
-                                                         groupName,
-                                                         AppCodeCompiler.DefaultAppCodeAssemblyName);
+                               typeName = String.Concat ("ProfileGroup", groupName, ", ", AppCodeCompiler.DefaultAppCodeAssemblyName);
                        else
-                               typeName = String.Format ("ProfileCommon{0}", groupName);
-                       
+                               typeName = String.Concat ("ProfileGroup", groupName);
+
                        Type profileGroupType = Type.GetType (typeName);
                        if (profileGroupType == null) {
                                //Compiler call
@@ -76,4 +73,3 @@ namespace System.Web.Profile
        }
 }
 
-#endif