Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions

View File

@@ -6,7 +6,6 @@
<RootNamespace>System.ComponentModel.Primitives</RootNamespace>
<AssemblyName>System.ComponentModel.Primitives</AssemblyName>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />

View File

@@ -11,6 +11,9 @@ namespace System.ComponentModel
/// <para>The exception that is thrown when using invalid arguments that are enumerators.</para>
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class InvalidEnumArgumentException : ArgumentException
{
/// <summary>
@@ -58,7 +61,6 @@ namespace System.ComponentModel
/// </summary>
protected InvalidEnumArgumentException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
}

View File

@@ -102,6 +102,7 @@ namespace System.ComponentModel.Tests
[Theory]
[MemberData(nameof(DefaultProperties_TestData))]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] // NetFX does not have fix for #21369
public void CategoryProperties_GetCategory_ReturnsExpected(Func<CategoryAttribute> attributeThunk, string expectedCategory)
{
CategoryAttribute attribute = attributeThunk();

View File

@@ -88,21 +88,6 @@ namespace System.ComponentModel.Tests
Assert.Throws<NullReferenceException>(() => new InvalidEnumArgumentException("argumentName", 1, null));
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
[ActiveIssue("https://github.com/dotnet/corefx/issues/21214", TargetFrameworkMonikers.UapAot)]
public void Deserialize_ThrowsPlatformNotSupportedException()
{
var binaryFormatter = new BinaryFormatter();
using (var stream = new MemoryStream())
{
binaryFormatter.Serialize(stream, new SubException());
stream.Position = 0;
Exception ex = Assert.Throws<TargetInvocationException>(() => binaryFormatter.Deserialize(stream));
Assert.IsType<PlatformNotSupportedException>(ex.InnerException);
}
}
[Serializable]
public class SubException : InvalidEnumArgumentException
{

View File

@@ -4,7 +4,6 @@
<PropertyGroup>
<ProjectGuid>{C9534425-93FB-494F-8DD8-1E4E3E626FDE}</ProjectGuid>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>