mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10FeedFormatter.cs
View File

@ -411,10 +411,10 @@ namespace System.ServiceModel.Syndication
writer.WriteStartElement ("feed", AtomNamespace);
if (Feed.BaseUri != null)
writer.WriteAttributeString ("xml:base", Feed.BaseUri.ToString ());
writer.WriteAttributeString ("xml", "base", null, Feed.BaseUri.ToString ());
if (Feed.Language != null)
writer.WriteAttributeString ("xml:lang", Feed.Language);
writer.WriteAttributeString ("xml", "lang", null, Feed.Language);
// atom:feed elements MUST contain exactly one atom:title element.
(Feed.Title ?? new TextSyndicationContent (String.Empty)).WriteTo (writer, "title", AtomNamespace);

2
mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs
View File

@ -408,7 +408,7 @@ namespace System.ServiceModel.Syndication
writer.WriteStartElement ("entry", AtomNamespace);
if (Item.BaseUri != null)
writer.WriteAttributeString ("xml:base", Item.BaseUri.ToString ());
writer.WriteAttributeString ("xml", "base", null, Item.BaseUri.ToString ());
// atom:entry elements MUST contain exactly one atom:id element.
writer.WriteElementString ("id", AtomNamespace, Item.Id ?? new UniqueId ().ToString ());

4
mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationElementExtension.cs
View File

@ -148,7 +148,6 @@ namespace System.ServiceModel.Syndication
{
if (serializer == null)
serializer = new DataContractSerializer (extension.GetType ());
#if NET_4_0
// FIXME: this is a nasty workaround that mcs somehow fails to resolve InternalVisibleTo(System.ServiceModel) in System.Runtime.Serialization.dll and thus rejects the use of KnownTypeCollection unlike NET_2_0 case (where System.ServiceModel.Web.dll is referenced).
XmlQualifiedName qname = null;
if (name == null || ns == null) {
@ -160,9 +159,6 @@ namespace System.ServiceModel.Syndication
xr.MoveToContent ();
qname = new XmlQualifiedName (xr.LocalName, xr.NamespaceURI);
}
#else
var qname = name == null || ns == null ? KnownTypeCollection.GetStaticQName (extension.GetType ()) : null;
#endif
this.Name = name ?? qname.Name;
this.Namespace = ns ?? qname.Namespace;
this.extension = extension;