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

@@ -2,7 +2,7 @@
// 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;
using System.Runtime.Serialization;
using System.Xml;
namespace System.Security.Cryptography.Xml
@@ -14,17 +14,14 @@ namespace System.Security.Cryptography.Xml
/// This unique exception helps catch the recursion limit issue.
/// </summary>
[Serializable]
internal class CryptoSignedXmlRecursionException : XmlException
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
#endif
public class CryptoSignedXmlRecursionException : XmlException
{
public CryptoSignedXmlRecursionException() : base() { }
public CryptoSignedXmlRecursionException(string message) : base(message) { }
public CryptoSignedXmlRecursionException(string message, System.Exception inner) : base(message, inner) { }
// A constructor is needed for serialization when an
// exception propagates from a remoting server to the client.
protected CryptoSignedXmlRecursionException(System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
{
throw new PlatformNotSupportedException();
}
public CryptoSignedXmlRecursionException(string message, Exception inner) : base(message, inner) { }
protected CryptoSignedXmlRecursionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
}

View File

@@ -20,7 +20,7 @@ namespace System.Security.Cryptography.Xml.Tests
<test>some text node</test>
</example>";
private static bool SupportsNewRsaTypes => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer();
private static bool SupportsNewRsaTypes => !PlatformDetection.IsFullFramework || PlatformDetection.IsNetfx462OrNewer;
private static void SignXml(XmlDocument doc, AsymmetricAlgorithm key)
{