Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -62,24 +62,24 @@ namespace System.ServiceModel.Syndication
{
}
public SyndicationItem (string title, string content, Uri feedAlternateLink)
: this (title, content, feedAlternateLink, null, default (DateTimeOffset))
public SyndicationItem (string title, string content, Uri itemAlternateLink)
: this (title, content, itemAlternateLink, null, default (DateTimeOffset))
{
}
public SyndicationItem (string title, string content, Uri feedAlternateLink, string id,
public SyndicationItem (string title, string content, Uri itemAlternateLink, string id,
DateTimeOffset lastUpdatedTime)
: this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, feedAlternateLink, id, lastUpdatedTime)
: this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, itemAlternateLink, id, lastUpdatedTime)
{
}
public SyndicationItem (string title, SyndicationContent content, Uri feedAlternateLink, string id,
public SyndicationItem (string title, SyndicationContent content, Uri itemAlternateLink, string id,
DateTimeOffset lastUpdatedTime)
{
Title = title != null ? new TextSyndicationContent (title) : null;
Content = content;
if (feedAlternateLink != null)
AddPermalink (feedAlternateLink);
if (itemAlternateLink != null)
AddPermalink (itemAlternateLink);
Id = id;
LastUpdatedTime = lastUpdatedTime;
}
@ -210,11 +210,11 @@ namespace System.ServiceModel.Syndication
set { title = value; }
}
public void AddPermalink (Uri link)
public void AddPermalink (Uri permalink)
{
if (link == null)
throw new ArgumentNullException ("link");
Links.Add (SyndicationLink.CreateAlternateLink (link));
if (permalink == null)
throw new ArgumentNullException ("permalink");
Links.Add (SyndicationLink.CreateAlternateLink (permalink));
}
public virtual SyndicationItem Clone ()