From: Jeff Lenk <jeff@jefflenk.com>
Date: Wed, 28 Jul 2010 04:21:59 +0000 (-0500)
Subject: Fix mod_managed dynamic compile for V4 Framework
X-Git-Tag: v1.2-rc1~526^2~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=889cadb8aa502f1f729b50b4a585a13a35eae2d3;p=thirdparty%2Ffreeswitch.git

Fix mod_managed dynamic compile for V4 Framework
---

diff --git a/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj b/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj
index 3e9d2519db..740ae04cff 100644
--- a/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj
+++ b/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\..\managed\debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLR_VERSION40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\..\managed\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR_VERSION40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs b/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs
index ad8e3a11e6..754541a8f2 100644
--- a/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs
+++ b/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs
@@ -110,10 +110,18 @@ namespace FreeSWITCH {
                     cdp = CodeDomProvider.CreateProvider("f#");
                     break;
                 case ".csx":
+#if (CLR_VERSION40)
+                    cdp = new Microsoft.CSharp.CSharpCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v4.0" } });
+#else
                     cdp = new Microsoft.CSharp.CSharpCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v3.5" } });
+#endif
                     break;
                 case ".vbx":
+#if (CLR_VERSION40)
+                    cdp = new Microsoft.VisualBasic.VBCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v4.0" } });
+#else
                     cdp = new Microsoft.VisualBasic.VBCodeProvider(new Dictionary<string, string> { { "CompilerVersion", "v3.5" } });
+#endif
                     break;
                 case ".jsx":
                     // Have to figure out better JS support