fix intellisense not working as intended

- fixes #1917 - fixes #1914
fsprojects · May 10, 2018 · 3446ae2 · 3446ae2
1 parent 33eda94
commit 3446ae2
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 166 deletions.
diff --git a/.fake/build.fsx/intellisense.fsx b/.fake/build.fsx/intellisense.fsx
@@ -1,114 +1,5 @@
 // This file is automatically generated by FAKE
 // This file is needed for IDE support only
 #if !FAKE
-#r "C:\\Users\\matth\\.nuget\\packages\\system.diagnostics.fileversioninfo\\4.3.0\\lib\\net46\\System.Diagnostics.FileVersionInfo.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\chessie\\0.6.0\\lib\\net40\\Chessie.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fparsec\\1.0.3\\lib\\net40-client\\FParsecCS.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\newtonsoft.json\\11.0.2\\lib\\net45\\Newtonsoft.Json.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.diagnostics.process\\4.3.0\\lib\\net461\\System.Diagnostics.Process.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\microsoft.win32.registry\\4.4.0\\lib\\net461\\Microsoft.Win32.Registry.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\octokit\\0.29.0\\lib\\net45\\Octokit.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.collections.immutable\\1.4.0\\lib\\netstandard2.0\\System.Collections.Immutable.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.net.http\\4.3.3\\lib\\net46\\System.Net.Http.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.2\\lib\\net461\\System.Security.Cryptography.X509Certificates.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.componentmodel.typeconverter\\4.3.0\\lib\\net462\\System.ComponentModel.TypeConverter.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.cng\\4.4.0\\lib\\net47\\System.Security.Cryptography.Cng.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\lib\\net46\\System.Security.Cryptography.Csp.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.openssl\\4.4.0\\lib\\netstandard2.0\\System.Security.Cryptography.OpenSsl.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.xml.xpath.xdocument\\4.3.0\\lib\\net46\\System.Xml.XPath.XDocument.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.xml.xpath.xmldocument\\4.3.0\\lib\\net46\\System.Xml.XPath.XmlDocument.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.collections.specialized\\4.3.0\\lib\\net46\\System.Collections.Specialized.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\lib\\net46\\System.IO.Compression.ZipFile.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.linq.expressions\\4.3.0\\lib\\net463\\System.Linq.Expressions.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.1\\lib\\net463\\System.Security.Cryptography.Algorithms.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\lib\\net46\\System.Xml.XmlDocument.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.xml.xpath\\4.3.0\\lib\\net46\\System.Xml.XPath.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\lib\\net46\\System.Globalization.Extensions.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.io.compression\\4.3.0\\lib\\net46\\System.IO.Compression.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.io.filesystem.watcher\\4.3.0\\lib\\net46\\System.IO.FileSystem.Watcher.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\lib\\net45\\System.Runtime.InteropServices.RuntimeInformation.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\lib\\net46\\System.Security.Cryptography.Encoding.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.xml.readerwriter\\4.3.1\\lib\\net46\\System.Xml.ReaderWriter.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.4.1\\lib\\net46\\System.Diagnostics.DiagnosticSource.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection.typeextensions\\4.4.0\\lib\\net461\\System.Reflection.TypeExtensions.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\lib\\net463\\System.Runtime.InteropServices.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.serialization.formatters\\4.3.0\\lib\\net46\\System.Runtime.Serialization.Formatters.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.console\\4.3.1\\lib\\net46\\System.Console.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.io.filesystem\\4.3.0\\lib\\net46\\System.IO.FileSystem.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.net.sockets\\4.3.0\\lib\\net46\\System.Net.Sockets.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection\\4.3.0\\lib\\net462\\System.Reflection.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\lib\\net46\\System.Security.Cryptography.Primitives.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.buffers\\4.4.0\\lib\\netstandard2.0\\System.Buffers.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.collections.nongeneric\\4.3.0\\lib\\net46\\System.Collections.NonGeneric.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.componentmodel.primitives\\4.3.0\\lib\\net45\\System.ComponentModel.Primitives.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\lib\\net46\\System.Globalization.Calendars.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.io\\4.3.0\\lib\\net462\\System.IO.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.linq\\4.3.0\\lib\\net463\\System.Linq.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\lib\\net463\\System.Text.RegularExpressions.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.threading.overlapped\\4.3.0\\lib\\net46\\System.Threading.Overlapped.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.threading.tasks.extensions\\4.4.0\\lib\\netstandard2.0\\System.Threading.Tasks.Extensions.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.threading.threadpool\\4.3.0\\lib\\net46\\System.Threading.ThreadPool.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\lib\\net46\\Microsoft.Win32.Primitives.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.appcontext\\4.3.0\\lib\\net463\\System.AppContext.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\lib\\net462\\System.Diagnostics.Tracing.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\lib\\net46\\System.IO.FileSystem.Primitives.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\lib\\net462\\System.Runtime.Extensions.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\lib\\net46\\System.Runtime.Serialization.Primitives.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.accesscontrol\\4.4.1\\lib\\net461\\System.Security.AccessControl.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.threading.thread\\4.3.0\\lib\\net46\\System.Threading.Thread.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime\\4.3.0\\lib\\net462\\System.Runtime.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.principal.windows\\4.4.1\\lib\\net461\\System.Security.Principal.Windows.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.4.0\\lib\\net461\\System.Security.Cryptography.ProtectedData.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-rc011\\lib\\net46\\Fake.Core.Xml.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-rc011\\lib\\net46\\Fake.Core.SemVer.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\paket.core\\5.157.0-alpha003\\lib\\net45\\Paket.Core.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-rc011\\lib\\net46\\Fake.Api.GitHub.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-rc011\\lib\\net46\\Fake.Core.Context.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-rc011\\lib\\net46\\Fake.Core.Environment.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-rc011\\lib\\net46\\Fake.Core.String.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fparsec\\1.0.3\\lib\\net40-client\\FParsec.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\suave\\2.4.0\\lib\\net461\\Suave.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection.metadata\\1.5.0\\lib\\netstandard2.0\\System.Reflection.Metadata.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Rocks.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Pdb.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Mdb.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-rc011\\lib\\net46\\Fake.Core.ReleaseNotes.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-rc011\\lib\\net46\\Fake.IO.FileSystem.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.commandlineparsing\\5.0.0-rc011\\lib\\net46\\Fake.Core.CommandLineParsing.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-rc011\\lib\\net46\\Fake.Core.Trace.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamfoundation\\5.0.0-rc011\\lib\\net46\\Fake.BuildServer.TeamFoundation.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.travis\\5.0.0-rc011\\lib\\net46\\Fake.BuildServer.Travis.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-rc011\\lib\\net46\\Fake.Core.Tasks.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-rc011\\lib\\net46\\Fake.Testing.Common.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-rc011\\lib\\net46\\Fake.Core.Process.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-rc011\\lib\\net46\\Fake.IO.Zip.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-rc011\\lib\\net46\\Fake.Core.Target.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.net.http\\5.0.0-rc011\\lib\\net46\\Fake.Net.Http.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.appveyor\\5.0.0-rc011\\lib\\net46\\Fake.BuildServer.AppVeyor.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamcity\\5.0.0-rc011\\lib\\net46\\Fake.BuildServer.TeamCity.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.NuGet.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.Cli.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.FSFormatting.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.MSBuild.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-rc011\\lib\\net46\\Fake.DotNet.Paket.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-rc011\\lib\\net46\\Fake.Tools.Git.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-rc011\\lib\\net46\\Fake.Windows.Chocolatey.dll" 
-#r "System" 
-#r "System.Core" 
-#r "System.Security" 
-#r "System.ComponentModel.Composition" 
-#r "System.Runtime.Serialization" 
-#r "System.Numerics" 
-#r "System.Xml" 
-#r "System.IO.Compression" 
-#r "System.Xml.Linq" 
-#r "System.IO.Compression.FileSystem" 
-#r "System.Net.Http" 
-#r "Microsoft.CSharp" 
-#r "System.Configuration" 
+#load "intellisense_lazy.fsx"
 #endif
diff --git a/build.fsx b/build.fsx
@@ -1257,7 +1257,7 @@ for runtime in "current" :: "portable" :: runtimes do
     =?> ("DotNetCoreIntegrationTests", not <| Environment.hasEnvironVar "SkipIntegrationTests" && not <| Environment.hasEnvironVar "SkipTests")
     ==> "FullDotNetCore"
 
-"_BuildSolution"
+"_DotNetPackage"
     =?> ("DotNetCoreIntegrationTests", not <| Environment.hasEnvironVar "SkipIntegrationTests" && not <| Environment.hasEnvironVar "SkipTests")
 
 "_DotNetPublish_current"

diff --git a/src/app/Fake.Runtime/FakeRuntime.fs b/src/app/Fake.Runtime/FakeRuntime.fs
@@ -210,7 +210,7 @@ let paketCachingProvider (script:string) (logLevel:Trace.VerboseLevel) cacheDir
     // Write loadDependencies file (basically only for editor support)
     async {
       try
-        let intellisenseLazyFile = Path.Combine (cacheDir, Runners.loadScriptName)
+        let intellisenseLazyFile = Path.Combine (cacheDir, Runners.loadScriptLazyName)
         let cache = context.Cache
         cache.StartSetupGroup(groupName) |> ignore
         do! cache.AwaitFinishSetup()

diff --git a/src/test/Fake.Core.IntegrationTests/AssemblyInfo.fs b/src/test/Fake.Core.IntegrationTests/AssemblyInfo.fs
diff --git a/src/test/Fake.Core.IntegrationTests/Fake.Core.IntegrationTests.fsproj b/src/test/Fake.Core.IntegrationTests/Fake.Core.IntegrationTests.fsproj
@@ -6,9 +6,9 @@
   <ItemGroup>
     <ProjectReference Include="..\..\app\Fake.Core.Process\Fake.Core.Process.fsproj" />
     <ProjectReference Include="..\..\app\Fake.IO.FileSystem\Fake.IO.FileSystem.fsproj" />
+    <ProjectReference Include="..\..\app\Fake.Runtime\Fake.Runtime.fsproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="TestHelpers.fs" />
     <Compile Include="SimpleHelloWorldTests.fs" />
     <Compile Include="Main.fs" />

diff --git a/src/test/Fake.Core.IntegrationTests/SimpleHelloWorldTests.fs b/src/test/Fake.Core.IntegrationTests/SimpleHelloWorldTests.fs
@@ -13,7 +13,7 @@ let fail s = Expect.isTrue s false
 let tests = 
   testList "Fake.Core.CommandLineParsing.Tests" [
     testCase "no dependencies hello world" <| fun _ ->
-        let result = fakeRun "hello_world.fsx" "core-no-dependencies-hello-world"
+        let result = fakeRunAndCheck "hello_world.fsx" "hello_world.fsx" "core-no-dependencies-hello-world"
         let stdOut = String.Join("\n", result.Messages)
         let stdErr = String.Join("\n", result.Errors)
 
@@ -22,7 +22,7 @@ let tests =
 
     testCase "simple failed to compile" <| fun _ ->
         try
-            fakeRun "fail-to-compile.fsx" "core-simple-failed-to-compile" |> ignore
+            fakeRunAndCheck "fail-to-compile.fsx" "fail-to-compile.fsx" "core-simple-failed-to-compile" |> ignore
             fail "Expected an compilation error and a nonzero exit code!"
         with 
         | FakeExecutionFailed(result) ->
@@ -31,40 +31,40 @@ let tests =
             stdErr.Contains("klajsdhgfasjkhd")
                 |> Expect.isTrue (sprintf "Standard Error Output should contain 'klajsdhgfasjkhd', but was: '%s', Out: '%s'" stdErr stdOut)
 
+            checkIntellisense "fail-to-compile.fsx" "core-simple-failed-to-compile"
+
     testCase "simple runtime error" <| fun _ ->
         try
-            fakeRun "runtime-error.fsx" "core-simple-runtime-error" |> ignore
+            fakeRunAndCheck "runtime-error.fsx" "runtime-error.fsx" "core-simple-runtime-error" |> ignore
             fail "Expected an runtime error and a nonzero exit code!"
         with
         | FakeExecutionFailed(result) ->
             let stdOut = String.Join("\n", result.Messages)
             let stdErr = String.Join("\n", result.Errors)
             stdErr.Contains("runtime error")
                 |> Expect.isTrue (sprintf "Standard Error Output should contain 'runtime error', but was: '%s', Out: '%s'" stdErr stdOut)
+            checkIntellisense "runtime-error.fsx" "core-simple-runtime-error"
 
     testCase "reference fake runtime" <| fun _ ->
         handleAndFormat <| fun () ->
-            fakeRun "reference_fake-runtime.fsx" "core-reference-fake-runtime" |> ignore
-
+            fakeRunAndCheck "reference_fake-runtime.fsx" "reference_fake-runtime.fsx" "core-reference-fake-runtime" |> ignore
 
     testCase "context exists" <| fun _ ->
         handleAndFormat <| fun () ->
-            fakeRun "context.exists.fsx" "core-context-exists" |> ignore
-
+            fakeRunAndCheck "context.exists.fsx" "context.exists.fsx" "core-context-exists" |> ignore
 
     testCase "use external paket.dependencies" <| fun _ ->
         handleAndFormat <| fun () ->
-            fakeRun "use_external_dependencies.fsx" "core-use-external-paket-dependencies" |> ignore
-
+            fakeRunAndCheck "use_external_dependencies.fsx" "use_external_dependencies.fsx" "core-use-external-paket-dependencies" |> ignore
 
     testCase "reference fake core targets" <| fun _ ->
         let result =
-            handleAndFormat <| fun () -> fakeRun "reference_fake-targets.fsx --test" "core-reference-fake-core-targets"
+            handleAndFormat <| fun () -> fakeRunAndCheck "reference_fake-targets.fsx" "reference_fake-targets.fsx --test" "core-reference-fake-core-targets"
         let stdOut = String.Join("\n", result.Messages).Trim()
         let stdErr = String.Join("\n", result.Errors)
 
         let expected = "Arguments: [\"--test\"]"
         stdOut.Contains expected
             |> Expect.isTrue (sprintf "stdout should contain '%s', but was: '%s'" expected stdOut)
-
+        stdErr.Trim() |> Expect.equal "empty exected" ""
   ]
diff --git a/src/test/Fake.Core.IntegrationTests/TestHelpers.fs b/src/test/Fake.Core.IntegrationTests/TestHelpers.fs
@@ -19,7 +19,6 @@ exception FakeExecutionFailed of ProcessResult
         let stdOut = String.Join(Environment.NewLine,result.Messages)
         sprintf "FAKE Process exited with %d:\n%s\nStdout: \n%s" result.ExitCode stdErr stdOut
 
-
 let fakeToolPath = 
     let rawWithoutExtension = Path.getFullName(__SOURCE_DIRECTORY__ + "../../../../nuget/dotnetcore/Fake.netcore/current/fake")
     if Environment.isUnix then rawWithoutExtension
@@ -64,7 +63,29 @@ let fake command scenario =
     prepare scenario
 
     directFake command scenario
+
 //let fakeFlags = "--verbose"
 let fakeFlags = "--silent"
 let fakeRun runArgs scenario =
     fake (sprintf "%s run %s" fakeFlags runArgs) scenario
+
+let checkIntellisense scriptName scenario =
+    let scenarioPath = scenarioTempPath scenario
+    let cachePath = scenarioPath </> ".fake" </> scriptName
+    File.Exists (cachePath </> "intellisense.fsx")
+        |> Expect.isTrue "Expect intellisense.fsx to exist"
+    File.Exists (cachePath </> "intellisense_lazy.fsx")
+        |> Expect.isTrue "Expect intellisense_lazy.fsx to exist"
+    let lines = File.ReadAllLines(cachePath </> "intellisense.fsx") |> Seq.toList
+    let expected =
+       [ "// This file is automatically generated by FAKE"
+         "// This file is needed for IDE support only"
+         "#if !FAKE"
+         sprintf "#load \"%s\"" Fake.Runtime.Runners.loadScriptLazyName
+         "#endif" ]
+    Expect.equal "intellisense.fsx should be forwarding" expected lines
+
+let fakeRunAndCheck scriptName runArgs scenario =
+    let result = fakeRun runArgs scenario
+    checkIntellisense scriptName scenario
+    result