Merge branch 'rel/1.0.0' into dev

dotnet · Jan 20, 2017 · c034ab3 · c034ab3
2 parents eef645c + 45ef3eb
commit c034ab3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore/DbContextEditorServices.cs b/src/Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore/DbContextEditorServices.cs
@@ -260,8 +260,6 @@ private bool IsModelPropertyExists(ITypeSymbol dbContext, string modelTypeFullNa
             {
                 var namedType = pSymbol.Type as INamedTypeSymbol; //When can this go wrong?
                 if (namedType != null && namedType.IsGenericType && !namedType.IsUnboundGenericType &&
-                    namedType.ContainingAssembly.Name == "Microsoft.EntityFrameworkCore" &&
-                    namedType.ContainingNamespace.ToDisplayString() == "Microsoft.EntityFrameworkCore" &&
                     namedType.Name == "DbSet")
                 {
                     // Can we check for equality of typeSymbol itself?

diff --git a/src/Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore/EntityFrameworkServices.cs b/src/Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore/EntityFrameworkServices.cs
@@ -241,7 +241,9 @@ public async Task<ContextProcessingResult> GetModelMetadata(string dbContextFull
                     dbContextError = string.Format(MessageStrings.DbContextTypeNotFound, dbContextFullTypeName);
                 }
             }
-            dbContextType = reflectedTypesProvider.GetReflectedType(dbContextFullTypeName);
+            dbContextType = reflectedTypesProvider.GetReflectedType(
+                modelType: dbContextFullTypeName,
+                lookInDependencies: true);
 
             if (dbContextType == null)
             {