Merge pull request #8390 from dotnet/merges/master-to-feature/and-bang

Merge master to feature/and-bang

Author: KevinRansom

eng/DumpPackageRoot/DumpPackageRoot.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!-- Used as a diagnostic tool to view the state of the NuGet package cache as it existed immediately after a restore/build. -->
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageRootFiles Include="$(NuGetPackageRoot)/**" />
+  </ItemGroup>
+
+  <Target Name="_DumpPackageRootDirectoryListing"
+          AfterTargets="Build">
+    <PropertyGroup>
+      <PackageRootArtifactDirectory>$(ArtifactsDir)NugetPackageRootContents</PackageRootArtifactDirectory>
+      <PackageRootContentsFile>$(PackageRootArtifactDirectory)/package_contents.txt</PackageRootContentsFile>
+    </PropertyGroup>
+    <MakeDir Directories="$(PackageRootArtifactDirectory)" Condition="!Exists('$(PackageRootArtifactDirectory)')" />
+    <WriteLinesToFile File="$(PackageRootContentsFile)" Lines="@(PackageRootFiles)" />
+  </Target>
+</Project>

fcs/build.fsx

@@ -64,8 +64,8 @@ Target.create "BuildVersion" (fun _ ->
 
 Target.create "Build" (fun _ ->
     runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto"
-    let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.1/fslex.dll"
-    let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.1/fsyacc.dll"
+    let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp3.0/fslex.dll"
+    let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp3.0/fsyacc.dll"
     runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
 )
 

src/fsharp/CompileOps.fs

@@ -2333,8 +2333,8 @@ type TcConfigBuilder =
             isInvalidationSupported = isInvalidationSupported
             copyFSharpCore = defaultCopyFSharpCore
             tryGetMetadataSnapshot = tryGetMetadataSnapshot
-            includePathAdded = includePathAdded
             useFsiAuxLib = isInteractive
+            includePathAdded = includePathAdded
         }
 
     member tcConfigB.ResolveSourceFile(m, nm, pathLoadedFrom) = 
@@ -5148,7 +5148,6 @@ module ScriptPreprocessClosure =
         let getWarningNumber = fun () (m, s) -> nowarns <- (s, m) :: nowarns
         let addReferencedAssemblyByPath = fun () (m, s) -> tcConfigB.AddReferencedAssemblyByPath(m, s)
         let addDependencyManagerText = fun () (packageManagerPrefix,m,s) -> tcConfigB.AddDependencyManagerText(packageManagerPrefix,m,s)
-
         let addLoadedSource = fun () (m, s) -> tcConfigB.AddLoadedSource(m, s, pathOfMetaCommandSource)
         try 
             ProcessMetaCommandsFromInput (getWarningNumber, addReferencedAssemblyByPath, addDependencyManagerText, addLoadedSource) (tcConfigB, inp, pathOfMetaCommandSource, ())
@@ -5234,7 +5233,9 @@ module ScriptPreprocessClosure =
 
                             let tcConfigResult, noWarns = ApplyMetaCommandsFromInputToTcConfigAndGatherNoWarn (tcConfig, parsedScriptAst, pathOfMetaCommandSource)
                             tcConfig <- tcConfigResult // We accumulate the tcConfig in order to collect assembly references
-                        
+
+                            yield! resolveDependencyManagerSources filename
+
                             let postSources = tcConfig.GetAvailableLoadedSources()
                             let sources = if preSources.Length < postSources.Length then postSources.[preSources.Length..] else []
 

src/fsharp/FSharp.Compiler.Private.Scripting/FSharpScript.fs

@@ -36,12 +36,6 @@ type FSharpScript(?additionalArgs: string[]) =
     [<CLIEvent>]
     member __.DependencyFailed = fsi.DependencyFailed
 
-    member __.ProvideInput = stdin.ProvideInput
-
-    member __.OutputProduced = outputProduced.Publish
-
-    member __.ErrorProduced = errorProduced.Publish
-
     member __.Fsi = fsi
 
     member __.Eval(code: string, ?cancellationToken: CancellationToken) =