Commitfd6105d

authored

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

Merge master to dev15.8

2 parentsfbcac60 +4ebf270 commitfd6105dCopy full SHA for fd6105d

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -221,6 +221,9 @@ If you change error messages you may need to update FSComp.fs in `src\buildfroms
`221`	`221`
`222`	`222`	To do this, build the non-buildfromsource version of FSharp.Compiler.Private (src\fsharp\FSharp.Compiler.Private) then check its obj\ directory for`FSComp.fs` and manually copy that into the buildfromsource directory.
`223`	`223`
	`224`	`+.\build net40`
	`225`	`+copy /y src\fsharp\FSharp.Compiler.Private\obj\release\net40\FSComp.* src\buildfromsource\FSharp.Compiler.Private\`
	`226`	`+`
`224`	`227`
`225`	`228`	`####Configuring proxy server`
`226`	`229`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ type internal FSharpLanguageService(package : FSharpPackage) =`
`674`	`674`
`675`	`675`	`this.SetupProjectFile(siteProvider, this.Workspace,"SetupNewTextView")`
`676`	`676`
`677`		`-\| hwhennot(IsScript(filename))->`
	`677`	`+\| hwhennot(isNull h)&&not(IsScript(filename))->`
`678`	`678`
`679`	`679`	`letdocId= this.Workspace.CurrentSolution.GetDocumentIdsWithFilePath(filename).FirstOrDefault()`
`680`	`680`	`match docIdwith`

Comments

(0)