Commit49b20b0

committed

Fixesdotnet#235 --- When running FSI from VSIX, it does not respect UseAnyCpu setting

The developer path codeath ignored the UseAnyCpu setting, always selected fsi.exe

1 parent35e6a00 commit49b20b0Copy full SHA for 49b20b0

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,17 +152,18 @@ let catchAll (ie: IEvent<_,_>) : IEvent<_> =`
`152`	`152`	`ie.Add(fun x->try w(x)with err-> ignore(System.Windows.Forms.MessageBox.Show(err.ToString()));());`
`153`	`153`	`e`
`154`	`154`
	`155`	`+letfsiExeName()=if SessionsProperties.useAnyCpuVersionthen"fsianycpu.exe"else"fsi.exe"`
`155`	`156`	`letdetermineFsiRelativePath()=`
`156`	`157`	`letthisAssembly:System.Reflection.Assembly= typeof<Microsoft.FSharp.Compiler.Server.Shared.FSharpInteractiveServer>.Assembly`
`157`	`158`	`letthisAssemblyDirectory= thisAssembly.Location\|> Path.GetDirectoryName`
`158`	`159`	`// Use the quick-development path if available`
`159`		`- Path.Combine(thisAssemblyDirectory,"fsi.exe")`
	`160`	`+ Path.Combine(thisAssemblyDirectory,fsiExeName())`
`160`	`161`
`161`	`162`	`letdetermineFsiPath()=`
`162`	`163`	`// Use the quick-development path if available`
`163`	`164`	`letfsiRelativePath= determineFsiRelativePath()`
`164`	`165`	`letfsbin=match Internal.Utilities.FSharpEnvironment.BinFolderOfDefaultFSharpCompilerwith\| Some(s)-> s\| None->""`
`165`		`-letfsiRegistryPath= Path.Combine(fsbin,if SessionsProperties.useAnyCpuVersionthen"fsianycpu.exe"else"fsi.exe")`
	`166`	`+letfsiRegistryPath= Path.Combine(fsbin,fsiExeName())`
`166`	`167`	`// Choose relative path, if it exists (for developers), otherwise, the installed path.`
`167`	`168`	`if File.Exists(fsiRelativePath)then`
`168`	`169`	`fsiRelativePath`

Comments

(0)