diff --git a/build/Targets/GenerateInternalsVisibleTo.targets b/build/Targets/GenerateInternalsVisibleTo.targets
index d970105b002c27de243526a9af0c82743428260a..ac9eadbde56826dad875afce181e7280791664f5 100644
--- a/build/Targets/GenerateInternalsVisibleTo.targets
+++ b/build/Targets/GenerateInternalsVisibleTo.targets
@@ -17,6 +17,9 @@
false
+
+ false
+
false
@@ -33,7 +36,7 @@
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
Outputs="$(GeneratedInternalsVisibleToFile)"
DependsOnTargets="PrepareForBuild"
- Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToMoq)' != ''">
+ Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != ''">
diff --git a/src/Features/Core/Portable/Features.csproj b/src/Features/Core/Portable/Features.csproj
index 536986379ecf78d8b14ab13f4e8e1d5baad1a988..869d289c099adcc85fbf462f687d88a58ddf3ae4 100644
--- a/src/Features/Core/Portable/Features.csproj
+++ b/src/Features/Core/Portable/Features.csproj
@@ -69,6 +69,7 @@
+
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/AbstractProject.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/AbstractProject.cs
index 1d2321b801435f513996b450cf8b6d3580447bad..a66ddddc61c1e77a2302f6de7b7d3220364736c1 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/AbstractProject.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/AbstractProject.cs
@@ -352,6 +352,11 @@ public ImmutableArray GetCurrentProjectReferences()
{
return ImmutableArray.CreateRange(_projectReferences);
}
+
+ public ImmutableArray GetCurrentMetadataReferences()
+ {
+ return ImmutableArray.CreateRange(_metadataReferences);
+ }
public IVisualStudioHostDocument GetDocumentOrAdditionalDocument(DocumentId id)
{
diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
index 0a3377985bdeb0b4d7a7e2a590ad5beacfe75f1d..4541d33a8b83736c256a30c9010e6c152c56fca4 100644
--- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
+++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
@@ -234,6 +234,8 @@
+
+
diff --git a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
index 6ac92377072c315753e7efadca7ea7037c192aec..5bfce057fcc3c70817e8a71cb024e6ec0614be8d 100644
--- a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
+++ b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
@@ -67,6 +67,8 @@
+
+
diff --git a/src/Workspaces/Core/Portable/Diagnostics/Extensions.cs b/src/Workspaces/Core/Portable/Diagnostics/Extensions.cs
index 8b1ee538265ae70bcabb00eb14490710351d1919..70dee2bb2aab61e6782ef501d4bcc8193c48e99a 100644
--- a/src/Workspaces/Core/Portable/Diagnostics/Extensions.cs
+++ b/src/Workspaces/Core/Portable/Diagnostics/Extensions.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Globalization;
+using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeFixes;
@@ -57,6 +58,15 @@ public static DiagnosticData ToDiagnosticData(this Diagnostic diagnostic, Projec
return DiagnosticData.Create(project.GetDocument(diagnostic.Location.SourceTree), diagnostic);
}
+ if (diagnostic.Location.Kind == LocationKind.ExternalFile)
+ {
+ var document = project.Documents.FirstOrDefault(d => d.FilePath == diagnostic.Location.GetLineSpan().Path);
+ if (document != null)
+ {
+ return DiagnosticData.Create(document, diagnostic);
+ }
+ }
+
return DiagnosticData.Create(project, diagnostic);
}