Issue 534: Error creating multiple entity sets for an entity type in

Conventional mb.

Forgot to include the source entity set name in the error message in
earlier commit. Including it now.

Author: raghuramn

src/System.Web.Http.OData/OData/Builder/EntitySetConfiguration.cs

@@ -208,6 +208,7 @@ public NavigationPropertyBinding FindBinding(NavigationPropertyConfiguration nav
                     SRResources.CannotAutoCreateMultipleCandidates,
                     navigationConfiguration.Name,
                     navigationConfiguration.DeclaringEntityType.FullName,
+                    Name,
                     String.Join(", ", matchingSets.Select(entitySet => entitySet.Name)));
             }
         }

src/System.Web.Http.OData/Properties/SRResources.Designer.cs

@@ -226,7 +226,7 @@
     <value>The type '{0}' is not supported by the ODataErrorSerializer. The type must be ODataError or HttpError.</value>
   </data>
   <data name="CannotAutoCreateMultipleCandidates" xml:space="preserve">
-    <value>Cannot automatically bind the navigation property '{0}' on entity type '{1}' because there are two or more candidate entity sets. The matching entity sets are {2}.</value>
+    <value>Cannot automatically bind the navigation property '{0}' on entity type '{1}' for the source entity set '{2}' because there are two or more matching target entity sets. The matching entity sets are {3}.</value>
   </data>
   <data name="EntitySetHasNoBuildLinkAnnotation" xml:space="preserve">
     <value>The entity set '{0}' is missing link generation configuration. Check that the self and edit links are configured during model building.</value>

src/System.Web.Http.OData/Properties/SRResources.resx

@@ -232,14 +232,14 @@ public void CanConfigureLinks_For_NavigationPropertiesInDerivedType()
         public void CannotBindNavigationPropertyAutmatically_WhenMultipleEntitySetsOfPropertyType_Exist()
         {
             ODataModelBuilder builder = new ODataModelBuilder();
-            builder.EntitySet<Motorcycle>("motorcycles");
+            builder.EntitySet<Motorcycle>("motorcycles1").HasRequiredBinding(m => m.Manufacturer, "NorthWestMotorcycleManufacturers");
+            builder.EntitySet<Motorcycle>("motorcycles2");
             builder.EntitySet<MotorcycleManufacturer>("NorthWestMotorcycleManufacturers");
             builder.EntitySet<MotorcycleManufacturer>("SouthWestMotorcycleManufacturers");
-            builder.Entity<Motorcycle>().HasRequired(m => m.Manufacturer);
 
             Assert.Throws<NotSupportedException>(
             () => builder.GetEdmModel(),
-            "Cannot automatically bind the navigation property 'Manufacturer' on entity type 'System.Web.Http.OData.Builder.TestModels.Motorcycle' because there are two or more candidate entity sets. " +
+            "Cannot automatically bind the navigation property 'Manufacturer' on entity type 'System.Web.Http.OData.Builder.TestModels.Motorcycle' for the source entity set 'motorcycles2' because there are two or more matching target entity sets. " +
             "The matching entity sets are NorthWestMotorcycleManufacturers, SouthWestMotorcycleManufacturers.");
         }
     }