Merge branch 'lasekar/test2' of https://github.com/Priya91/corefx

Conflicts:
	src/System.Xml.XDocument/System.Xml.XDocument.csproj

src/System.Xml.XDocument/System.Xml.XDocument.csproj

@@ -72,8 +72,35 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
+    <Compile Include="System\Xml\Linq\BaseUriAnnotation.cs" />
+    <Compile Include="System\Xml\Linq\Extensions.cs" />
+    <Compile Include="System\Xml\Linq\LineInfoAnnotation.cs" />
+    <Compile Include="System\Xml\Linq\LineInfoEndElementAnnotation.cs" />
+    <Compile Include="System\Xml\Linq\XAttribute.cs" />
+    <Compile Include="System\Xml\Linq\XCData.cs" />
+    <Compile Include="System\Xml\Linq\XComment.cs" />
+    <Compile Include="System\Xml\Linq\XContainer.cs" />
+    <Compile Include="System\Xml\Linq\XDeclaration.cs" />
+    <Compile Include="System\Xml\Linq\XDocument.cs" />
+    <Compile Include="System\Xml\Linq\XDocumentType.cs" />
+    <Compile Include="System\Xml\Linq\XElement.cs" />
+    <Compile Include="System\Xml\Linq\XHashtable.cs" />
+    <Compile Include="System\Xml\Linq\XHelper.cs" />
     <Compile Include="System\Xml\Linq\XLinq.cs" />
     <Compile Include="System\Linq\Enumerable.cs" />
+    <Compile Include="System\Xml\Linq\XName.cs" />
+    <Compile Include="System\Xml\Linq\XNamespace.cs" />
+    <Compile Include="System\Xml\Linq\XNode.cs" />
+    <Compile Include="System\Xml\Linq\XNodeBuilder.cs" />
+    <Compile Include="System\Xml\Linq\XNodeDocumentOrderComparer.cs" />
+    <Compile Include="System\Xml\Linq\XNodeEqualityComparer.cs" />
+    <Compile Include="System\Xml\Linq\XNodeReader.cs" />
+    <Compile Include="System\Xml\Linq\XObject.cs" />
+    <Compile Include="System\Xml\Linq\XObjectChangeAnnotation.cs" />
+    <Compile Include="System\Xml\Linq\XObjectChangeEventArgs.cs" />
+    <Compile Include="System\Xml\Linq\XProcessingInstruction.cs" />
+    <Compile Include="System\Xml\Linq\XStreamingElement.cs" />
+    <Compile Include="System\Xml\Linq\XText.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

src/System.Xml.XDocument/System/Xml/Linq/BaseUriAnnotation.cs

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using CultureInfo = System.Globalization.CultureInfo;
+using Debug = System.Diagnostics.Debug;
+using IEnumerable = System.Collections.IEnumerable;
+using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessageAttribute;
+using Enumerable = System.Linq.Enumerable;
+using IComparer = System.Collections.IComparer;
+using IEqualityComparer = System.Collections.IEqualityComparer;
+using StringBuilder = System.Text.StringBuilder;
+using Encoding = System.Text.Encoding;
+using Interlocked = System.Threading.Interlocked;
+using System.Reflection;
+
+namespace System.Xml.Linq
+{
+    class BaseUriAnnotation
+    {
+        internal string baseUri;
+
+        public BaseUriAnnotation(string baseUri)
+        {
+            this.baseUri = baseUri;
+        }
+    }
+}

src/System.Xml.XDocument/System/Xml/Linq/LineInfoAnnotation.cs

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using CultureInfo = System.Globalization.CultureInfo;
+using Debug = System.Diagnostics.Debug;
+using IEnumerable = System.Collections.IEnumerable;
+using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessageAttribute;
+using Enumerable = System.Linq.Enumerable;
+using IComparer = System.Collections.IComparer;
+using IEqualityComparer = System.Collections.IEqualityComparer;
+using StringBuilder = System.Text.StringBuilder;
+using Encoding = System.Text.Encoding;
+using Interlocked = System.Threading.Interlocked;
+using System.Reflection;
+
+namespace System.Xml.Linq
+{
+    /// <summary>
+    /// Instance of this class is used as an annotation on any node
+    /// for which we want to store its line information.
+    /// Note: on XElement nodes this annotation stores the line info
+    ///   for the element start tag. The matching end tag line info
+    ///   if present is stored using the LineInfoEndElementAnnotation
+    ///   instance annotation.
+    /// </summary>
+    class LineInfoAnnotation
+    {
+        internal int lineNumber;
+        internal int linePosition;
+
+        public LineInfoAnnotation(int lineNumber, int linePosition)
+        {
+            this.lineNumber = lineNumber;
+            this.linePosition = linePosition;
+        }
+    }
+}

src/System.Xml.XDocument/System/Xml/Linq/LineInfoEndElementAnnotation.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using CultureInfo = System.Globalization.CultureInfo;
+using Debug = System.Diagnostics.Debug;
+using IEnumerable = System.Collections.IEnumerable;
+using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessageAttribute;
+using Enumerable = System.Linq.Enumerable;
+using IComparer = System.Collections.IComparer;
+using IEqualityComparer = System.Collections.IEqualityComparer;
+using StringBuilder = System.Text.StringBuilder;
+using Encoding = System.Text.Encoding;
+using Interlocked = System.Threading.Interlocked;
+using System.Reflection;
+
+namespace System.Xml.Linq
+{
+    /// <summary>
+    /// Instance of this class is used as an annotation on XElement nodes
+    /// if that element is not empty element and we want to store the line info
+    /// for its end element tag.
+    /// </summary>
+    class LineInfoEndElementAnnotation : LineInfoAnnotation
+    {
+        public LineInfoEndElementAnnotation(int lineNumber, int linePosition)
+            : base(lineNumber, linePosition)
+        { }
+    }
+}