提交 619fa47b 编写于 作者: K Kevin Ransom

Revert "Make cross language project references work when references are built"

This reverts commit 87c4f5e0.
上级 04374727
......@@ -35,7 +35,7 @@ open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.ComponentModelHost
/// Exposes FSharpChecker as MEF export
// Exposes FSharpChecker as MEF export
[<Export(typeof<FSharpCheckerProvider>); Composition.Shared>]
type internal FSharpCheckerProvider
[<ImportingConstructor>]
......@@ -82,10 +82,10 @@ type internal FSharpCheckerProvider
/// Exposes FCS FSharpProjectOptions information management as MEF component.
///
/// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
/// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
/// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
//
// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
[<Export(typeof<FSharpProjectOptionsManager>); Composition.Shared>]
type internal FSharpProjectOptionsManager
[<ImportingConstructor>]
......
......@@ -67,7 +67,6 @@
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
</EmbeddedResource>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="LanguageServiceConstants.fs" />
<Compile Include="Error.fs" />
<Compile Include="Vs.fs" />
<Compile Include="Colorize.fs" />
......
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
namespace Microsoft.VisualStudio.FSharp.LanguageService
[<RequireQualifiedAccess>]
module internal LanguageServiceConstants =
/// "F#"
[<Literal>]
let FSharpLanguageName = "F#"
......@@ -34,20 +34,23 @@ module internal rec Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider
open System
open System.Collections.Concurrent
open System.Diagnostics
open System.ComponentModel.Composition
open System.IO
open Microsoft.CodeAnalysis
open System.Diagnostics
open Microsoft.VisualStudio
open Microsoft.VisualStudio.TextManager.Interop
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.FSharp.Compiler.SourceCodeServices
open Microsoft.VisualStudio
open Microsoft.VisualStudio.FSharp.LanguageService
open Microsoft.CodeAnalysis
open Microsoft.VisualStudio.LanguageServices
open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
open Microsoft.VisualStudio.LanguageServices.Implementation.TaskList
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.TextManager.Interop
open VSLangProj
open System.ComponentModel.Composition.Primitives
open Microsoft.VisualStudio.Shell
open System.Collections.Immutable
/// An additional interface that an IProjectSite object can implement to indicate it has an FSharpProjectOptions
/// already available, so we don't have to recreate it
......@@ -271,7 +274,7 @@ type internal ProjectSitesAndFiles() =
if not (isNull project) then
for reference in project.ProjectReferences do
let project = workspace.CurrentSolution.GetProject(reference.ProjectId)
if not (isNull project) && project.Language = LanguageServiceConstants.FSharpLanguageName then
if not (isNull project) then
let siteProvider = provideProjectSiteProvider (workspace, project, serviceProvider, projectOptionsTable)
let referenceProject = workspace.ProjectTracker.GetProject(reference.ProjectId)
let outputPath = referenceProject.BinOutputPath
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册