You've already forked linux-packaging-mono
Imported Upstream version 6.4.0.137
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
parent
e9207cf623
commit
ef583813eb
@@ -36,8 +36,7 @@ namespace System.Xml.Serialization
|
||||
/// <summary>
|
||||
/// Summary description for XmlArrayAttribute.
|
||||
/// </summary>
|
||||
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field
|
||||
| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
|
||||
[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]
|
||||
public class XmlArrayAttribute : Attribute
|
||||
{
|
||||
private string elementName;
|
||||
|
||||
@@ -36,8 +36,7 @@ namespace System.Xml.Serialization
|
||||
/// <summary>
|
||||
/// Summary description for XmlChoiceIdentifierAttribute.
|
||||
/// </summary>
|
||||
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field
|
||||
| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
|
||||
[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]
|
||||
public class XmlChoiceIdentifierAttribute : Attribute
|
||||
{
|
||||
private string memberName;
|
||||
|
||||
@@ -43,10 +43,11 @@ using System.Xml.Serialization.Configuration;
|
||||
|
||||
namespace System.Xml.Serialization
|
||||
{
|
||||
public class XmlSchemaImporter
|
||||
#if !MOBILE
|
||||
: SchemaImporter
|
||||
#if MOBILE
|
||||
public abstract class SchemaImporter {}
|
||||
#endif
|
||||
|
||||
public class XmlSchemaImporter : SchemaImporter
|
||||
{
|
||||
#region Fields
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ using System;
|
||||
|
||||
namespace System.Xml.Serialization
|
||||
{
|
||||
[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface | AttributeTargets.Enum)]
|
||||
[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Struct, AllowMultiple=false)]
|
||||
public sealed class XmlSerializerAssemblyAttribute : Attribute
|
||||
{
|
||||
string _assemblyName;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -60,7 +60,7 @@ namespace MonoCasTests.System.Xml.Xsl {
|
||||
public void AddExtensionObject ()
|
||||
{
|
||||
XsltArgumentList xal = new XsltArgumentList ();
|
||||
xal.AddExtensionObject ("http://www.go-mono.com", new object ());
|
||||
xal.AddExtensionObject ("http://www.example.com", new object ());
|
||||
}
|
||||
|
||||
// we use reflection to call XsltArgumentList as it's AddExtensionObject method
|
||||
@@ -74,7 +74,7 @@ namespace MonoCasTests.System.Xml.Xsl {
|
||||
// requires FullTrust, so denying anything break the requirements
|
||||
Assert.IsNotNull (addExtensionObject, "AddExtensionObject");
|
||||
XsltArgumentList xal = new XsltArgumentList ();
|
||||
addExtensionObject.Invoke (xal, new object[2] { "http://www.go-mono.com", new object () });
|
||||
addExtensionObject.Invoke (xal, new object[2] { "http://www.example.com", new object () });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1049,7 +1049,7 @@ namespace MonoTests.System.Xml
|
||||
// public void LoadExternalUri ()
|
||||
// {
|
||||
// // set any URL of well-formed XML.
|
||||
// document.Load ("http://www.go-mono.com/index.rss");
|
||||
// document.Load ("http://www.example.com/index.rss");
|
||||
// }
|
||||
|
||||
// [Test] comment out in the meantime.
|
||||
|
||||
@@ -80,23 +80,23 @@ namespace MonoTests.System.Xml {
|
||||
} else
|
||||
Assert.AreEqual ("file:///Moonlight", uri.ToString (), "ToString");
|
||||
|
||||
uri = new Uri ("http://www.mono-project.com");
|
||||
uri = new Uri ("http://www.example.com");
|
||||
Uri u2 = xr.ResolveUri (uri, null);
|
||||
Assert.AreEqual (uri, u2, "Equals");
|
||||
Assert.IsTrue (Object.ReferenceEquals (uri, u2), "ReferenceEquals");
|
||||
|
||||
u2 = xr.ResolveUri (uri, "/Moonlight");
|
||||
Assert.IsTrue (uri.IsAbsoluteUri, "abs,string");
|
||||
Assert.AreEqual ("http://www.mono-project.com/Moonlight", u2.ToString (), "ToString3");
|
||||
Assert.AreEqual ("http://www.example.com/Moonlight", u2.ToString (), "ToString3");
|
||||
|
||||
u2 = xr.ResolveUri (null, "http://www.mono-project.com");
|
||||
u2 = xr.ResolveUri (null, "http://www.example.com");
|
||||
Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/http");
|
||||
Assert.AreEqual (uri, u2, "Equals-2");
|
||||
|
||||
u2 = xr.ResolveUri (null, "https://www.mono-project.com");
|
||||
u2 = xr.ResolveUri (null, "https://www.example.com");
|
||||
Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/https");
|
||||
|
||||
u2 = xr.ResolveUri (null, "ftp://mono-project.com/download");
|
||||
u2 = xr.ResolveUri (null, "ftp://example.com/download");
|
||||
Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/ftp");
|
||||
|
||||
u2 = xr.ResolveUri (null, "file:///mystuff");
|
||||
@@ -117,7 +117,7 @@ namespace MonoTests.System.Xml {
|
||||
public void TestAsync ()
|
||||
{
|
||||
var ar = new AsyncXmlResolver ();
|
||||
var uri = new Uri ("http://www.mono-project.com");
|
||||
var uri = new Uri ("http://www.example.com");
|
||||
ar.GetEntityAsync (uri, null, typeof(string));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace MonoCasTests.System.Xml {
|
||||
public void EmptyEvidenceDeniedAccess ()
|
||||
{
|
||||
XmlSecureResolver r = new XmlSecureResolver (new XmlUrlResolver (), (Evidence)null);
|
||||
Uri uri = r.ResolveUri (null, "http://www.go-mono.com");
|
||||
Uri uri = r.ResolveUri (null, "http://www.example.com");
|
||||
r.GetEntity (uri, null, typeof (Stream));
|
||||
}
|
||||
|
||||
|
||||
@@ -36,14 +36,14 @@ namespace MonoTests.System.Xml
|
||||
public void EmptyCtorCannotResolve ()
|
||||
{
|
||||
XmlSecureResolver r = new XmlSecureResolver (null, (Evidence)null);
|
||||
r.ResolveUri (null, "http://www.go-mono.com");
|
||||
r.ResolveUri (null, "http://www.example.com");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EmptyEvidenceWontMatter ()
|
||||
{
|
||||
XmlSecureResolver r = new XmlSecureResolver (new XmlUrlResolver (), (Evidence)null);
|
||||
Uri uri = r.ResolveUri (null, "http://www.go-mono.com");
|
||||
Uri uri = r.ResolveUri (null, "http://www.example.com");
|
||||
Assert.IsNotNull (uri);
|
||||
}
|
||||
|
||||
@@ -109,9 +109,9 @@ namespace MonoTests.System.Xml
|
||||
public void CreateEvidenceForUrl_Http ()
|
||||
{
|
||||
// http://
|
||||
Evidence e = XmlSecureResolver.CreateEvidenceForUrl ("http://www.go-mono.com");
|
||||
Evidence e = XmlSecureResolver.CreateEvidenceForUrl ("http://www.example.com");
|
||||
#pragma warning disable 612
|
||||
Assert.AreEqual (3, e.Count, "http://www.go-mono.com");
|
||||
Assert.AreEqual (3, e.Count, "http://www.example.com");
|
||||
#pragma warning restore
|
||||
bool url = false;
|
||||
bool zone = false;
|
||||
|
||||
@@ -54,7 +54,7 @@ namespace MonoTests.System.Xml
|
||||
[Test]
|
||||
public void HttpUri2 ()
|
||||
{
|
||||
Assert.AreEqual (resolver.ResolveUri (new Uri ("http://go-mono.com"), null).ToString (), "http://go-mono.com/");
|
||||
Assert.AreEqual (resolver.ResolveUri (new Uri ("http://example.com"), null).ToString (), "http://example.com/");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -70,7 +70,7 @@ namespace MonoTests.System.Xml
|
||||
// [Test] Uncomment if you want to test.
|
||||
public void GetEntityWithNullArgs ()
|
||||
{
|
||||
Uri uri = new Uri ("http://www.go-mono.com/index.rss");
|
||||
Uri uri = new Uri ("http://www.example.com/index.rss");
|
||||
resolver.GetEntity (uri, null, null);
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace MonoTests.System.Xml
|
||||
[ExpectedException (typeof (XmlException))]
|
||||
public void GetEntityWithNonStreamReturnType ()
|
||||
{
|
||||
resolver.GetEntity (new Uri ("http://www.go-mono.com/"), null, typeof (File));
|
||||
resolver.GetEntity (new Uri ("http://www.example.com/"), null, typeof (File));
|
||||
}
|
||||
|
||||
[Test] // bug #998
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<xs:schema
|
||||
targetNamespace="http://go-mono.com/tests"
|
||||
targetNamespace="http://example.com/tests"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
elementFormDefault="qualified">
|
||||
<xs:include schemaLocation="77687inc.xsd"/>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
targetNamespace="http://go-mono.com/tests" xmlns="http://go-mono.com/tests"
|
||||
targetNamespace="http://example.com/tests" xmlns="http://example.com/tests"
|
||||
elementFormDefault="qualified">
|
||||
<xs:element name="note">
|
||||
<xs:complexType>
|
||||
|
||||
Reference in New Issue
Block a user