Commit7ef93f8

authored

Merge pull request #3878 from Microsoft/simplify

Enable C# project references from F#

2 parents619fa47 +e2151dd commit7ef93f8Copy full SHA for 7ef93f8

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@`
`67`	`67`	`<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>`
`68`	`68`	`</EmbeddedResource>`
`69`	`69`	`<CompileInclude="AssemblyInfo.fs" />`
	`70`	`+ <CompileInclude="LanguageServiceConstants.fs" />`
`70`	`71`	`<CompileInclude="Error.fs" />`
`71`	`72`	`<CompileInclude="Vs.fs" />`
`72`	`73`	`<CompileInclude="Colorize.fs" />`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.`
	`2`	`+`
	`3`	`+namespaceMicrosoft.VisualStudio.FSharp.LanguageService`
	`4`	`+`
	`5`	`+[<RequireQualifiedAccess>]`
	`6`	`+moduleinternalLanguageServiceConstants=`
	`7`	`+`
	`8`	`+/// "F#"`
	`9`	`+[<Literal>]`
	`10`	`+letFSharpLanguageName="F#"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ type internal ProjectSitesAndFiles() =`
`274`	`274`	`ifnot(isNull project)then`
`275`	`275`	`for referencein project.ProjectReferencesdo`
`276`	`276`	`letproject= workspace.CurrentSolution.GetProject(reference.ProjectId)`
`277`		`-ifnot(isNull project)then`
	`277`	`+ifnot(isNull project)&& project.Language= LanguageServiceConstants.FSharpLanguageNamethen`
`278`	`278`	`letsiteProvider= provideProjectSiteProvider(workspace, project, serviceProvider, projectOptionsTable)`
`279`	`279`	`letreferenceProject= workspace.ProjectTracker.GetProject(reference.ProjectId)`
`280`	`280`	`letoutputPath= referenceProject.BinOutputPath`

Comments

(0)