Update nuget handling in fsi

Author: KevinRansom

.gitignore

@@ -127,3 +127,13 @@ nCrunchTemp_*
 tests/FSharp.Compiler.Service.Tests/FSharp.CompilerService.SurfaceArea.netstandard.actual
 *.vsp
 /tests/AheadOfTime/Trimming/output.txt
+*.svclog
+micro.exe
+positive.exe
+/tests/FSharp.Compiler.ComponentTests/FSharpChecker/StandardError.txt
+/tests/FSharp.Compiler.ComponentTests/FSharpChecker/StandardOutput.txt
+
+# ilverify baseline result files
+*.bsl.actual
+/src/FSharp.DependencyManager.Nuget/StandardError.txt
+/src/FSharp.DependencyManager.Nuget/StandardOutput.txt

eng/Versions.props

@@ -15,7 +15,7 @@
     <!-- F# Version components -->
     <FSMajorVersion>8</FSMajorVersion>
     <FSMinorVersion>0</FSMinorVersion>
-    <FSBuildVersion>102</FSBuildVersion>
+    <FSBuildVersion>103</FSBuildVersion>
     <FSRevisionVersion>0</FSRevisionVersion>
     <!-- -->
     <!-- F# Language version -->

src/Compiler/Driver/ScriptClosure.fs

@@ -45,6 +45,9 @@ type LoadClosure =
         /// The resolved pacakge references along with the ranges of the #r positions in each file.
         PackageReferences: (range * string list)[]
 
+        /// The raw package manager lines in the script
+        PackageManagerLines: Map<string, PackageManagerLine list>
+
         /// Whether we're decided to use .NET Framework analysis for this script
         UseDesktopFramework: bool
 
@@ -82,7 +85,8 @@ type CodeContext =
 module ScriptPreprocessClosure =
 
     /// Represents an input to the closure finding process
-    type ClosureSource = ClosureSource of fileName: string * referenceRange: range * sourceText: ISourceText * parseRequired: bool
+    type ClosureSource =
+        | ClosureSource of fileName: string * referenceRange: range * sourceText: ISourceText * Position option * parseRequired: bool
 
     /// Represents an output of the closure finding process
     type ClosureFile =
@@ -253,7 +257,7 @@ module ScriptPreprocessClosure =
                 | Some (n: int) -> new StreamReader(stream, Encoding.GetEncoding n)
 
             let source = reader.ReadToEnd()
-            [ ClosureSource(fileName, m, SourceText.ofString source, parseRequired) ]
+            [ ClosureSource(fileName, m, SourceText.ofString source, None, parseRequired) ]
         with exn ->
             errorRecovery exn m
             []
@@ -313,16 +317,25 @@ module ScriptPreprocessClosure =
         let packageReferences = Dictionary<range, string list>(HashIdentity.Structural)
 
         // Resolve the packages
-        let rec resolveDependencyManagerSources scriptName =
+        let rec resolveDependencyManagerSources scriptName (caret: Position option) =
+            let caretLine =
+                match caret with
+                | None -> Int32.MinValue
+                | Some pos -> pos.Line
+
+            let isEditorCursorInPackageLines (line: PackageManagerLine) =
+                caretLine >= line.Range.StartLine && caretLine <= line.Range.EndLine
+
             [
                 if not (loadScripts.Contains scriptName) then
                     for kv in tcConfig.packageManagerLines do
                         let packageManagerKey, packageManagerLines = kv.Key, kv.Value
 
-                        match packageManagerLines with
+                        match packageManagerLines |> List.filter (not << isEditorCursorInPackageLines) with
                         | [] -> ()
                         | packageManagerLine :: _ ->
                             let m = packageManagerLine.Range
+                            let packageManagerLines = packageManagerLines
                             yield! processPackageManagerLines m packageManagerLines scriptName packageManagerKey
             ]
 
@@ -426,7 +439,7 @@ module ScriptPreprocessClosure =
                         let scriptText = stream.ReadAllText()
                         loadScripts.Add script |> ignore
                         let iSourceText = SourceText.ofString scriptText
-                        yield! processClosureSource (ClosureSource(script, m, iSourceText, true))
+                        yield! processClosureSource (ClosureSource(script, m, iSourceText, None, true))
 
                 else
                     // Send outputs via diagnostics
@@ -443,7 +456,7 @@ module ScriptPreprocessClosure =
                     tcConfig <- TcConfig.Create(tcConfigB, validate = false)
             ]
 
-        and processClosureSource (ClosureSource (fileName, m, sourceText, parseRequired)) =
+        and processClosureSource (ClosureSource(fileName, m, sourceText, caret, parseRequired)) =
             [
                 if not (observedSources.HaveSeen(fileName)) then
                     observedSources.SetSeen(fileName)
@@ -473,7 +486,7 @@ module ScriptPreprocessClosure =
 
                         tcConfig <- tcConfigResult // We accumulate the tcConfig in order to collect assembly references
 
-                        yield! resolveDependencyManagerSources fileName
+                        yield! resolveDependencyManagerSources fileName caret
 
                         let postSources = tcConfig.GetAvailableLoadedSources()
 
@@ -483,7 +496,7 @@ module ScriptPreprocessClosure =
                             else
                                 []
 
-                        yield! resolveDependencyManagerSources fileName
+                        yield! resolveDependencyManagerSources fileName caret
 
                         for m, subFile in sources do
                             if IsScript subFile then
@@ -540,7 +553,7 @@ module ScriptPreprocessClosure =
         | _ -> lastClosureFile
 
     /// Reduce the full directive closure into LoadClosure
-    let GetLoadClosure (rootFilename, closureFiles, tcConfig: TcConfig, codeContext, packageReferences, earlierDiagnostics) =
+    let GetLoadClosure (rootFilename, closureFiles, tcConfig: TcConfig, codeContext, packageReferences, earlierDiagnostics) : LoadClosure =
 
         // Mark the last file as isLastCompiland.
         let closureFiles =
@@ -612,23 +625,21 @@ module ScriptPreprocessClosure =
         // Filter out non-root errors and warnings
         let allRootDiagnostics = allRootDiagnostics |> List.filter (fst >> isRootRange)
 
-        let result: LoadClosure =
-            {
-                SourceFiles = List.groupBy fst sourceFiles |> List.map (map2Of2 (List.map snd))
-                References = List.groupBy fst references |> List.map (map2Of2 (List.map snd))
-                PackageReferences = packageReferences
-                UseDesktopFramework = (tcConfig.primaryAssembly = PrimaryAssembly.Mscorlib)
-                SdkDirOverride = tcConfig.sdkDirOverride
-                UnresolvedReferences = unresolvedReferences
-                Inputs = sourceInputs
-                NoWarns = List.groupBy fst globalNoWarns |> List.map (map2Of2 (List.map snd))
-                OriginalLoadReferences = tcConfig.loadedSources
-                ResolutionDiagnostics = resolutionDiagnostics
-                AllRootFileDiagnostics = allRootDiagnostics
-                LoadClosureRootFileDiagnostics = loadClosureRootDiagnostics
-            }
-
-        result
+        {
+            SourceFiles = List.groupBy fst sourceFiles |> List.map (map2Of2 (List.map snd))
+            References = List.groupBy fst references |> List.map (map2Of2 (List.map snd))
+            PackageReferences = packageReferences
+            PackageManagerLines = tcConfig.packageManagerLines
+            UseDesktopFramework = (tcConfig.primaryAssembly = PrimaryAssembly.Mscorlib)
+            SdkDirOverride = tcConfig.sdkDirOverride
+            UnresolvedReferences = unresolvedReferences
+            Inputs = sourceInputs
+            NoWarns = List.groupBy fst globalNoWarns |> List.map (map2Of2 (List.map snd))
+            OriginalLoadReferences = tcConfig.loadedSources
+            ResolutionDiagnostics = resolutionDiagnostics
+            AllRootFileDiagnostics = allRootDiagnostics
+            LoadClosureRootFileDiagnostics = loadClosureRootDiagnostics
+        }
 
     /// Given source text, find the full load closure. Used from service.fs, when editing a script file
     let GetFullClosureOfScriptText
@@ -637,6 +648,7 @@ module ScriptPreprocessClosure =
             defaultFSharpBinariesDir,
             fileName,
             sourceText,
+            caret,
             codeContext,
             useSimpleResolution,
             useFsiAuxLib,
@@ -649,7 +661,6 @@ module ScriptPreprocessClosure =
             reduceMemoryUsage,
             dependencyProvider
         ) =
-
         // Resolve the basic references such as FSharp.Core.dll first, before processing any #I directives in the script
         //
         // This is tries to mimic the action of running the script in F# Interactive - the initial context for scripting is created
@@ -700,7 +711,7 @@ module ScriptPreprocessClosure =
                 reduceMemoryUsage
             )
 
-        let closureSources = [ ClosureSource(fileName, range0, sourceText, true) ]
+        let closureSources = [ ClosureSource(fileName, range0, sourceText, caret, true) ]
 
         let closureFiles, tcConfig, packageReferences =
             FindClosureFiles(fileName, closureSources, tcConfig, codeContext, lexResourceManager, dependencyProvider)
@@ -742,6 +753,7 @@ type LoadClosure with
             defaultFSharpBinariesDir,
             fileName: string,
             sourceText: ISourceText,
+            caret: Position option,
             implicitDefines,
             useSimpleResolution: bool,
             useFsiAuxLib,
@@ -762,6 +774,7 @@ type LoadClosure with
             defaultFSharpBinariesDir,
             fileName,
             sourceText,
+            caret,
             implicitDefines,
             useSimpleResolution,
             useFsiAuxLib,

src/Compiler/Driver/ScriptClosure.fsi

@@ -42,6 +42,9 @@ type LoadClosure =
         /// The resolved pacakge references along with the ranges of the #r positions in each file.
         PackageReferences: (range * string list)[]
 
+        /// The raw package manager lines in the script
+        PackageManagerLines: Map<string, PackageManagerLine list>
+
         /// Whether we're decided to use .NET Framework analysis for this script
         UseDesktopFramework: bool
 
@@ -80,6 +83,7 @@ type LoadClosure =
         defaultFSharpBinariesDir: string *
         fileName: string *
         sourceText: ISourceText *
+        caret: Position option *
         implicitDefines: CodeContext *
         useSimpleResolution: bool *
         useFsiAuxLib: bool *

src/Compiler/Service/FSharpCheckerResults.fs

@@ -3577,6 +3577,7 @@ type FsiInteractiveChecker(legacyReferenceResolver, tcConfig: TcConfig, tcGlobal
                     defaultFSharpBinariesDir,
                     fileName,
                     sourceText,
+                    None,
                     CodeContext.Editing,
                     tcConfig.useSimpleResolution,
                     tcConfig.useFsiAuxLib,

src/Compiler/Service/service.fs

@@ -1122,6 +1122,7 @@ type BackgroundCompiler
     member _.GetProjectOptionsFromScript
         (
             fileName,
+            caret,
             sourceText,
             previewEnabled,
             loadedTimeStamp,
@@ -1171,6 +1172,7 @@ type BackgroundCompiler
                     legacyReferenceResolver,
                     FSharpCheckerResultsSettings.defaultFSharpBinariesDir,
                     fileName,
+                    caret,
                     sourceText,
                     CodeContext.Editing,
                     useSimpleResolution,
@@ -1646,6 +1648,7 @@ type FSharpChecker
         (
             fileName,
             source,
+            ?caret,
             ?previewEnabled,
             ?loadedTimeStamp,
             ?otherFlags,
@@ -1661,6 +1664,7 @@ type FSharpChecker
         backgroundCompiler.GetProjectOptionsFromScript(
             fileName,
             source,
+            caret,
             previewEnabled,
             loadedTimeStamp,
             otherFlags,

src/Compiler/Service/service.fsi

@@ -208,6 +208,7 @@ type public FSharpChecker =
     ///
     /// <param name="fileName">Used to differentiate between scripts, to consider each script a separate project. Also used in formatted error messages.</param>
     /// <param name="source">The source for the file.</param>
+    /// <param name="caret">The editor location for the cursor if available.</param>
     /// <param name="previewEnabled">Is the preview compiler enabled.</param>
     /// <param name="loadedTimeStamp">Indicates when the script was loaded into the editing environment,
     /// so that an 'unload' and 'reload' action will cause the script to be considered as a new project,
@@ -222,6 +223,7 @@ type public FSharpChecker =
     member GetProjectOptionsFromScript:
         fileName: string *
         source: ISourceText *
+        ?caret: Position *
         ?previewEnabled: bool *
         ?loadedTimeStamp: DateTime *
         ?otherFlags: string[] *

src/FSharp.DependencyManager.Nuget/FSDependencyManager.txt

@@ -9,4 +9,5 @@ highestVersion,"with the highest version"
 sourceDirectoryDoesntExist,"The source directory '%s' not found"
 timedoutResolvingPackages,"Timed out resolving packages, process: '%s' '%s'"
 invalidTimeoutValue,"Invalid value for timeout '%s', valid values: none, -1 and integer milliseconds to wait"
-missingTimeoutValue,"Missing value for timeout"
+missingTimeoutValue,"Missing value for timeout"
+invalidBooleanValue,"Invalid value for boolean '%s', valid values: true or false"

src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.ProjectFile.fs

@@ -11,6 +11,7 @@ type PackageReference =
         Version: string
         RestoreSources: string
         Script: string
+        UsePackageTargets: bool
     }
 
 module internal ProjectFile =

src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs

@@ -55,16 +55,30 @@ module FSharpDependencyManager =
                 Version = ver
                 RestoreSources = src
                 Script = script
+                UsePackageTargets = usePackageTargets
             } =
             p
 
+        let usePackageTargets =
+            match usePackageTargets with
+            | false -> "ExcludeAssets='build;buildTransitive;buildMultitargeting'"
+            | true -> ""
+
         seq {
             match not (String.IsNullOrEmpty(inc)), not (String.IsNullOrEmpty(ver)), not (String.IsNullOrEmpty(script)) with
-            | true, true, false -> yield sprintf @"  <ItemGroup><PackageReference Include='%s' Version='%s' /></ItemGroup>" inc ver
+            | true, true, false ->
+                yield sprintf @"  <ItemGroup><PackageReference Include='%s' Version='%s' %s /></ItemGroup>" inc ver usePackageTargets
             | true, true, true ->
-                yield sprintf @"  <ItemGroup><PackageReference Include='%s' Version='%s' Script='%s' /></ItemGroup>" inc ver script
-            | true, false, false -> yield sprintf @"  <ItemGroup><PackageReference Include='%s' /></ItemGroup>" inc
-            | true, false, true -> yield sprintf @"  <ItemGroup><PackageReference Include='%s' Script='%s' /></ItemGroup>" inc script
+                yield
+                    sprintf
+                        @"  <ItemGroup><PackageReference Include='%s' Version='%s' Script='%s' %s /></ItemGroup>"
+                        inc
+                        ver
+                        script
+                        usePackageTargets
+            | true, false, false -> yield sprintf @"  <ItemGroup><PackageReference Include='%s' %s /></ItemGroup>" inc usePackageTargets
+            | true, false, true ->
+                yield sprintf @"  <ItemGroup><PackageReference Include='%s' Script='%s' %s /></ItemGroup>" inc script usePackageTargets
             | _ -> ()
 
             match not (String.IsNullOrEmpty(src)) with
@@ -96,6 +110,7 @@ module FSharpDependencyManager =
                         Version = "*"
                         RestoreSources = ""
                         Script = ""
+                        UsePackageTargets = false
                     }
 
             match options with
@@ -114,11 +129,20 @@ module FSharpDependencyManager =
 
                 let setVersion v = Some { current with Version = v }
 
+                let setUsePackageTargets v =
+                    Some { current with UsePackageTargets = v }
+
                 match opt with
                 | Some "include", Some v -> addInclude v |> parsePackageReferenceOption' rest implicitArgumentCount
                 | Some "include", None -> raise (ArgumentException(SR.requiresAValue ("Include")))
                 | Some "version", Some v -> setVersion v |> parsePackageReferenceOption' rest implicitArgumentCount
                 | Some "version", None -> setVersion "*" |> parsePackageReferenceOption' rest implicitArgumentCount
+                | Some "usepackagetargets", v ->
+                    match v with
+                    | Some v when v.ToLowerInvariant() = "true" -> setUsePackageTargets true
+                    | Some v when v.ToLowerInvariant() = "false" -> setUsePackageTargets false
+                    | _ -> raise (ArgumentException(SR.invalidBooleanValue ("usepackagetargets")))
+                    |> parsePackageReferenceOption' rest implicitArgumentCount
                 | Some "restoresources", Some v ->
                     Some
                         { current with
@@ -212,12 +236,12 @@ module FSharpDependencyManager =
         let referencesHaveWildCardVersion =
             // Verify to see if the developer specified a wildcard version.  If they did then caching is not possible
             let hasWildCardVersion p =
-                // Todo: named record please
                 let {
                         Include = package
                         Version = ver
                         RestoreSources = _
                         Script = _
+                        UsePackageTargets = _
                     } =
                     p