Rename EdmxTarget to CsdlTarget #632

src/Microsoft.OData.Core/ODataMetadataOutputContext.cs

@@ -103,7 +103,7 @@ internal override void WriteMetadataDocument()
             this.AssertSynchronous();
 
             IEnumerable<EdmError> errors;
-            if (!EdmxWriter.TryWriteEdmx(this.Model, this.xmlWriter, EdmxTarget.OData, out errors))
+            if (!EdmxWriter.TryWriteEdmx(this.Model, this.xmlWriter, CsdlTarget.OData, out errors))
             {
                 Debug.Assert(errors != null, "errors != null");
 

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

@@ -55,9 +55,6 @@
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\EdmxReaderSettings.cs">
       <Link>Microsoft\OData\Edm\Csdl\EdmxReaderSettings.cs</Link>
     </Compile>
-    <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\EdmxTarget.cs">
-      <Link>Microsoft\OData\Edm\Csdl\EdmxTarget.cs</Link>
-    </Compile>
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\EdmValueParser.cs">
       <Link>Microsoft\OData\Edm\Csdl\EdmValueParser.cs</Link>
     </Compile>
@@ -683,6 +680,9 @@
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\..\PlatformHelper.cs">
       <Link>Microsoft\OData\Edm\PlatformHelper.cs</Link>
     </Compile>
+    <Compile Include="..\Csdl\CsdlTarget.cs">
+      <Link>Microsoft\OData\Edm\Csdl\CsdlTarget.cs</Link>
+    </Compile>
     <Compile Include="..\Csdl\SchemaReader.cs">
       <Link>Microsoft\OData\Edm\Csdl\SchemaReader.cs</Link>
     </Compile>

src/Microsoft.OData.Edm/Csdl/EdmxTarget.cs → src/Microsoft.OData.Edm/Csdl/CsdlTarget.cs

@@ -1,15 +1,15 @@
 //---------------------------------------------------------------------
-// <copyright file="EdmxTarget.cs" company="Microsoft">
+// <copyright file="CsdlTarget.cs" company="Microsoft">
 //      Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 // </copyright>
 //---------------------------------------------------------------------
 
 namespace Microsoft.OData.Edm.Csdl
 {
     /// <summary>
-    /// Specifies what target of an EDMX file.
+    /// Specifies what target of a CSDL doc.
     /// </summary>
-    public enum EdmxTarget
+    public enum CsdlTarget
     {
         /// <summary>
         /// The target is Entity Framework.

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

@@ -24,9 +24,9 @@ public class EdmxWriter
         private readonly XmlWriter writer;
         private readonly Version edmxVersion;
         private readonly string edmxNamespace;
-        private readonly EdmxTarget target;
+        private readonly CsdlTarget target;
 
-        private EdmxWriter(IEdmModel model, IEnumerable<EdmSchema> schemas, XmlWriter writer, Version edmxVersion, EdmxTarget target)
+        private EdmxWriter(IEdmModel model, IEnumerable<EdmSchema> schemas, XmlWriter writer, Version edmxVersion, CsdlTarget target)
         {
             this.model = model;
             this.schemas = schemas;
@@ -46,7 +46,7 @@ private EdmxWriter(IEdmModel model, IEnumerable<EdmSchema> schemas, XmlWriter wr
         /// <param name="target">Target implementation of the EDMX being generated.</param>
         /// <param name="errors">Errors that prevented successful serialization, or no errors if serialization was successful. </param>
         /// <returns>A value indicating whether serialization was successful.</returns>
-        public static bool TryWriteEdmx(IEdmModel model, XmlWriter writer, EdmxTarget target, out IEnumerable<EdmError> errors)
+        public static bool TryWriteEdmx(IEdmModel model, XmlWriter writer, CsdlTarget target, out IEnumerable<EdmError> errors)
         {
             EdmUtil.CheckArgumentNull(model, "model");
             EdmUtil.CheckArgumentNull(writer, "writer");
@@ -86,14 +86,14 @@ private void WriteEdmx()
         {
             switch (this.target)
             {
-                case EdmxTarget.EntityFramework:
+                case CsdlTarget.EntityFramework:
                     this.WriteEFEdmx();
                     break;
-                case EdmxTarget.OData:
+                case CsdlTarget.OData:
                     this.WriteODataEdmx();
                     break;
                 default:
-                    throw new InvalidOperationException(Edm.Strings.UnknownEnumVal_EdmxTarget(this.target.ToString()));
+                    throw new InvalidOperationException(Edm.Strings.UnknownEnumVal_CsdlTarget(this.target.ToString()));
             }
         }
 

src/Microsoft.OData.Edm/Microsoft.OData.Edm.cs

@@ -301,7 +301,7 @@ internal sealed class EntityRes {
         internal const string UnknownEnumVal_TypeKind = "UnknownEnumVal_TypeKind";
         internal const string UnknownEnumVal_PrimitiveKind = "UnknownEnumVal_PrimitiveKind";
         internal const string UnknownEnumVal_ContainerElementKind = "UnknownEnumVal_ContainerElementKind";
-        internal const string UnknownEnumVal_EdmxTarget = "UnknownEnumVal_EdmxTarget";
+        internal const string UnknownEnumVal_CsdlTarget = "UnknownEnumVal_CsdlTarget";
         internal const string UnknownEnumVal_PropertyKind = "UnknownEnumVal_PropertyKind";
         internal const string UnknownEnumVal_ExpressionKind = "UnknownEnumVal_ExpressionKind";
         internal const string Bad_AmbiguousElementBinding = "Bad_AmbiguousElementBinding";

src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj

@@ -48,7 +48,7 @@
     <Compile Include="Csdl\CsdlLocation.cs" />
     <Compile Include="Csdl\EdmParseException.cs" />
     <Compile Include="Csdl\EdmxReaderSettings.cs" />
-    <Compile Include="Csdl\EdmxTarget.cs" />
+    <Compile Include="Csdl\CsdlTarget.cs" />
     <Compile Include="Csdl\EdmValueParser.cs" />
     <Compile Include="Csdl\EdmValueWriter.cs" />
     <Compile Include="Csdl\Parsing\Ast\CsdlNavigationPropertyPathExpression.cs" />

src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs

@@ -1752,10 +1752,10 @@ internal static class Strings {
         }
 
         /// <summary>
-        /// A string like "Invalid edmx target: '{0}'"
+        /// A string like "Invalid CSDL target: '{0}'"
         /// </summary>
-        internal static string UnknownEnumVal_EdmxTarget(object p0) {
-            return Microsoft.OData.Edm.EntityRes.GetString(Microsoft.OData.Edm.EntityRes.UnknownEnumVal_EdmxTarget, p0);
+        internal static string UnknownEnumVal_CsdlTarget(object p0) {
+            return Microsoft.OData.Edm.EntityRes.GetString(Microsoft.OData.Edm.EntityRes.UnknownEnumVal_CsdlTarget, p0);
         }
 
         /// <summary>

test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs

@@ -735,7 +735,7 @@ internal static IEdmModel GetEdmModel()
                 IEnumerable<EdmError> errors;
                 using (var writer = document.CreateWriter())
                 {
-                    EdmxWriter.TryWriteEdmx(model, writer, EdmxTarget.OData, out errors).Should().BeTrue();
+                    EdmxWriter.TryWriteEdmx(model, writer, CsdlTarget.OData, out errors).Should().BeTrue();
                 }
 
                 string doc = document.ToString();

test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmxWriterTests.cs

@@ -42,7 +42,7 @@ public void VerifyAnnotationComputedConcurrency()
             model.SetOptimisticConcurrencyAnnotation(set1, new IEdmStructuralProperty[] { entityId, timeVer });
             entityContainer.AddElement(set1);
 
-            string csdlStr = GetEdmx(model, EdmxTarget.OData);
+            string csdlStr = GetEdmx(model, CsdlTarget.OData);
             Assert.Equal(@"<?xml version=""1.0"" encoding=""utf-16""?><edmx:Edmx Version=""4.0"" xmlns:edmx=""http://docs.oasis-open.org/odata/ns/edmx""><edmx:DataServices><Schema Namespace=""NS1"" xmlns=""http://docs.oasis-open.org/odata/ns/edm""><EntityType Name=""Product""><Key><PropertyRef Name=""Id"" /></Key><Property Name=""Id"" Type=""Edm.Int32"" Nullable=""false""><Annotation Term=""Org.OData.Core.V1.Computed"" Bool=""true"" /></Property><Property Name=""Name"" Type=""Edm.String"" Nullable=""false"" /><Property Name=""UpdatedTime"" Type=""Edm.Date"" Nullable=""false""><Annotation Term=""Org.OData.Core.V1.Computed"" Bool=""true"" /></Property></EntityType><EntityContainer Name=""Container""><EntitySet Name=""Products"" EntityType=""NS1.Product""><Annotation Term=""Org.OData.Core.V1.OptimisticConcurrency""><Collection><PropertyPath>Id</PropertyPath><PropertyPath>UpdatedTime</PropertyPath></Collection></Annotation></EntitySet></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>", csdlStr);
         }
 
@@ -104,7 +104,7 @@ public void WriteNavigationPropertyInComplexType()
             entityContainer.AddElement(cities);
             entityContainer.AddElement(countries);
 
-            string actual = GetEdmx(model, EdmxTarget.OData);
+            string actual = GetEdmx(model, CsdlTarget.OData);
 
             string expected =
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?><edmx:Edmx Version=\"4.0\" xmlns:edmx=\"http://docs.oasis-open.org/odata/ns/edmx\">" +
@@ -185,7 +185,7 @@ public void WriteCollectionOfNavigationOnComplex()
             entityContainer.AddElement(entites);
             entityContainer.AddElement(navEntities);
 
-            string actual = GetEdmx(model, EdmxTarget.OData);
+            string actual = GetEdmx(model, CsdlTarget.OData);
 
             string expected = "<?xml version=\"1.0\" encoding=\"utf-16\"?><edmx:Edmx Version=\"4.0\" xmlns:edmx=\"http://docs.oasis-open.org/odata/ns/edmx\">" +
                               "<edmx:DataServices><Schema Namespace=\"DefaultNs\" xmlns=\"http://docs.oasis-open.org/odata/ns/edm\">" +
@@ -231,7 +231,7 @@ public static void SetComputedAnnotation(EdmModel model, IEdmProperty target)
 
         #endregion
 
-        private string GetEdmx(IEdmModel model, EdmxTarget target)
+        private string GetEdmx(IEdmModel model, CsdlTarget target)
         {
             string edmx = string.Empty;
 

test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs

@@ -406,7 +406,7 @@ public void VerifyRepresentativeModelWrittenOutCorrectly()
             using (var writer = XmlWriter.Create(builder))
             {
                 IEnumerable<EdmError> errors;
-                EdmxWriter.TryWriteEdmx(this.TestModel.RepresentativeModel, writer, EdmxTarget.OData, out errors).Should().BeTrue();
+                EdmxWriter.TryWriteEdmx(this.TestModel.RepresentativeModel, writer, CsdlTarget.OData, out errors).Should().BeTrue();
                 errors.Should().BeEmpty();
                 writer.Flush();
             }

test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs

@@ -190,7 +190,7 @@ public void WriterShouldContinueToWork()
             using (var writer = XmlWriter.Create(builder))
             {
                 IEnumerable<EdmError> errors;
-                EdmxWriter.TryWriteEdmx(this.representativeModel, writer, EdmxTarget.OData, out errors).Should().BeTrue();
+                EdmxWriter.TryWriteEdmx(this.representativeModel, writer, CsdlTarget.OData, out errors).Should().BeTrue();
                 errors.Should().BeEmpty();
                 writer.Flush();
             }

test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmVersionTests.cs

@@ -205,7 +205,7 @@ public void CheckEdmxVersionRoundtrip()
 
             using (XmlWriter xw = XmlWriter.Create(sw, settings))
             {
-                EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 xw.Close();
 
                 parsed = EdmxReader.TryParse(XmlReader.Create(new StringReader(sw.ToString())), out model, out errors);
@@ -255,7 +255,7 @@ public void CheckEdmxVersionChange()
             using (XmlWriter xw = XmlWriter.Create(sw, settings))
             {
                 model.SetEdmxVersion(CsdlConstants.EdmxVersionLatest);
-                EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 xw.Close();
 
                 parsed = EdmxReader.TryParse(XmlReader.Create(new StringReader(sw.ToString())), out model, out errors);
@@ -305,7 +305,7 @@ public void CheckEdmxVersionInference()
             using (XmlWriter xw = XmlWriter.Create(sw, settings))
             {
                 model.SetEdmxVersion(CsdlConstants.EdmxVersionLatest);
-                EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 xw.Close();
 
                 parsed = EdmxReader.TryParse(XmlReader.Create(new StringReader(sw.ToString())), out model, out errors);
@@ -389,7 +389,7 @@ public void CheckEdmxUnsupportedVersion()
                 model.SetEdmxVersion(new Version(1, 123));
                 try
                 {
-                    EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                    EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 }
                 catch (Exception e)
                 {

test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxRoundTripTests.cs

@@ -94,89 +94,89 @@ public void EdmxRoundTripTwoRuntimeEdmx()
         [TestMethod]
         public void EdmxRoundTripTestsEmptyConceptualModelsEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), EdmxTarget.EntityFramework);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), CsdlTarget.EntityFramework);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsEmptyConceptualModelsModel()
         {
             var model = new EdmModel();
             model.SetEdmxVersion(EdmConstants.EdmVersion4);
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleConceptualModelsEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleConceptualoMdelsModel()
         {
             var model = EdmxModelBuilder.SimpleEdmx();
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsEmptyDataServicesEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), EdmxTarget.OData);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), CsdlTarget.OData);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsEmptyDataServicesModel()
         {
             var model = new EdmModel();
             model.SetEdmxVersion(EdmConstants.EdmVersion4);
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), EdmxTarget.OData, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), CsdlTarget.OData, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsEmptyDataServicesWithOtherAttributesEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), EdmxTarget.OData, this.GetEdmxParserResult(EdmxModelBuilder.EmptyDataServicesWithOtherAttributesEdmx()));
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), CsdlTarget.OData, this.GetEdmxParserResult(EdmxModelBuilder.EmptyDataServicesWithOtherAttributesEdmx()));
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleDataServicesEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), EdmxTarget.OData);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), CsdlTarget.OData);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleDataServicesModel()
         {
             var model = EdmxModelBuilder.SimpleEdmx();
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), EdmxTarget.OData, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), CsdlTarget.OData, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleDataServicesWithVersionAttributesModelToConceptualModels()
         {
             var model = EdmxModelBuilder.SimpleEdmx();
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsConceptualModelsToDataServices()
         {
             var model = this.GetEdmxParserResult(EdmxModelBuilder.SimpleConceptualModelsEdmx());
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), EdmxTarget.OData, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), CsdlTarget.OData, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsDataServicesToConceptualModels()
         {
             var model = this.GetEdmxParserResult(EdmxModelBuilder.SimpleDataServicesEdmx());
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsUsingAliasEdmx()
         {
             var model = this.GetEdmxParserResult(EdmxModelBuilder.UsingAliasEdmx());
-            this.EdmxRoundTripCheck(EdmxModelBuilder.UsingAliasEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.UsingAliasEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         #region referenced model - Include, IncludeAnnotations
@@ -192,7 +192,7 @@ public void EdmxRoundTripTestsUsingAliasInReferencedEdmx()
             IEnumerable<EdmError> errors;
             bool valid = mainModel.Validate(out errors);
             Assert.IsTrue(valid);
-            string actualEdmx = GetEdmx(mainModel, EdmxTarget.OData);
+            string actualEdmx = GetEdmx(mainModel, CsdlTarget.OData);
 
             // after deserialization & serialization, the alias'ed 'CT.Customer' becomes qualified name 'NS1.Customer',
             // so make some adjustments for verification: 
@@ -233,7 +233,7 @@ public void EdmxRoundTripTests_EdmxReferences()
             newReferences.AddRange(references);
             newReferences.Add(newReference);
             mainModel.SetEdmReferences(newReferences);
-            string actualEdmx = GetEdmx(mainModel, EdmxTarget.OData);
+            string actualEdmx = GetEdmx(mainModel, CsdlTarget.OData);
 
             // add new Include to verify: Namespace=""adhoc_Namespace"" Alias=""adhoc_Alias""
             mainEdmx = mainEdmx.Replace("  <edmx:DataServices>",
@@ -252,14 +252,14 @@ public void EdmxRoundTripTests_EdmxReferences()
         }
         #endregion
 
-        private void EdmxRoundTripCheck(string edmx, EdmxTarget target)
+        private void EdmxRoundTripCheck(string edmx, CsdlTarget target)
         {
             IEdmModel model = this.GetEdmxParserResult(edmx);
 
             this.EdmxRoundTripCheck(edmx, target, model);
         }
 
-        private string GetEdmx(IEdmModel model, EdmxTarget target)
+        private string GetEdmx(IEdmModel model, CsdlTarget target)
         {
             string edmx = string.Empty;
 
@@ -292,7 +292,7 @@ private void EdmxCheckForErrors(string edmx, IEnumerable<ExpectedEdmError> expec
             ValidationVerificationHelper.Verify(expectedErrors, actualErrors);
         }
 
-        private void EdmxRoundTripCheck(string expectedEdmx, EdmxTarget target, IEdmModel model)
+        private void EdmxRoundTripCheck(string expectedEdmx, CsdlTarget target, IEdmModel model)
         {
             var errors = new EdmLibTestErrors();
             this.VerifySemanticValidation(model, Microsoft.Test.OData.Utils.Metadata.EdmVersion.V40, errors);