revert forced 4.0 migration -- many users are still dependent on 2.0

This commit is contained in:
mark 2012-03-07 13:47:33 +00:00
parent 7b48ebb7e6
commit 4bcde77cc2
13 changed files with 531 additions and 46 deletions

View file

@ -28,7 +28,10 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
#if Framework_4_0
using System.Threading.Tasks;
#endif
using Server;
using Server.Accounting;
using Server.Gumps;
@ -109,7 +112,11 @@ namespace Server
public static Thread Thread { get { return m_Thread; } }
public static MultiTextWriter MultiConsoleOut { get { return m_MultiConOut; } }
#if Framework_4_0
public static readonly bool Is64Bit = Environment.Is64BitProcess;
#else
public static readonly bool Is64Bit = (IntPtr.Size == 8); //Returns the size for the current /process/
#endif
private static bool m_MultiProcessor;
private static int m_ProcessorCount;
@ -661,10 +668,17 @@ namespace Server
if( a == null )
return;
#if Framework_4_0
Parallel.ForEach(a.GetTypes(), t =>
{
VerifyType(t);
});
#else
foreach (Type t in a.GetTypes())
{
VerifyType(t);
}
#endif
}
}