Fix Implemented the suggested Odata.Bind EntitySet fix suggested on i…

…ssue simple-odata-client#511

.gitignore

@@ -40,3 +40,5 @@ nuget.exe
 /paket-files
 /.paket/paket.exe
 /.paket/Paket.Restore.targets
+/nuget.config
+/src/CRMTester

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100"
+    "version": "7.0.403"
   }
 }

src/Simple.OData.Client.V4.Adapter/Metadata.cs

@@ -112,7 +112,12 @@ public override string GetLinkedCollectionName(string instanceTypeName, string t
 			return singleton.Name;
 		}
 
-		if (TryGetEntityType(instanceTypeName, out var entityType))
+		if (TryGetEntityType(instanceTypeName, out var entityType) && TryGetEntitySetByType(entityType.FullTypeName(), out entitySet))
+		{
+			return entitySet.Name;
+		}
+
+		if (TryGetEntityType(instanceTypeName, out entityType))
 		{
 			return entityType.Name;
 		}
@@ -122,6 +127,11 @@ public override string GetLinkedCollectionName(string instanceTypeName, string t
 			return entitySet.Name;
 		}
 
+		if (TryGetEntityType(typeName, out entityType) && TryGetEntitySetByType(entityType.FullTypeName(), out entitySet))
+		{
+			return entitySet.Name;
+		}
+
 		if (TryGetSingleton(typeName, out singleton))
 		{
 			isSingleton = true;
@@ -337,6 +347,19 @@ private bool TryGetEntitySet(string entitySetName, out IEdmEntitySet entitySet)
 		return entitySet != null;
 	}
 
+	private bool TryGetEntitySetByType(string entityType, out IEdmEntitySet entitySet)
+	{
+		if (entityType.Contains("/"))
+			entityType = entityType.Split('/').First();
+
+		entitySet = _model.SchemaElements
+			.Where(x => x.SchemaElementKind == EdmSchemaElementKind.EntityContainer)
+			.SelectMany(x => (x as IEdmEntityContainer).EntitySets())
+			.BestMatch(x => x.Type.AsElementType().FullTypeName(), entityType, NameMatchResolver);
+
+		return entitySet != null;
+	}
+
 	private IEnumerable<IEdmSingleton> GetSingletons()
 	{
 		return _model.SchemaElements