Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitcf6f7e2

Browse files
author
dotnet-automerge-bot
authored
Merge pull requestdotnet#5704 from Microsoft/merges/dev15.9-to-dev16.0
Merge dev15.9 to dev16.0
2 parentsb22293b +da0b600 commitcf6f7e2

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

‎vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ type internal ProjectSitesAndFiles() =
225225
letgetReferencesForSolutionService(solutionService:IVsSolution)=
226226
[|
227227
match referencedProjects projectSite, extraProjectInfowith
228-
|None, Some(:? VisualStudioWorkspaceImplas workspace)whennot(isNull workspace.CurrentSolution)->
228+
|_, Some(:? VisualStudioWorkspaceImplas workspace)whennot(isNull workspace.CurrentSolution)->
229229
letpath= projectSite.ProjectFileName
230230
ifnot(String.IsNullOrWhiteSpace(path))then
231231
match projectIdOptwith
@@ -241,13 +241,15 @@ type internal ProjectSitesAndFiles() =
241241
yield Some project.Id, project.FilePath, outputPath, siteProvider
242242
|_->()
243243

244-
|(Some references),_->
244+
|(Some references),Some(:? VisualStudioWorkspaceImplas workspace)->
245245
for pin referencesdo
246246
match solutionService.GetProjectOfUniqueName(p.UniqueName)with
247247
| VSConstants.S_OK,(:? IProvideProjectSiteas ps)->
248-
yield None, p.FileName,(fullOutputAssemblyPath p)|> Option.defaultValue"", ps
248+
letpath= ps.GetProjectSite().ProjectFileName
249+
letprojectId= workspace.ProjectTracker.GetOrCreateProjectIdForPath(path, projectDisplayNameOf path)
250+
yield Some projectId, p.FileName,(fullOutputAssemblyPath p)|> Option.defaultValue"", ps
249251
|_->()
250-
|None,_->()
252+
|_->()
251253
|]
252254
letsolutionService=try Some(serviceProvider.GetService(typeof<SVsSolution>):?> IVsSolution)with_-> None
253255
seq{match solutionServicewith

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp