remove the Document element from Edm lib

src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj

@@ -388,15 +388,9 @@
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Parsing\Ast\CsdlDecimalTypeReference.cs">
       <Link>Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlDecimalTypeReference.cs</Link>
     </Compile>
-    <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Parsing\Ast\CsdlDocumentation.cs">
-      <Link>Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlDocumentation.cs</Link>
-    </Compile>
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Parsing\Ast\CsdlElement.cs">
       <Link>Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlElement.cs</Link>
     </Compile>
-    <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Parsing\Ast\CsdlElementWithDocumentation.cs">
-      <Link>Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlElementWithDocumentation.cs</Link>
-    </Compile>
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Parsing\Ast\CsdlEntityContainer.cs">
       <Link>Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlEntityContainer.cs</Link>
     </Compile>
@@ -509,9 +503,6 @@
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Semantics\CsdlSemanticsDecimalTypeReference.cs">
       <Link>Microsoft\OData\Edm\Csdl\Semantics\CsdlSemanticsDecimalTypeReference.cs</Link>
     </Compile>
-    <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Semantics\CsdlSemanticsDocumentation.cs">
-      <Link>Microsoft\OData\Edm\Csdl\Semantics\CsdlSemanticsDocumentation.cs</Link>
-    </Compile>
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\Semantics\CsdlSemanticsEntityContainer.cs">
       <Link>Microsoft\OData\Edm\Csdl\Semantics\CsdlSemanticsEntityContainer.cs</Link>
     </Compile>
@@ -860,9 +851,6 @@
     <Compile Include="..\Schema\EdmDecimalTypeReference.cs">
       <Link>Microsoft\OData\Edm\Schema\EdmDecimalTypeReference.cs</Link>
     </Compile>
-    <Compile Include="..\Schema\EdmDocumentation.cs">
-      <Link>Microsoft\OData\Edm\Schema\EdmDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Schema\EdmElement.cs">
       <Link>Microsoft\OData\Edm\Schema\EdmElement.cs</Link>
     </Compile>
@@ -1061,9 +1049,6 @@
     <Compile Include="..\Schema\Interfaces\IEdmDecimalTypeReference.cs">
       <Link>Microsoft\OData\Edm\Schema\Interfaces\IEdmDecimalTypeReference.cs</Link>
     </Compile>
-    <Compile Include="..\Schema\Interfaces\IEdmDocumentation.cs">
-      <Link>Microsoft\OData\Edm\Schema\Interfaces\IEdmDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Schema\Interfaces\IEdmElement.cs">
       <Link>Microsoft\OData\Edm\Schema\Interfaces\IEdmElement.cs</Link>
     </Compile>

src/Microsoft.OData.Edm/Build.NetStandard/Microsoft.OData.Edm.NetStandard.csproj

@@ -121,15 +121,9 @@
     <Compile Include="..\Csdl\Parsing\Ast\CsdlDirectValueAnnotation.cs">
       <Link>Csdl\Parsing\Ast\CsdlDirectValueAnnotation.cs</Link>
     </Compile>
-    <Compile Include="..\Csdl\Parsing\Ast\CsdlDocumentation.cs">
-      <Link>Csdl\Parsing\Ast\CsdlDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Csdl\Parsing\Ast\CsdlElement.cs">
       <Link>Csdl\Parsing\Ast\CsdlElement.cs</Link>
     </Compile>
-    <Compile Include="..\Csdl\Parsing\Ast\CsdlElementWithDocumentation.cs">
-      <Link>Csdl\Parsing\Ast\CsdlElementWithDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Csdl\Parsing\Ast\CsdlEntityContainer.cs">
       <Link>Csdl\Parsing\Ast\CsdlEntityContainer.cs</Link>
     </Compile>
@@ -410,9 +404,6 @@
     <Compile Include="..\Csdl\Semantics\CsdlSemanticsDirectValueAnnotationsManager.cs">
       <Link>Csdl\Semantics\CsdlSemanticsDirectValueAnnotationsManager.cs</Link>
     </Compile>
-    <Compile Include="..\Csdl\Semantics\CsdlSemanticsDocumentation.cs">
-      <Link>Csdl\Semantics\CsdlSemanticsDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Csdl\Semantics\CsdlSemanticsDurationConstantExpression.cs">
       <Link>Csdl\Semantics\CsdlSemanticsDurationConstantExpression.cs</Link>
     </Compile>
@@ -783,9 +774,6 @@
     <Compile Include="..\Schema\EdmDecimalTypeReference.cs">
       <Link>Schema\EdmDecimalTypeReference.cs</Link>
     </Compile>
-    <Compile Include="..\Schema\EdmDocumentation.cs">
-      <Link>Schema\EdmDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Schema\EdmElement.cs">
       <Link>Schema\EdmElement.cs</Link>
     </Compile>
@@ -985,9 +973,6 @@
     <Compile Include="..\Schema\Interfaces\IEdmDecimalTypeReference.cs">
       <Link>Schema\Interfaces\IEdmDecimalTypeReference.cs</Link>
     </Compile>
-    <Compile Include="..\Schema\Interfaces\IEdmDocumentation.cs">
-      <Link>Schema\Interfaces\IEdmDocumentation.cs</Link>
-    </Compile>
     <Compile Include="..\Schema\Interfaces\IEdmElement.cs">
       <Link>Schema\Interfaces\IEdmElement.cs</Link>
     </Compile>

src/Microsoft.OData.Edm/Csdl/CsdlConstants.cs

@@ -115,7 +115,6 @@ public static class CsdlConstants
         internal const string Element_Date = "Date";
         internal const string Element_DateTimeOffset = "DateTimeOffset";
         internal const string Element_Decimal = "Decimal";
-        internal const string Element_Documentation = "Documentation";
         internal const string Element_EntityContainer = "EntityContainer";
         internal const string Element_EntitySet = "EntitySet";
         internal const string Element_EntitySetReference = "EntitySetReference";

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAbstractNavigationSource.cs

@@ -15,8 +15,8 @@ internal abstract class CsdlAbstractNavigationSource : CsdlNamedElement
     {
         private readonly List<CsdlNavigationPropertyBinding> navigationPropertyBindings;
 
-        public CsdlAbstractNavigationSource(string name, IEnumerable<CsdlNavigationPropertyBinding> navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, documentation, location)
+        public CsdlAbstractNavigationSource(string name, IEnumerable<CsdlNavigationPropertyBinding> navigationPropertyBindings, CsdlLocation location)
+            : base(name, location)
         {
             this.navigationPropertyBindings = new List<CsdlNavigationPropertyBinding>(navigationPropertyBindings);
         }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAction.cs

@@ -21,17 +21,15 @@ internal class CsdlAction : CsdlOperation
         /// <param name="returnType">The return type of the function.</param>
         /// <param name="isBound">if set to <c>true</c> [is bound].</param>
         /// <param name="entitySetPath">The entity set path.</param>
-        /// <param name="documentation">The documentation.</param>
         /// <param name="location">The location in the csdl document of the function.</param>
         public CsdlAction(
             string name,
             IEnumerable<CsdlOperationParameter> parameters,
             CsdlTypeReference returnType,
             bool isBound,
             string entitySetPath,
-            CsdlDocumentation documentation,
             CsdlLocation location)
-            : base(name, parameters, returnType, isBound, entitySetPath, documentation, location)
+            : base(name, parameters, returnType, isBound, entitySetPath, location)
         {
         }
     }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlActionImport.cs

@@ -15,9 +15,8 @@ public CsdlActionImport(
             string name,
             string schemaOperationQualifiedTypeName,
             string entitySet,
-            CsdlDocumentation documentation,
             CsdlLocation location)
-            : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, documentation, location)
+            : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, location)
         {
         }
     }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlComplexType.cs

@@ -13,8 +13,8 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast
     /// </summary>
     internal class CsdlComplexType : CsdlNamedStructuredType
     {
-        public CsdlComplexType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable<CsdlProperty> structuralProperties, IEnumerable<CsdlNavigationProperty> navigationProperties, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, baseTypeName, isAbstract, isOpen, structuralProperties, navigationProperties, documentation, location)
+        public CsdlComplexType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable<CsdlProperty> structuralProperties, IEnumerable<CsdlNavigationProperty> navigationProperties, CsdlLocation location)
+            : base(name, baseTypeName, isAbstract, isOpen, structuralProperties, navigationProperties, location)
         {
         }
     }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityContainer.cs

@@ -18,8 +18,8 @@ internal class CsdlEntityContainer : CsdlNamedElement
         private readonly List<CsdlSingleton> singletons;
         private readonly List<CsdlOperationImport> operationImports;
 
-        public CsdlEntityContainer(string name, string extends, IEnumerable<CsdlEntitySet> entitySets, IEnumerable<CsdlSingleton> singletons, IEnumerable<CsdlOperationImport> operationImports, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, documentation, location)
+        public CsdlEntityContainer(string name, string extends, IEnumerable<CsdlEntitySet> entitySets, IEnumerable<CsdlSingleton> singletons, IEnumerable<CsdlOperationImport> operationImports, CsdlLocation location)
+            : base(name, location)
         {
             this.extends = extends;
             this.entitySets = new List<CsdlEntitySet>(entitySets);

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntitySet.cs

@@ -15,13 +15,13 @@ internal class CsdlEntitySet : CsdlAbstractNavigationSource
     {
         private readonly string elementType;
 
-        public CsdlEntitySet(string name, string elementType, IEnumerable<CsdlNavigationPropertyBinding> navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location)
-            : this(name, elementType, navigationPropertyBindings, documentation, location, true)
+        public CsdlEntitySet(string name, string elementType, IEnumerable<CsdlNavigationPropertyBinding> navigationPropertyBindings, CsdlLocation location)
+            : this(name, elementType, navigationPropertyBindings, location, true)
         {
         }
 
-        public CsdlEntitySet(string name, string elementType, IEnumerable<CsdlNavigationPropertyBinding> navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location, bool includeInServiceDocument)
-            : base(name, navigationPropertyBindings, documentation, location)
+        public CsdlEntitySet(string name, string elementType, IEnumerable<CsdlNavigationPropertyBinding> navigationPropertyBindings, CsdlLocation location, bool includeInServiceDocument)
+            : base(name, navigationPropertyBindings, location)
         {
             this.elementType = elementType;
             this.IncludeInServiceDocument = includeInServiceDocument;

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityType.cs

@@ -16,8 +16,8 @@ internal class CsdlEntityType : CsdlNamedStructuredType
         private readonly CsdlKey key;
         private readonly bool hasStream;
 
-        public CsdlEntityType(string name, string baseTypeName, bool isAbstract, bool isOpen, bool hasStream, CsdlKey key, IEnumerable<CsdlProperty> structualProperties, IEnumerable<CsdlNavigationProperty> navigationProperties, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, baseTypeName, isAbstract, isOpen, structualProperties, navigationProperties, documentation, location)
+        public CsdlEntityType(string name, string baseTypeName, bool isAbstract, bool isOpen, bool hasStream, CsdlKey key, IEnumerable<CsdlProperty> structualProperties, IEnumerable<CsdlNavigationProperty> navigationProperties, CsdlLocation location)
+            : base(name, baseTypeName, isAbstract, isOpen, structualProperties, navigationProperties, location)
         {
             this.key = key;
             this.hasStream = hasStream;

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumMember.cs

@@ -11,8 +11,8 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast
     /// </summary>
     internal class CsdlEnumMember : CsdlNamedElement
     {
-        public CsdlEnumMember(string name, long? value, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, documentation, location)
+        public CsdlEnumMember(string name, long? value, CsdlLocation location)
+            : base(name, location)
         {
             this.Value = value;
         }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumType.cs

@@ -17,8 +17,8 @@ internal class CsdlEnumType : CsdlNamedElement
         private readonly bool isFlags;
         private readonly List<CsdlEnumMember> members;
 
-        public CsdlEnumType(string name, string underlyingTypeName, bool isFlags, IEnumerable<CsdlEnumMember> members, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, documentation, location)
+        public CsdlEnumType(string name, string underlyingTypeName, bool isFlags, IEnumerable<CsdlEnumMember> members, CsdlLocation location)
+            : base(name, location)
         {
             this.underlyingTypeName = underlyingTypeName;
             this.isFlags = isFlags;

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunction.cs

@@ -22,7 +22,6 @@ internal class CsdlFunction : CsdlOperation
         /// <param name="isBound">if set to <c>true</c> [is bound].</param>
         /// <param name="entitySetPath">The entity set path.</param>
         /// <param name="isComposable">if set to <c>true</c> [is composable].</param>
-        /// <param name="documentation">The documentation.</param>
         /// <param name="location">The location in the csdl document of the function.</param>
         public CsdlFunction(
             string name,
@@ -31,9 +30,8 @@ public CsdlFunction(
             bool isBound,
             string entitySetPath,
             bool isComposable,
-            CsdlDocumentation documentation,
             CsdlLocation location)
-            : base(name, parameters, returnType, isBound, entitySetPath, documentation, location)
+            : base(name, parameters, returnType, isBound, entitySetPath, location)
         {
             this.IsComposable = isComposable;
         }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionBase.cs

@@ -16,8 +16,8 @@ internal abstract class CsdlFunctionBase : CsdlNamedElement
         private readonly List<CsdlOperationParameter> parameters;
         private readonly CsdlTypeReference returnType;
 
-        protected CsdlFunctionBase(string name, IEnumerable<CsdlOperationParameter> parameters, CsdlTypeReference returnType, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, documentation, location)
+        protected CsdlFunctionBase(string name, IEnumerable<CsdlOperationParameter> parameters, CsdlTypeReference returnType, CsdlLocation location)
+            : base(name, location)
         {
             this.parameters = new List<CsdlOperationParameter>(parameters);
             this.returnType = returnType;

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionImport.cs

@@ -16,9 +16,8 @@ public CsdlFunctionImport(
             string schemaOperationQualifiedTypeName,
             string entitySet,
             bool includeInServiceDocument,
-            CsdlDocumentation documentation,
             CsdlLocation location)
-            : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, documentation, location)
+            : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, location)
         {
             this.IncludeInServiceDocument = includeInServiceDocument;
         }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedElement.cs

@@ -9,12 +9,12 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast
     /// <summary>
     /// Common base class for all named CSDL elements.
     /// </summary>
-    internal abstract class CsdlNamedElement : CsdlElementWithDocumentation
+    internal abstract class CsdlNamedElement : CsdlElement
     {
         private readonly string name;
 
-        protected CsdlNamedElement(string name, CsdlDocumentation documentation, CsdlLocation location)
-            : base(documentation, location)
+        protected CsdlNamedElement(string name, CsdlLocation location)
+            : base(location)
         {
             this.name = name;
         }

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedStructuredType.cs

@@ -18,8 +18,8 @@ internal abstract class CsdlNamedStructuredType : CsdlStructuredType
         protected bool isOpen;
         protected string name;
 
-        protected CsdlNamedStructuredType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable<CsdlProperty> structuralproperties, IEnumerable<CsdlNavigationProperty> navigationProperties, CsdlDocumentation documentation, CsdlLocation location)
-            : base(structuralproperties, navigationProperties, documentation, location)
+        protected CsdlNamedStructuredType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable<CsdlProperty> structuralproperties, IEnumerable<CsdlNavigationProperty> navigationProperties, CsdlLocation location)
+            : base(structuralproperties, navigationProperties, location)
         {
             this.isAbstract = isAbstract;
             this.isOpen = isOpen;

src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationProperty.cs

@@ -20,8 +20,8 @@ internal class CsdlNavigationProperty : CsdlNamedElement
         private readonly CsdlOnDelete onDelete;
         private readonly IEnumerable<CsdlReferentialConstraint> referentialConstraints;
 
-        public CsdlNavigationProperty(string name, string type, bool? nullable, string partner, bool containsTarget, CsdlOnDelete onDelete, IEnumerable<CsdlReferentialConstraint> referentialConstraints, CsdlDocumentation documentation, CsdlLocation location)
-            : base(name, documentation, location)
+        public CsdlNavigationProperty(string name, string type, bool? nullable, string partner, bool containsTarget, CsdlOnDelete onDelete, IEnumerable<CsdlReferentialConstraint> referentialConstraints, CsdlLocation location)
+            : base(name, location)
         {
             this.type = type;
             this.nullable = nullable;