added nameof() to all exceptions when needed.

Commit migrated from https://github.com/dotnet/corefx/commit/c4abc363fe278be641805b4490a87c988c7b3399

diff --git a/src/libraries/Atom10Constants.cs b/src/libraries/Atom10Constants.cs
index efd0aa6..c093eb8 100644 (file)
--- a/src/libraries/Atom10Constants.cs
+++ b/src/libraries/Atom10Constants.cs
@@ -48,7 +48,6 @@ namespace Microsoft.ServiceModel.Syndication
         public const string XHtmlMediaType = "application/xhtml+xml";
         public const string XHtmlType = "xhtml";
         public const string XmlMediaType = "text/xml";
-        //new constants
         public const string IconTag = "icon";
     }
 }

diff --git a/src/libraries/Atom10FeedFormatter.cs b/src/libraries/Atom10FeedFormatter.cs
index 7681cd0..bf30528 100644 (file)
--- a/src/libraries/Atom10FeedFormatter.cs
+++ b/src/libraries/Atom10FeedFormatter.cs
@@ -75,11 +75,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feedTypeToCreate == null)
             {
-                throw new ArgumentException("feedTypeToCreate");
+                throw new ArgumentException(nameof(feedTypeToCreate));
             }
             if (!typeof(SyndicationFeed).IsAssignableFrom(feedTypeToCreate))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "feedTypeToCreate", "SyndicationFeed"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(feedTypeToCreate), nameof(SyndicationFeed)));
             }
             _maxExtensionSize = int.MaxValue;
             _preserveAttributeExtensions = _preserveElementExtensions = true;
@@ -128,7 +128,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             return reader.IsStartElement(Atom10Constants.FeedTag, Atom10Constants.Atom10Namespace);
@@ -149,7 +149,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
 
             XmlWriterWrapper wrappedWriter = XmlWriterWrapper.CreateFromWriter(writer);
@@ -468,68 +468,6 @@ namespace Microsoft.ServiceModel.Syndication
                 return true;
             }
             return false;
-
-
-            //original
-            //if (await reader.IsStartElementAsync(Atom10Constants.AuthorTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Authors.Add(await ReadPersonFromAsync(reader, result));
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.CategoryTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Categories.Add(await ReadCategoryFromAsync(reader, result));
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.ContentTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Content = await ReadContentFromAsync(reader, result);
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.ContributorTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Contributors.Add(await ReadPersonFromAsync(reader, result));
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.IdTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Id = await reader.ReadElementStringAsync();
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.LinkTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Links.Add(await ReadLinkFromAsync(reader, result));
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.PublishedTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    await reader.ReadStartElementAsync();
-            //    result.PublishDate = DateFromString(await reader.ReadStringAsync(), reader);
-            //    await reader.ReadEndElementAsync();
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.RightsTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Copyright = await ReadTextContentFromAsync(reader, "//atom:feed/atom:entry/atom:rights[@type]");
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.SourceFeedTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    await reader.ReadStartElementAsync();
-            //    result.SourceFeed = await ReadFeedFromAsync(reader, new SyndicationFeed(), true); //  isSourceFeed 
-            //    await reader.ReadEndElementAsync();
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.SummaryTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Summary = await ReadTextContentFromAsync(reader, "//atom:feed/atom:entry/atom:summary[@type]");
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.TitleTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    result.Title = await ReadTextContentFromAsync(reader, "//atom:feed/atom:entry/atom:title[@type]");
-            //}
-            //else if (await reader.IsStartElementAsync(Atom10Constants.UpdatedTag, Atom10Constants.Atom10Namespace))
-            //{
-            //    await reader.ReadStartElementAsync();
-            //    result.LastUpdatedTime = DateFromString(await reader.ReadStringAsync(), reader);
-            //    await reader.ReadEndElementAsync();
-            //}
-            //else
-            //{
-            //    return false;
-            //}
-            //return true;
         }
 
         internal void WriteContentTo(XmlWriter writer, string elementName, SyndicationContent content)
@@ -659,12 +597,12 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
 
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             SyndicationItem item = CreateItem(feed);
@@ -680,11 +618,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             NullNotAllowedCollection<SyndicationItem> items = new NullNotAllowedCollection<SyndicationItem>();
 
@@ -1207,38 +1145,6 @@ namespace Microsoft.ServiceModel.Syndication
                             link.AttributeExtensions.Add(new XmlQualifiedName(reader.LocalName, reader.NamespaceURI), await reader.GetValueAsync());
                         }
                     }
-
-                    //if (reader.LocalName == "base" && reader.NamespaceURI == XmlNs)
-                    //{
-                    //    link.BaseUri = FeedUtils.CombineXmlBase(link.BaseUri, await reader.GetValueAsync());
-                    //}
-                    //else if (reader.LocalName == Atom10Constants.TypeTag && reader.NamespaceURI == string.Empty)
-                    //{
-                    //    mediaType = await reader.GetValueAsync();
-                    //}
-                    //else if (reader.LocalName == Atom10Constants.RelativeTag && reader.NamespaceURI == string.Empty)
-                    //{
-                    //    relationship = await reader.GetValueAsync();
-                    //}
-                    //else if (reader.LocalName == Atom10Constants.TitleTag && reader.NamespaceURI == string.Empty)
-                    //{
-                    //    title = await reader.GetValueAsync();
-                    //}
-                    //else if (reader.LocalName == Atom10Constants.LengthTag && reader.NamespaceURI == string.Empty)
-                    //{
-                    //    lengthStr = await reader.GetValueAsync();
-                    //}
-                    //else if (reader.LocalName == Atom10Constants.HrefTag && reader.NamespaceURI == string.Empty)
-                    //{
-                    //    val = await reader.GetValueAsync();
-                    //}
-                    //else if (!FeedUtils.IsXmlns(reader.LocalName, reader.NamespaceURI))
-                    //{
-                    //    if (_preserveAttributeExtensions)
-                    //    {
-                    //        link.AttributeExtensions.Add(new XmlQualifiedName(reader.LocalName, reader.NamespaceURI), await reader.GetValueAsync());
-                    //    }
-                    //}
                 }
             }
 
@@ -1322,85 +1228,6 @@ namespace Microsoft.ServiceModel.Syndication
             await ReadPersonFromAsync(reader, result);
             return result;
         }
-        
-        //private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerson result)
-        //{
-        //    bool isEmpty = reader.IsEmptyElement;
-        //    if (reader.HasAttributes)
-        //    {
-        //        while (reader.MoveToNextAttribute())
-        //        {
-        //            string ns = reader.NamespaceURI;
-        //            string name = reader.LocalName;
-        //            if (FeedUtils.IsXmlns(name, ns))
-        //            {
-        //                continue;
-        //            }
-        //            string val = await reader.GetValueAsync();
-        //            if (!TryParseAttribute(name, ns, val, result, this.Version))
-        //            {
-        //                if (_preserveAttributeExtensions)
-        //                {
-        //                    result.AttributeExtensions.Add(new XmlQualifiedName(reader.LocalName, reader.NamespaceURI), await reader.GetValueAsync());
-        //                }
-        //            }
-        //        }
-        //    }
-        //    await reader.ReadStartElementAsync();
-        //    if (!isEmpty)
-        //    {
-        //        XmlBuffer buffer = null;
-        //        XmlDictionaryWriter extWriter = null;
-        //        try
-        //        {
-        //            while (await reader.IsStartElementAsync())
-        //            {
-        //                if (await reader.IsStartElementAsync(Atom10Constants.NameTag, Atom10Constants.Atom10Namespace))
-        //                {
-        //                    result.Name = await reader.ReadElementStringAsync();
-        //                }
-        //                else if (await reader.IsStartElementAsync(Atom10Constants.UriTag, Atom10Constants.Atom10Namespace))
-        //                {
-        //                    result.Uri = await reader.ReadElementStringAsync();
-        //                }
-        //                else if (await reader.IsStartElementAsync(Atom10Constants.EmailTag, Atom10Constants.Atom10Namespace))
-        //                {
-        //                    result.Email = await reader.ReadElementStringAsync();
-        //                }
-        //                else
-        //                {
-        //                    if (!TryParseElement(reader, result, this.Version))
-        //                    {
-        //                        if (_preserveElementExtensions)
-        //                        {
-        //                            if (buffer == null)
-        //                            {
-        //                                buffer = new XmlBuffer(_maxExtensionSize);
-        //                                extWriter = buffer.OpenSection(XmlDictionaryReaderQuotas.Max);
-        //                                extWriter.WriteStartElement(Rss20Constants.ExtensionWrapperTag);
-        //                            }
-
-        //                            await XmlReaderWrapper.WriteNodeAsync(extWriter, reader, false);
-        //                        }
-        //                        else
-        //                        {
-        //                            await reader.SkipAsync();
-        //                        }
-        //                    }
-        //                }
-        //            }
-        //            LoadElementExtensions(buffer, extWriter, result);
-        //        }
-        //        finally
-        //        {
-        //            if (extWriter != null)
-        //            {
-        //                ((IDisposable)extWriter).Dispose();
-        //            }
-        //        }
-        //        await reader.ReadEndElementAsync();
-        //    }
-        //}
 
         private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerson result)
         {

diff --git a/src/libraries/Atom10ItemFormatter.cs b/src/libraries/Atom10ItemFormatter.cs
index 3fdc06c..ff492d1 100644 (file)
--- a/src/libraries/Atom10ItemFormatter.cs
+++ b/src/libraries/Atom10ItemFormatter.cs
@@ -38,11 +38,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (itemTypeToCreate == null)
             {
-                throw new ArgumentNullException("itemTypeToCreate");
+                throw new ArgumentNullException(nameof(itemTypeToCreate));
             }
             if (!typeof(SyndicationItem).IsAssignableFrom(itemTypeToCreate))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "itemTypeToCreate", "SyndicationItem"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(itemTypeToCreate), nameof(SyndicationItem)));
             }
             _feedSerializer = new Atom10FeedFormatter();
             _feedSerializer.PreserveAttributeExtensions = _preserveAttributeExtensions = true;
@@ -97,7 +97,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             return reader.IsStartElement(Atom10Constants.EntryTag, Atom10Constants.Atom10Namespace);
         }
@@ -116,7 +116,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
 
             XmlWriterWrapper wrappedWriter = XmlWriterWrapper.CreateFromWriter(writer);

diff --git a/src/libraries/AtomPub10CategoriesDocumentFormatter.cs b/src/libraries/AtomPub10CategoriesDocumentFormatter.cs
index c3e51c9..b05f0aa 100644 (file)
--- a/src/libraries/AtomPub10CategoriesDocumentFormatter.cs
+++ b/src/libraries/AtomPub10CategoriesDocumentFormatter.cs
@@ -33,19 +33,19 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (inlineDocumentType == null)
             {
-                throw new ArgumentNullException("inlineDocumentType");
+                throw new ArgumentNullException(nameof(inlineDocumentType));
             }
             if (!typeof(InlineCategoriesDocument).IsAssignableFrom(inlineDocumentType))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "inlineDocumentType", "InlineCategoriesDocument"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(inlineDocumentType), nameof(InlineCategoriesDocument)));
             }
             if (referencedDocumentType == null)
             {
-                throw new ArgumentNullException("referencedDocumentType");
+                throw new ArgumentNullException(nameof(referencedDocumentType));
             }
             if (!typeof(ReferencedCategoriesDocument).IsAssignableFrom(referencedDocumentType))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "referencedDocumentType", "ReferencedCategoriesDocument"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(referencedDocumentType), nameof(ReferencedCategoriesDocument)));
             }
             _maxExtensionSize = int.MaxValue;
             _preserveAttributeExtensions = true;
@@ -82,7 +82,7 @@ namespace Microsoft.ServiceModel.Syndication
         {            
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             XmlReaderWrapper wrappedReader = XmlReaderWrapper.CreateFromReader(reader);
             return await wrappedReader.IsStartElementAsync(App10Constants.Categories, App10Constants.Namespace);
@@ -94,7 +94,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             await ReadDocumentAsync(reader);
         }
@@ -103,7 +103,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (this.Document == null)
             {
@@ -116,7 +116,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             if (!await CanReadAsync(reader))
             {
@@ -130,7 +130,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (this.Document == null)
             {

diff --git a/src/libraries/AtomPub10ServiceDocumentFormatter.cs b/src/libraries/AtomPub10ServiceDocumentFormatter.cs
index fab0dea..b343b13 100644 (file)
--- a/src/libraries/AtomPub10ServiceDocumentFormatter.cs
+++ b/src/libraries/AtomPub10ServiceDocumentFormatter.cs
@@ -35,11 +35,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (documentTypeToCreate == null)
             {
-                throw new ArgumentNullException("documentTypeToCreate");
+                throw new ArgumentNullException(nameof(documentTypeToCreate));
             }
             if (!typeof(ServiceDocument).IsAssignableFrom(documentTypeToCreate))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "documentTypeToCreate", "ServiceDocument"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(documentTypeToCreate), nameof(ServiceDocument)));
             }
             _maxExtensionSize = int.MaxValue;
             _preserveAttributeExtensions = true;
@@ -66,7 +66,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             XmlReaderWrapper readerWrapper = XmlReaderWrapper.CreateFromReader(reader);
@@ -77,7 +77,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             await ReadDocumentAsync(reader);
         }
@@ -86,7 +86,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (this.Document == null)
             {
@@ -99,7 +99,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             XmlReaderWrapper wrappedReader = XmlReaderWrapper.CreateFromReader(reader);
@@ -117,7 +117,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (this.Document == null)
             {

diff --git a/src/libraries/CategoriesDocumentFormatter.cs b/src/libraries/CategoriesDocumentFormatter.cs
index f2b6db0..d67e656 100644 (file)
--- a/src/libraries/CategoriesDocumentFormatter.cs
+++ b/src/libraries/CategoriesDocumentFormatter.cs
@@ -21,7 +21,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (documentToWrite == null)
             {
-                throw new ArgumentNullException("documentToWrite");
+                throw new ArgumentNullException(nameof(documentToWrite));
             }
             _document = documentToWrite;
         }

diff --git a/src/libraries/ExtensibleSyndicationObject.cs b/src/libraries/ExtensibleSyndicationObject.cs
index 088e02f..509e8bb 100644 (file)
--- a/src/libraries/ExtensibleSyndicationObject.cs
+++ b/src/libraries/ExtensibleSyndicationObject.cs
@@ -84,11 +84,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (readerOverUnparsedExtensions == null)
             {
-                throw new ArgumentNullException("readerOverUnparsedExtensions");
+                throw new ArgumentNullException(nameof(readerOverUnparsedExtensions));
             }
             if (maxExtensionSize < 0)
             {
-                throw new ArgumentOutOfRangeException("maxExtensionSize");
+                throw new ArgumentOutOfRangeException(nameof(maxExtensionSize));
             }
             XmlDictionaryReader r = XmlDictionaryReader.CreateDictionaryReader(readerOverUnparsedExtensions);
             _elementExtensions = new SyndicationElementExtensionCollection(CreateXmlBuffer(r, maxExtensionSize));
@@ -104,7 +104,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (_attributeExtensions != null)
             {
@@ -120,7 +120,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (_elementExtensions != null)
             {

diff --git a/src/libraries/NullNotAllowedCollection.cs b/src/libraries/NullNotAllowedCollection.cs
index be31c11..e3d0015 100644 (file)
--- a/src/libraries/NullNotAllowedCollection.cs
+++ b/src/libraries/NullNotAllowedCollection.cs
@@ -19,7 +19,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             base.InsertItem(index, item);
         }
@@ -28,7 +28,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             base.SetItem(index, item);
         }

diff --git a/src/libraries/ReferencedCategoriesDocument.cs b/src/libraries/ReferencedCategoriesDocument.cs
index 9511499..041af35 100644 (file)
--- a/src/libraries/ReferencedCategoriesDocument.cs
+++ b/src/libraries/ReferencedCategoriesDocument.cs
@@ -21,7 +21,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             _link = link;
         }

diff --git a/src/libraries/ResourceCollectionInfo.cs b/src/libraries/ResourceCollectionInfo.cs
index 5ead32d..d866b1f 100644 (file)
--- a/src/libraries/ResourceCollectionInfo.cs
+++ b/src/libraries/ResourceCollectionInfo.cs
@@ -44,11 +44,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (title == null)
             {
-                throw new ArgumentNullException("title");
+                throw new ArgumentNullException(nameof(title));
             }
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             _title = title;
             _link = link;

diff --git a/src/libraries/Rss20Constants.cs b/src/libraries/Rss20Constants.cs
index f1573f9..5491542 100644 (file)
--- a/src/libraries/Rss20Constants.cs
+++ b/src/libraries/Rss20Constants.cs
@@ -34,7 +34,6 @@ namespace Microsoft.ServiceModel.Syndication
         public const string UrlTag = "url";
         public const string Version = "2.0";
         public const string VersionTag = "version";
-        //new constants
         public const string DocumentationTag = "docs";
         public const string TimeToLiveTag = "ttl";
         public const string CloudTag = "cloud";

diff --git a/src/libraries/Rss20FeedFormatter.cs b/src/libraries/Rss20FeedFormatter.cs
index 2acc6e3..5002810 100644 (file)
--- a/src/libraries/Rss20FeedFormatter.cs
+++ b/src/libraries/Rss20FeedFormatter.cs
@@ -108,11 +108,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feedTypeToCreate == null)
             {
-                throw new ArgumentNullException("feedTypeToCreate");
+                throw new ArgumentNullException(nameof(feedTypeToCreate));
             }
             if (!typeof(SyndicationFeed).IsAssignableFrom(feedTypeToCreate))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "feedTypeToCreate", "SyndicationFeed"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(feedTypeToCreate), nameof(SyndicationFeed)));
             }
             _serializeExtensionsAsAtom = true;
             _maxExtensionSize = int.MaxValue;
@@ -176,7 +176,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             return reader.IsStartElement(Rss20Constants.RssTag, Rss20Constants.Rss20Namespace);
@@ -197,7 +197,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
 
             await WriteFeedAsync(XmlWriterWrapper.CreateFromWriter( writer) );
@@ -207,7 +207,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
 
             XmlWriterWrapper writerWrapped = XmlWriterWrapper.CreateFromWriter(writer);
@@ -456,11 +456,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             SyndicationItem item = CreateItem(feed);
             XmlReaderWrapper readerWrapper = XmlReaderWrapper.CreateFromReader(reader);

diff --git a/src/libraries/Rss20ItemFormatter.cs b/src/libraries/Rss20ItemFormatter.cs
index b15ce15..1a5f02e 100644 (file)
--- a/src/libraries/Rss20ItemFormatter.cs
+++ b/src/libraries/Rss20ItemFormatter.cs
@@ -33,11 +33,11 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (itemTypeToCreate == null)
             {
-                throw new ArgumentNullException("itemTypeToCreate");
+                throw new ArgumentNullException(nameof(itemTypeToCreate));
             }
             if (!typeof(SyndicationItem).IsAssignableFrom(itemTypeToCreate))
             {
-                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, "itemTypeToCreate", "SyndicationItem"));
+                throw new ArgumentException(String.Format(SR.InvalidObjectTypePassed, nameof(itemTypeToCreate), nameof(SyndicationItem)));
             }
             _feedSerializer = new Rss20FeedFormatter();
             _feedSerializer.PreserveAttributeExtensions = _preserveAttributeExtensions = true;
@@ -109,7 +109,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             return reader.IsStartElement(Rss20Constants.ItemTag, Rss20Constants.Rss20Namespace);
@@ -120,7 +120,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             await WriteItem(writer);
         }
@@ -139,7 +139,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
 
             XmlWriterWrapper writerWrapper = XmlWriterWrapper.CreateFromWriter(writer);

diff --git a/src/libraries/ServiceDocumentFormatter.cs b/src/libraries/ServiceDocumentFormatter.cs
index ff7208c..fe41ea2 100644 (file)
--- a/src/libraries/ServiceDocumentFormatter.cs
+++ b/src/libraries/ServiceDocumentFormatter.cs
@@ -23,7 +23,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (documentToWrite == null)
             {
-                throw new ArgumentNullException("documentToWrite");
+                throw new ArgumentNullException(nameof(documentToWrite));
             }
             _document = documentToWrite;
         }
@@ -44,7 +44,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (categories == null)
             {
-                throw new ArgumentNullException("categories");
+                throw new ArgumentNullException(nameof(categories));
             }
             Atom10FeedFormatter.CloseBuffer(buffer, writer);
             categories.LoadElementExtensions(buffer);
@@ -54,7 +54,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (collection == null)
             {
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
             }
             Atom10FeedFormatter.CloseBuffer(buffer, writer);
             collection.LoadElementExtensions(buffer);
@@ -64,7 +64,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
             Atom10FeedFormatter.CloseBuffer(buffer, writer);
             workspace.LoadElementExtensions(buffer);
@@ -74,7 +74,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
             Atom10FeedFormatter.CloseBuffer(buffer, writer);
             document.LoadElementExtensions(buffer);
@@ -84,7 +84,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (inlineCategories == null)
             {
-                throw new ArgumentNullException("inlineCategories");
+                throw new ArgumentNullException(nameof(inlineCategories));
             }
             return inlineCategories.CreateCategory();
         }
@@ -93,7 +93,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
             return workspace.CreateResourceCollection();
         }
@@ -112,7 +112,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
             return document.CreateWorkspace();
         }
@@ -121,7 +121,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (categories == null)
             {
-                throw new ArgumentNullException("categories");
+                throw new ArgumentNullException(nameof(categories));
             }
 
             categories.LoadElementExtensions(XmlReaderWrapper.CreateFromReader(reader), maxExtensionSize);
@@ -131,7 +131,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (collection == null)
             {
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
             }
 
             collection.LoadElementExtensions(XmlReaderWrapper.CreateFromReader(reader), maxExtensionSize);
@@ -141,7 +141,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
 
             workspace.LoadElementExtensions(XmlReaderWrapper.CreateFromReader(reader), maxExtensionSize);
@@ -151,7 +151,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
 
             document.LoadElementExtensions(XmlReaderWrapper.CreateFromReader(reader), maxExtensionSize);
@@ -161,7 +161,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
 
             return document.TryParseAttribute(name, ns, value, version);
@@ -171,7 +171,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (collection == null)
             {
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
             }
 
             return collection.TryParseAttribute(name, ns, value, version);
@@ -181,7 +181,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (categories == null)
             {
-                throw new ArgumentNullException("categories");
+                throw new ArgumentNullException(nameof(categories));
             }
 
             return categories.TryParseAttribute(name, ns, value, version);
@@ -191,7 +191,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
 
             return workspace.TryParseAttribute(name, ns, value, version);
@@ -201,7 +201,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (collection == null)
             {
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
             }
 
             return collection.TryParseElement(XmlReaderWrapper.CreateFromReader(reader), version);
@@ -211,7 +211,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
 
             return document.TryParseElement(XmlReaderWrapper.CreateFromReader(reader), version);
@@ -221,7 +221,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
 
             return workspace.TryParseElement(XmlReaderWrapper.CreateFromReader(reader), version);
@@ -231,7 +231,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (categories == null)
             {
-                throw new ArgumentNullException("categories");
+                throw new ArgumentNullException(nameof(categories));
             }
 
             return categories.TryParseElement(XmlReaderWrapper.CreateFromReader(reader), version);
@@ -241,7 +241,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
 
             document.WriteAttributeExtensions(writer, version);
@@ -251,7 +251,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
 
             workspace.WriteAttributeExtensions(writer, version);
@@ -261,7 +261,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (collection == null)
             {
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
             }
 
             collection.WriteAttributeExtensions(writer, version);
@@ -271,7 +271,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (categories == null)
             {
-                throw new ArgumentNullException("categories");
+                throw new ArgumentNullException(nameof(categories));
             }
 
             categories.WriteAttributeExtensions(writer, version);
@@ -281,7 +281,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (document == null)
             {
-                throw new ArgumentNullException("document");
+                throw new ArgumentNullException(nameof(document));
             }
 
             document.WriteElementExtensions(writer, version);
@@ -291,7 +291,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (workspace == null)
             {
-                throw new ArgumentNullException("workspace");
+                throw new ArgumentNullException(nameof(workspace));
             }
 
             workspace.WriteElementExtensions(writer, version);
@@ -301,7 +301,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (collection == null)
             {
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
             }
 
             collection.WriteElementExtensions(writer, version);
@@ -311,7 +311,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (categories == null)
             {
-                throw new ArgumentNullException("categories");
+                throw new ArgumentNullException(nameof(categories));
             }
 
             categories.WriteElementExtensions(writer, version);

diff --git a/src/libraries/SyndicationCategory.cs b/src/libraries/SyndicationCategory.cs
index bf06f2f..eb38001 100644 (file)
--- a/src/libraries/SyndicationCategory.cs
+++ b/src/libraries/SyndicationCategory.cs
@@ -39,7 +39,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _label = source._label;
             _name = source._name;

diff --git a/src/libraries/SyndicationContent.cs b/src/libraries/SyndicationContent.cs
index 5710d39..2ea0bac 100644 (file)
--- a/src/libraries/SyndicationContent.cs
+++ b/src/libraries/SyndicationContent.cs
@@ -89,7 +89,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (string.IsNullOrEmpty(outerElementName))
             {
@@ -120,7 +120,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             if (source._attributeExtensions != null)
             {

diff --git a/src/libraries/SyndicationElementExtension.cs b/src/libraries/SyndicationElementExtension.cs
index bce9ade..7e7105f 100644 (file)
--- a/src/libraries/SyndicationElementExtension.cs
+++ b/src/libraries/SyndicationElementExtension.cs
@@ -27,7 +27,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("XmlReaderWrapper");
+                throw new ArgumentNullException(nameof(reader));
             }
             SyndicationFeedFormatter.MoveToStartElement(reader);
             _outerName = reader.LocalName;
@@ -63,7 +63,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (dataContractExtension == null)
             {
-                throw new ArgumentNullException("dataContractExtension");
+                throw new ArgumentNullException(nameof(dataContractExtension));
             }
             if (outerName == string.Empty)
             {
@@ -83,7 +83,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (xmlSerializerExtension == null)
             {
-                throw new ArgumentNullException("xmlSerializerExtension");
+                throw new ArgumentNullException(nameof(xmlSerializerExtension));
             }
             if (serializer == null)
             {
@@ -134,7 +134,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (serializer == null)
             {
-                throw new ArgumentNullException("serializer");
+                throw new ArgumentNullException(nameof(serializer));
             }
             if (_extensionData != null && typeof(TExtension).IsAssignableFrom(_extensionData.GetType()))
             {
@@ -151,7 +151,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (serializer == null)
             {
-                throw new ArgumentNullException("serializer");
+                throw new ArgumentNullException(nameof(serializer));
             }
             if (_extensionData != null && typeof(TExtension).IsAssignableFrom(_extensionData.GetType()))
             {
@@ -193,7 +193,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (_extensionDataWriter != null)
             {

diff --git a/src/libraries/SyndicationElementExtensionCollection.cs b/src/libraries/SyndicationElementExtensionCollection.cs
index c38602c..195aa56 100644 (file)
--- a/src/libraries/SyndicationElementExtensionCollection.cs
+++ b/src/libraries/SyndicationElementExtensionCollection.cs
@@ -71,7 +71,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (dataContractExtension == null)
             {
-                throw new ArgumentNullException("dataContractExtension");
+                throw new ArgumentNullException(nameof(dataContractExtension));
             }
             if (dataContractSerializer == null)
             {
@@ -84,7 +84,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (xmlSerializerExtension == null)
             {
-                throw new ArgumentNullException("xmlSerializerExtension");
+                throw new ArgumentNullException(nameof(xmlSerializerExtension));
             }
             if (serializer == null)
             {
@@ -97,7 +97,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("XmlReaderWrapper");
+                throw new ArgumentNullException(nameof(reader));
             }
             base.Add(new SyndicationElementExtension(reader));
         }
@@ -119,7 +119,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (serializer == null)
             {
-                throw new ArgumentNullException("serializer");
+                throw new ArgumentNullException(nameof(serializer));
             }
             return ReadExtensions<TExtension>(extensionName, extensionNamespace, serializer, null);
         }
@@ -128,7 +128,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (serializer == null)
             {
-                throw new ArgumentNullException("serializer");
+                throw new ArgumentNullException(nameof(serializer));
             }
             return ReadExtensions<TExtension>(extensionName, extensionNamespace, null, serializer);
         }
@@ -169,7 +169,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             base.InsertItem(index, item);
             // clear the cached buffer if the operation is happening outside the constructor
@@ -193,7 +193,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             base.SetItem(index, item);
             // clear the cached buffer if the operation is happening outside the constructor

diff --git a/src/libraries/SyndicationFeed.cs b/src/libraries/SyndicationFeed.cs
index 856a40a..5fe7edc 100644 (file)
--- a/src/libraries/SyndicationFeed.cs
+++ b/src/libraries/SyndicationFeed.cs
@@ -56,7 +56,7 @@ namespace Microsoft.ServiceModel.Syndication
             set
             {
                 if (value == null)
-                    throw new ArgumentNullException("value");
+                    throw new ArgumentNullException(nameof(value));
                 _iconImage = value;
             }
         } 
@@ -72,7 +72,7 @@ namespace Microsoft.ServiceModel.Syndication
             set
             {
                 if (value == null)
-                    throw new ArgumentNullException("value");
+                    throw new ArgumentNullException(nameof(value));
                 _textInput = value;
             }
         }
@@ -170,7 +170,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _authors = FeedUtils.ClonePersons(source._authors);
             _categories = FeedUtils.CloneCategories(source._categories);
@@ -315,7 +315,7 @@ namespace Microsoft.ServiceModel.Syndication
             {
                 if (value == null)
                 {
-                    throw new ArgumentNullException("value");
+                    throw new ArgumentNullException(nameof(value));
                 }
                 _items = value;
             }
@@ -362,28 +362,28 @@ namespace Microsoft.ServiceModel.Syndication
             return await LoadAsync(reader, new Rss20FeedFormatter(), formatter);
         }
 
-        public static async Task<SyndicationFeed> LoadAsync(XmlReader reader1, Rss20FeedFormatter Rssformatter, Atom10FeedFormatter Atomformatter)
+        public static async Task<SyndicationFeed> LoadAsync(XmlReader reader, Rss20FeedFormatter Rssformatter, Atom10FeedFormatter Atomformatter)
         {
-            if (reader1 == null)
+            if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
-            XmlReaderWrapper reader = XmlReaderWrapper.CreateFromReader(reader1);
+            XmlReaderWrapper wrappedReader = XmlReaderWrapper.CreateFromReader(reader);
 
             Atom10FeedFormatter atomSerializer = Atomformatter;
-            if (atomSerializer.CanRead(reader))
+            if (atomSerializer.CanRead(wrappedReader))
             {
-                await atomSerializer.ReadFromAsync(reader);
+                await atomSerializer.ReadFromAsync(wrappedReader);
                 return atomSerializer.Feed;
             }
             Rss20FeedFormatter rssSerializer = Rssformatter;
-            if (rssSerializer.CanRead(reader))
+            if (rssSerializer.CanRead(wrappedReader))
             {
-                await rssSerializer.ReadFromAsync(reader);
+                await rssSerializer.ReadFromAsync(wrappedReader);
                 return rssSerializer.Feed;
             }
-            throw new XmlException(String.Format(SR.UnknownFeedXml, reader.LocalName, reader.NamespaceURI));
+            throw new XmlException(String.Format(SR.UnknownFeedXml, wrappedReader.LocalName, wrappedReader.NamespaceURI));
         }
 
         //=================================

diff --git a/src/libraries/SyndicationFeedFormatter.cs b/src/libraries/SyndicationFeedFormatter.cs
index 6fc1f62..b019ea0 100644 (file)
--- a/src/libraries/SyndicationFeedFormatter.cs
+++ b/src/libraries/SyndicationFeedFormatter.cs
@@ -25,7 +25,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feedToWrite == null)
             {
-                throw new ArgumentNullException("feedToWrite");
+                throw new ArgumentNullException(nameof(feedToWrite));
             }
             _feed = feedToWrite;
         }
@@ -56,7 +56,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             return GetNonNullValue<SyndicationCategory>(feed.CreateCategory(), SR.FeedCreatedNullCategory);
         }
@@ -65,7 +65,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             return GetNonNullValue<SyndicationCategory>(item.CreateCategory(), SR.ItemCreatedNullCategory);
         }
@@ -74,7 +74,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             return GetNonNullValue<SyndicationItem>(feed.CreateItem(), SR.FeedCreatedNullItem);
         }
@@ -83,7 +83,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             return GetNonNullValue<SyndicationLink>(feed.CreateLink(), SR.FeedCreatedNullPerson);
         }
@@ -92,7 +92,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             return GetNonNullValue<SyndicationLink>(item.CreateLink(), SR.ItemCreatedNullPerson);
         }
@@ -101,7 +101,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             return GetNonNullValue<SyndicationPerson>(feed.CreatePerson(), SR.FeedCreatedNullPerson);
         }
@@ -110,7 +110,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             return GetNonNullValue<SyndicationPerson>(item.CreatePerson(), SR.ItemCreatedNullPerson);
         }
@@ -119,7 +119,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             feed.LoadElementExtensions(reader, maxExtensionSize);
         }
@@ -128,7 +128,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             item.LoadElementExtensions(reader, maxExtensionSize);
         }
@@ -137,7 +137,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (category == null)
             {
-                throw new ArgumentNullException("category");
+                throw new ArgumentNullException(nameof(category));
             }
             category.LoadElementExtensions(reader, maxExtensionSize);
         }
@@ -146,7 +146,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             link.LoadElementExtensions(reader, maxExtensionSize);
         }
@@ -155,7 +155,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
             person.LoadElementExtensions(reader, maxExtensionSize);
         }
@@ -164,7 +164,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
 
             if (FeedUtils.IsXmlns(name, ns))
@@ -179,7 +179,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             if (FeedUtils.IsXmlns(name, ns))
             {
@@ -192,7 +192,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (category == null)
             {
-                throw new ArgumentNullException("category");
+                throw new ArgumentNullException(nameof(category));
             }
             if (FeedUtils.IsXmlns(name, ns))
             {
@@ -205,7 +205,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             if (FeedUtils.IsXmlns(name, ns))
             {
@@ -218,7 +218,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
             if (FeedUtils.IsXmlns(name, ns))
             {
@@ -236,7 +236,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
 
             return feed.TryParseElement(reader, version);
@@ -246,7 +246,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             return item.TryParseElement(reader, version);
         }
@@ -255,7 +255,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (category == null)
             {
-                throw new ArgumentNullException("category");
+                throw new ArgumentNullException(nameof(category));
             }
             return category.TryParseElement(reader, version);
         }
@@ -264,7 +264,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             return link.TryParseElement(reader, version);
         }
@@ -273,7 +273,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
             return person.TryParseElement(reader, version);
         }
@@ -282,7 +282,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             feed.WriteAttributeExtensions(writer, version);
         }
@@ -291,7 +291,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             item.WriteAttributeExtensions(writer, version);
         }
@@ -300,7 +300,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (category == null)
             {
-                throw new ArgumentNullException("category");
+                throw new ArgumentNullException(nameof(category));
             }
             category.WriteAttributeExtensions(writer, version);
         }
@@ -309,7 +309,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             link.WriteAttributeExtensions(writer, version);
         }
@@ -318,7 +318,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
             person.WriteAttributeExtensions(writer, version);
         }
@@ -327,7 +327,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
             feed.WriteElementExtensions(writer, version);
         }
@@ -336,7 +336,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             item.WriteElementExtensions(writer, version);
         }
@@ -345,7 +345,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (category == null)
             {
-                throw new ArgumentNullException("category");
+                throw new ArgumentNullException(nameof(category));
             }
             category.WriteElementExtensions(writer, version);
         }
@@ -354,7 +354,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             link.WriteElementExtensions(writer, version);
         }
@@ -363,28 +363,16 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
 
             person.WriteElementExtensions(writer, version);
         }
 
         internal protected virtual void SetFeed(SyndicationFeed feed) { 
-            _feed = feed ?? throw new ArgumentNullException("feed");
+            _feed = feed ?? throw new ArgumentNullException(nameof(feed));
         }
 
-        //internal static async Task CloseBufferAsync(XmlBuffer buffer,  extWriter)
-        //{
-        //    if (buffer == null)
-        //    {
-        //        return;
-        //    }
-
-        //    await extWriter.WriteEndElementAsync(); // the method is not implemented
-        //    buffer.CloseSection();
-        //    buffer.Close();
-        //}
-
         internal static void CloseBuffer(XmlBuffer buffer, XmlDictionaryWriter extWriter)
         {
             
@@ -416,7 +404,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (feed == null)
             {
-                throw new ArgumentNullException("feed");
+                throw new ArgumentNullException(nameof(feed));
             }
 
             CloseBuffer(buffer, writer);
@@ -429,7 +417,7 @@ namespace Microsoft.ServiceModel.Syndication
 
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             CloseBuffer(buffer, writer);
             item.LoadElementExtensions(buffer);
@@ -440,7 +428,7 @@ namespace Microsoft.ServiceModel.Syndication
 
             if (category == null)
             {
-                throw new ArgumentNullException("category");
+                throw new ArgumentNullException(nameof(category));
             }
             CloseBuffer(buffer, writer);
             category.LoadElementExtensions(buffer);
@@ -451,7 +439,7 @@ namespace Microsoft.ServiceModel.Syndication
 
             if (link == null)
             {
-                throw new ArgumentNullException("link");
+                throw new ArgumentNullException(nameof(link));
             }
             CloseBuffer(buffer, writer);
             link.LoadElementExtensions(buffer);
@@ -461,7 +449,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
             CloseBuffer(buffer, writer);
             person.LoadElementExtensions(buffer);

diff --git a/src/libraries/SyndicationItem.cs b/src/libraries/SyndicationItem.cs
index d031b6d..3f2515c 100644 (file)
--- a/src/libraries/SyndicationItem.cs
+++ b/src/libraries/SyndicationItem.cs
@@ -64,7 +64,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _extensions = source._extensions.Clone();
             _authors = FeedUtils.ClonePersons(source._authors);
@@ -208,7 +208,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             //Atom10ItemFormatter<TSyndicationItem> atomSerializer = new Atom10ItemFormatter<TSyndicationItem>();
@@ -234,7 +234,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (permalink == null)
             {
-                throw new ArgumentNullException("permalink");
+                throw new ArgumentNullException(nameof(permalink));
             }
             this.Id = permalink.AbsoluteUri;
             this.Links.Add(SyndicationLink.CreateAlternateLink(permalink));

diff --git a/src/libraries/SyndicationItemFormatter.cs b/src/libraries/SyndicationItemFormatter.cs
index da62467..98ec41b 100644 (file)
--- a/src/libraries/SyndicationItemFormatter.cs
+++ b/src/libraries/SyndicationItemFormatter.cs
@@ -26,7 +26,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (itemToWrite == null)
             {
-                throw new ArgumentNullException("itemToWrite");
+                throw new ArgumentNullException(nameof(itemToWrite));
             }
             _item = itemToWrite;
         }
@@ -59,7 +59,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             _item = item;
         }

diff --git a/src/libraries/SyndicationLink.cs b/src/libraries/SyndicationLink.cs
index fbceb3e..fae4b97 100644 (file)
--- a/src/libraries/SyndicationLink.cs
+++ b/src/libraries/SyndicationLink.cs
@@ -30,7 +30,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (length < 0)
             {
-                throw new ArgumentOutOfRangeException("length");
+                throw new ArgumentOutOfRangeException(nameof(length));
             }
             _baseUri = null;
             _uri = uri;
@@ -49,7 +49,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _length = source._length;
             _mediaType = source._mediaType;
@@ -83,7 +83,7 @@ namespace Microsoft.ServiceModel.Syndication
             {
                 if (value < 0)
                 {
-                    throw new ArgumentOutOfRangeException("value");
+                    throw new ArgumentOutOfRangeException(nameof(value));
                 }
                 _length = value;
             }

diff --git a/src/libraries/SyndicationPerson.cs b/src/libraries/SyndicationPerson.cs
index 8502912..ee339c6 100644 (file)
--- a/src/libraries/SyndicationPerson.cs
+++ b/src/libraries/SyndicationPerson.cs
@@ -41,7 +41,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _email = source._email;
             _name = source._name;

diff --git a/src/libraries/TextSyndicationContent.cs b/src/libraries/TextSyndicationContent.cs
index e8201ea..0d7d568 100644 (file)
--- a/src/libraries/TextSyndicationContent.cs
+++ b/src/libraries/TextSyndicationContent.cs
@@ -23,7 +23,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (!TextSyndicationContentKindHelper.IsDefined(textKind))
             {
-                throw new ArgumentOutOfRangeException("textKind");
+                throw new ArgumentOutOfRangeException(nameof(textKind));
             }
             _text = text;
             _textKind = textKind;
@@ -34,7 +34,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _text = source._text;
             _textKind = source._textKind;

diff --git a/src/libraries/UrlSyndicationContent.cs b/src/libraries/UrlSyndicationContent.cs
index bee6810..d4893de 100644 (file)
--- a/src/libraries/UrlSyndicationContent.cs
+++ b/src/libraries/UrlSyndicationContent.cs
@@ -19,7 +19,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (url == null)
             {
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
             }
             _url = url;
             _mediaType = mediaType;
@@ -30,7 +30,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _url = source._url;
             _mediaType = source._mediaType;

diff --git a/src/libraries/XmlBuffer.cs b/src/libraries/XmlBuffer.cs
index f93407e..61718a8 100644 (file)
--- a/src/libraries/XmlBuffer.cs
+++ b/src/libraries/XmlBuffer.cs
@@ -68,7 +68,7 @@ namespace Microsoft.ServiceModel
         public XmlBuffer(int maxBufferSize)
         {
             if (maxBufferSize < 0)
-                throw new ArgumentOutOfRangeException("maxBufferSize", maxBufferSize, SR.ValueMustBeNonNegative);
+                throw new ArgumentOutOfRangeException(nameof(maxBufferSize), maxBufferSize, SR.ValueMustBeNonNegative);
 
 
             int initialBufferSize = Math.Min(512, maxBufferSize);

diff --git a/src/libraries/XmlReaderWrapper.cs b/src/libraries/XmlReaderWrapper.cs
index d314c12..fe6f15c 100644 (file)
--- a/src/libraries/XmlReaderWrapper.cs
+++ b/src/libraries/XmlReaderWrapper.cs
@@ -25,7 +25,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             this.reader = reader;
@@ -497,7 +497,7 @@ namespace Microsoft.ServiceModel.Syndication
 
             if (null == reader)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
 
             bool canReadChunk = reader.CanReadValueChunk;

diff --git a/src/libraries/XmlSyndicationContent.cs b/src/libraries/XmlSyndicationContent.cs
index 389c14f..011d682 100644 (file)
--- a/src/libraries/XmlSyndicationContent.cs
+++ b/src/libraries/XmlSyndicationContent.cs
@@ -23,7 +23,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (reader == null)
             {
-                throw new ArgumentNullException("reader");
+                throw new ArgumentNullException(nameof(reader));
             }
             SyndicationFeedFormatter.MoveToStartElement(reader);
             if (reader.HasAttributes)
@@ -70,7 +70,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (extension == null)
             {
-                throw new ArgumentNullException("extension");
+                throw new ArgumentNullException(nameof(extension));
             }
             _type = string.IsNullOrEmpty(type) ? Atom10Constants.XmlMediaType : type;
             _extension = extension;
@@ -81,7 +81,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw new ArgumentNullException(nameof(source));
             }
             _contentBuffer = source._contentBuffer;
             _extension = source._extension;
@@ -164,7 +164,7 @@ namespace Microsoft.ServiceModel.Syndication
         {
             if (writer == null)
             {
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
             }
             if (_extension != null)
             {

diff --git a/src/libraries/XmlWriterWrapper.cs b/src/libraries/XmlWriterWrapper.cs
index ca6a077..24af320 100644 (file)
--- a/src/libraries/XmlWriterWrapper.cs
+++ b/src/libraries/XmlWriterWrapper.cs
@@ -58,7 +58,7 @@ namespace Microsoft.ServiceModel.Syndication
         public XmlWriterWrapper(XmlWriter writer)
         {
             if (writer == null)
-                throw new ArgumentNullException("writer");
+                throw new ArgumentNullException(nameof(writer));
 
             this.writer = writer;