Commit091f440

authored

Merge pull requestdotnet#4942 from Microsoft/merges/master-to-dev15.8

Merge master to dev15.8

2 parents2abca84 +17b5f8d commit091f440Copy full SHA for 091f440

File tree

-3

lines changed

src/fsharp/service
- service.fsi
- service.fs
vsintegration/src/FSharp.Editor
- Common
  - Extensions.fs
- LanguageService
  - ProjectSitesAndFiles.fs

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1780,7 +1780,7 @@ type FSharpProjectOptions =`
`1780`	`1780`	`static memberUseSameProject(options1,options2)=`
`1781`	`1781`	`match options1.ProjectId, options2.ProjectIdwith`
`1782`	`1782`	`\| Some(projectId1), Some(projectId2)whennot(String.IsNullOrWhiteSpace(projectId1))&&not(String.IsNullOrWhiteSpace(projectId2))->`
`1783`		`-String.Equals(projectId1, projectId2, StringComparison.OrdinalIgnoreCase)`
	`1783`	`+ projectId1= projectId2`
`1784`	`1784`	`\| Some(_), Some(_)`
`1785`	`1785`	`\| None, None-> options1.ProjectFileName= options2.ProjectFileName`
`1786`	`1786`	`\|_->false`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ type public FSharpProjectOptions =`
`312`	`312`	`// Note that this may not reduce to just the project directory, because there may be two projects in the same directory.`
`313`	`313`	`ProjectFileName:string`
`314`	`314`
`315`		`-/// This is the unique identifier for the project,uses StringComparison.OrdinalIgnoreCase. If it's None, will key off of ProjectFileName in our caching.`
	`315`	`+/// This is the unique identifier for the project,it is case sensitive. If it's None, will key off of ProjectFileName in our caching.`
`316`	`316`	`ProjectId:string option`
`317`	`317`
`318`	`318`	`/// The files in the project`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ type System.IServiceProvider with`
`24`	`24`	`memberx.GetService<'T>()= x.GetService(typeof<'T>):?> 'T`
`25`	`25`	`memberx.GetService<'S,'T>()= x.GetService(typeof<'S>):?> 'T`
`26`	`26`
	`27`	`+typeProjectIdwith`
	`28`	`+memberthis.ToFSharpProjectIdString()=`
	`29`	`+ this.Id.ToString("D").ToLowerInvariant()`
	`30`	`+`
`27`	`31`	`typeFSharpNavigationDeclarationItemwith`
`28`	`32`	`memberx.RoslynGlyph:Glyph=`
`29`	`33`	`match x.Glyphwith`

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`	`letoption=`
`275`	`275`	`letnewOption()={`
`276`	`276`	`ProjectFileName= projectSite.ProjectFileName`
`277`		`- ProjectId= projectId\|> Option.map(fun x-> x.Id.ToString())`
	`277`	`+ ProjectId= projectId\|> Option.map(fun x-> x.ToFSharpProjectIdString())`
`278`	`278`	`SourceFiles= projectSite.CompilationSourceFiles`
`279`	`279`	`OtherOptions= projectSite.CompilationOptions`
`280`	`280`	`ReferencedProjects= referencedProjectOptions`

Comments

(0)