Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -3,11 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = System.ComponentModel.DataAnnotations.dll
LIB_MCS_FLAGS = \
/r:System.dll \
/r:System.Core.dll \
/r:System.Data.dll \
/r:System.Xml.dll \
LIB_REFS = System System.Core System.Data System.Xml
LIB_MCS_FLAGS = -nowarn:414
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)

View File

@@ -1,6 +1,4 @@
../../build/common/Consts.cs
../../build/common/Locale.cs
../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs

View File

@@ -34,7 +34,6 @@ using MonoTests.Common;
namespace MonoTests.System.ComponentModel.DataAnnotations
{
#if NET_4_0
[TestFixture]
public class CustomValidationAttributeTest
{
@@ -275,6 +274,7 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
attr.IsValid ("test");
}, "#A12");
}
}
class PrivateValidatorMethodContainer
{
@@ -327,6 +327,4 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
throw new ApplicationException ("SNAFU");
}
}
}
#endif
}