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

@@ -11,7 +11,6 @@
<ProjectGuid>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</ProjectGuid>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly>
</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'" />
@@ -28,7 +27,6 @@
<Compile Include="System\Runtime\Serialization\InvalidDataContractException.cs" />
<Compile Include="System\Runtime\Serialization\ISerializationSurrogateProvider.cs" />
<Compile Include="System\Runtime\Serialization\KnownTypeAttribute.cs" />
<Compile Include="System\Runtime\Serialization\InvalidDataContractException.Serialization.cs" />
<Compile Include="System.Runtime.Serialization.Primitives.TypeForwards.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)'=='netfx'">

View File

@@ -1,19 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
namespace System.Runtime.Serialization
{
[Serializable]
public partial class InvalidDataContractException : Exception
{
protected InvalidDataContractException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
throw new PlatformNotSupportedException();
}
}
}

View File

@@ -6,7 +6,9 @@ using System;
namespace System.Runtime.Serialization
{
public partial class InvalidDataContractException : Exception
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public class InvalidDataContractException : Exception
{
public InvalidDataContractException()
: base()
@@ -22,5 +24,10 @@ namespace System.Runtime.Serialization
: base(message, innerException)
{
}
protected InvalidDataContractException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}
}
}