Code generated from local file inherits from System.Data instead of Microsoft.Odata

[Joe-LaRue]

I am trying to generate code against an authenticated API on my local network, which requires a workaround per the readme:

Question: In Visual Studio 2017, upon configuring the service endpoint in the OData Connected Services extension and clicking "Finish", I get an error message that says "Cannot access".
Workaround: Most reported issues for this error are related to authentication-based endpoints. This extension does not currently support authentication. To work around, download the metadata as a text file from the endpoint and then point the OData Connected Services URI to the downloaded file.

when i generate the client code, the instance of DataServiceContext is coming from System.Data.Services.Client instead of Microsoft.OData.Client.DataServiceContext

When i use the TripPin sample, which doesnt require authentication and can be done directly from the URL, Microsoft.OData.Client.DataServiceContext is used.

I do see in the metadata file that i'm using a node that is identified as the DefaultEntityContainer - could that be related?

Is there something i can be doing differently?

Local File metadata class:

Url metadata class: