warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

RunUO 2.4 will be the latest release supporting the 2.0 .NET Framework.

Browse source 
Framework_4_0 preprocessors have been removed. ScriptCompiler will set Framework_4_0 as legacy.
This commit is contained in:
Mark Sturgill 2013-10-30 11:28:34 -07:00
parent 951f8b7d01
commit e67faba4d8
20 changed files with 43 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Server/ScriptCompiler.cs
View file

@ -55,11 +55,7 @@ namespace Server
{
List<string> list = new List<string>();
#if Framework_4_0
string path = Path.Combine( Core.BaseDirectory, "Data/Assemblies_4_0.cfg" );
#else
string path = Path.Combine( Core.BaseDirectory, "Data/Assemblies.cfg" );
#endif
if( File.Exists( path ) )
{
@ -93,14 +89,13 @@ namespace Server
AppendCompilerOption( ref sb, "/d:MONO" );
#endif
//These two defines are legacy, ie, depreciated.
//These three defines are legacy, ie, depreciated.
if( Core.Is64Bit )
AppendCompilerOption( ref sb, "/d:x64" );
AppendCompilerOption( ref sb, "/d:Framework_2_0" );
#if Framework_4_0
AppendCompilerOption( ref sb, "/d:Framework_4_0" );
#endif
return (sb == null ? null : sb.ToString());
}