Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -288,9 +288,7 @@ namespace MonoTests.System.Configuration {
// This test will fail when there are newer versions
// of the test assemblies - so conditionalize it in
// such cases.
#if TARGET_JVM
string expected = "MonoTests.System.Configuration.ProviderPoker, System.Test, Version=0.0.0.0";
#elif NET_4_5
#if NET_4_5
string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_5, Version=0.0.0.0";
#elif NET_4_0
string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_0, Version=0.0.0.0";