This commit is contained in:
mark 2008-05-29 03:57:42 +00:00
parent e41632fe95
commit 9c5abc3b0d
48 changed files with 261 additions and 70 deletions

View file

@ -91,6 +91,10 @@ namespace Server
AppendDefine( ref sb, "/d:Framework_2_0" );
#if Framework_3_5
AppendDefine( ref sb, "/d:Framework_3_5" );
#endif
return (sb == null ? null : sb.ToString());
}
@ -207,7 +211,11 @@ namespace Server
DeleteFiles( "Scripts.CS*.dll" );
using( CSharpCodeProvider provider = new CSharpCodeProvider() )
#if Framework_3_5
using ( CSharpCodeProvider provider = new CSharpCodeProvider( new Dictionary<string, string>() { { "CompilerVersion", "v3.5" } } ) )
#else
using ( CSharpCodeProvider provider = new CSharpCodeProvider() )
#endif
{
string path = GetUnusedPath( "Scripts.CS" );
@ -346,8 +354,11 @@ namespace Server
}
DeleteFiles( "Scripts.VB*.dll" );
using( VBCodeProvider provider = new VBCodeProvider() )
#if Framework_3_5
using ( VBCodeProvider provider = new VBCodeProvider( new Dictionary<string, string>() { { "CompilerVersion", "v3.5" } } ) )
#else
using ( VBCodeProvider provider = new VBCodeProvider() )
#endif
{
string path = GetUnusedPath( "Scripts.VB" );
@ -560,16 +571,23 @@ namespace Server
return false;
}
if( CompileVBScripts( debug, cache, out assembly ) )
if ( Core.VBdotNet )
{
if( assembly != null )
if ( CompileVBScripts( debug, cache, out assembly ) )
{
assemblies.Add( assembly );
if ( assembly != null )
{
assemblies.Add( assembly );
}
}
else
{
return false;
}
}
else
{
return false;
Console.WriteLine( "Scripts: Skipping VB.NET Scripts...done (use -vb to enable)");
}
if( assemblies.Count == 0 )