Even more refactoring of DependencyManagerIntegration (#8518)

* add references

* Add references, also support legacy Package Manager APIs, Change scope of PM APIs

* Return values from reflection

* return values

* Rename FSharp.DependencyManager.Nuget

* sigfile

Author: KevinRansom

fcs/RELEASE_NOTES.md

@@ -1,3 +1,13 @@
+#### 34.0.3-beta
+
+From dotnet/fsharp:3af8959b6..134962b04:
+
+* set default script TFM to netcoreapp3.1 if none found
+* improve C#-nullable and optional interop (RFC FS-1075)
+* Add type name to `undefined name error` if known
+* improve printing via %A/fsi
+* misc. improvments to DependencyManager
+
 #### 34.0.1
 
 Contains commits from 32b124966 to d7018737c from dotnet/fsharp. Notable changes include:

src/fsharp/CompileOps.fs

@@ -5153,7 +5153,7 @@ module ScriptPreprocessClosure =
             let tcConfigB = tcConfig.CloneOfOriginalBuilder 
             TcConfig.Create(tcConfigB, validate=false), nowarns
 
-    let FindClosureFiles(_mainFile, _m, closureSources, origTcConfig:TcConfig, codeContext, lexResourceManager: Lexhelp.LexResourceManager) =
+    let FindClosureFiles(mainFile, _m, closureSources, origTcConfig:TcConfig, codeContext, lexResourceManager: Lexhelp.LexResourceManager) =
         let mutable tcConfig = origTcConfig
 
         let observedSources = Observed()
@@ -5177,9 +5177,9 @@ module ScriptPreprocessClosure =
                                 let inline snd3 (_, b, _) = b
                                 let packageManagerTextLines = packageManagerLines |> List.map snd3
 
-                                match DependencyManagerIntegration.resolve packageManager ".fsx" m packageManagerTextLines with
+                                match DependencyManagerIntegration.resolve packageManager tcConfig.implicitIncludeDir mainFile scriptName ".fsx" m packageManagerTextLines with
                                 | None -> () // error already reported
-                                | Some (succeeded, generatedScripts, additionalIncludeFolders) ->  //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                                | Some (succeeded, generatedScripts, additionalIncludeFolders) ->
                                     // This may incrementally update tcConfig too with new #r references
                                     // New package text is ignored on this second phase
                                     match succeeded with

src/fsharp/DependencyManager.Integration.fs

@@ -8,6 +8,7 @@ open System.IO
 open System.Reflection
 open FSharp.Compiler.DotNetFrameworkDependencies
 open FSharp.Compiler.ErrorLogger
+open FSharp.Reflection
 open Internal.Utilities.FSharpEnvironment
 
 // Contract strings
@@ -62,9 +63,9 @@ module ReflectionHelper =
 type internal IDependencyManagerProvider =
     abstract Name: string
     abstract Key: string
-    abstract ResolveDependencies: scriptExt: string * packageManagerTextLines: string seq * tfm: string -> bool * string list * string list
+    abstract ResolveDependencies: scriptDir: string * mainScriptName: string * scriptName: string * scriptExt: string * packageManagerTextLines: string seq * tfm: string -> bool * string list * string list
     abstract DependencyAdding: IEvent<string * string>
-    abstract DependencyAdded: IEvent<string * string * string list * string list>
+    abstract DependencyAdded: IEvent<string * string * string list * string list * string list>
     abstract DependencyFailed: IEvent<string * string>
 
 [<RequireQualifiedAccess>]
@@ -73,7 +74,7 @@ type ReferenceType =
 | Library of string
 | UnknownType
 
-type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyInfo, keyProperty: PropertyInfo, resolveDeps: MethodInfo, outputDir: string option) =
+type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyInfo, keyProperty: PropertyInfo, resolveDeps: MethodInfo option, resolveDepsEx: MethodInfo option,outputDir: string option) =
     let instance = Activator.CreateInstance(theType, [|outputDir :> obj|])
     let nameProperty     = nameProperty.GetValue >> string
     let keyProperty      = keyProperty.GetValue >> string
@@ -84,35 +85,66 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn
 
     static member InstanceMaker (theType: System.Type, outputDir: string option) =
         match ReflectionHelper.getAttributeNamed theType dependencyManagerAttributeName,
-                ReflectionHelper.getInstanceProperty<string> theType namePropertyName,
-                ReflectionHelper.getInstanceProperty<string> theType keyPropertyName,
-                ReflectionHelper.getInstanceMethod<bool * string list * string list> theType [| typeof<string>; typeof<string seq>; typeof<string> |] resolveDependenciesMethodName
-                with
-        | None, _, _, _ -> None
-        | _, None, _, _ -> None
-        | _, _, None, _ -> None
-        | _, _, _, None -> None
-        | Some _, Some nameProperty, Some keyProperty, Some resolveDependenciesMethod ->
-            Some (fun () -> new ReflectionDependencyManagerProvider(theType, nameProperty, keyProperty, resolveDependenciesMethod, outputDir) :> IDependencyManagerProvider)
+              ReflectionHelper.getInstanceProperty<string> theType namePropertyName,
+              ReflectionHelper.getInstanceProperty<string> theType keyPropertyName
+              with
+        | None, _, _
+        | _, None, _
+        | _, _, None -> None
+        | Some _, Some nameProperty, Some keyProperty ->
+            let resolveMethod = ReflectionHelper.getInstanceMethod<bool * string list * string list> theType [| typeof<string>; typeof<string>; typeof<string>; typeof<string seq>; typeof<string> |] resolveDependenciesMethodName
+            let resolveMethodEx = ReflectionHelper.getInstanceMethod<bool * string list * string list> theType [| typeof<string>; typeof<string seq>; typeof<string> |] resolveDependenciesMethodName
+            Some (fun () -> new ReflectionDependencyManagerProvider(theType, nameProperty, keyProperty, resolveMethod, resolveMethodEx, outputDir) :> IDependencyManagerProvider)
 
     interface IDependencyManagerProvider with
 
         member __.Name     = instance |> nameProperty
 
         member __.Key      = instance |> keyProperty
-        member this.ResolveDependencies(scriptDir, packageManagerTextLines, tfm) =
+
+        member this.ResolveDependencies(scriptDir, mainScriptName, scriptName, scriptExt, packageManagerTextLines, tfm) =
 
             let key = (this :> IDependencyManagerProvider).Key
             let triggerEvent (evt: Event<string * string>) =
                 for prLine in packageManagerTextLines do
                     evt.Trigger(key, prLine)
             triggerEvent dependencyAddingEvent
-            let arguments = [| box scriptDir; box packageManagerTextLines; box tfm |]
-            let succeeded, generatedScripts, additionalIncludeFolders = resolveDeps.Invoke(instance, arguments) :?> _
+
+
+            // The ResolveDependencies method, has two signatures, the original signaature in the variable resolveDeps and the updated signature resoveDepsEx
+            // The resolve method can return values in two different tuples:
+            //     (bool * string list * string list * string list)
+            //     (bool * string list * string list)
+            //
+            // We use reflection to get the correct method and to determine what we got back.
+            //
+            let method, arguments =
+                if resolveDepsEx.IsSome then
+                    resolveDepsEx, [| box scriptExt; box packageManagerTextLines; box tfm |]
+                elif resolveDeps.IsSome then
+                    resolveDeps, [| box scriptDir; box mainScriptName; box scriptName; box packageManagerTextLines; box tfm |]
+                else
+                    None, [||]
+
+            let succeeded, references, generatedScripts, additionalIncludeFolders =
+                let empty = List.empty<string>
+                let result =
+                    match method with
+                    | Some m -> m.Invoke(instance, arguments) :?> _
+                    | None -> false, empty, empty, empty
+
+                // Verify the number of arguments returned in the tuple returned by resolvedependencies, it can be:
+                //     4 - (bool * string list * string list * string list)
+                //     3 - (bool * string list * string list)
+                let tupleFields = result |> FSharpValue.GetTupleFields
+                match tupleFields |> Array.length with
+                | 4 -> tupleFields.[0] :?> bool, tupleFields.[1] :?> string list, tupleFields.[2] :?> string list, tupleFields.[3] :?> string list
+                | 3 -> tupleFields.[0] :?> bool, empty, tupleFields.[1] :?> string list, tupleFields.[2] :?> string list
+                | _ -> false, empty, empty, empty
 
             for prLine in packageManagerTextLines do
                 if succeeded then
-                    dependencyAddedEvent.Trigger(key, prLine, generatedScripts, additionalIncludeFolders)
+                    dependencyAddedEvent.Trigger(key, prLine, references, generatedScripts, additionalIncludeFolders)
                 else
                     dependencyFailedEvent.Trigger(key, prLine)
 
@@ -203,9 +235,9 @@ let tryFindDependencyManagerByKey (compilerTools: string list) (outputDir:string
         errorR(Error(FSComp.SR.packageManagerError(e.Message), m))
         None
 
-let resolve (packageManager:IDependencyManagerProvider) scriptExt m packageManagerTextLines =
+let resolve (packageManager:IDependencyManagerProvider) implicitIncludeDir mainScriptName fileName scriptExt m packageManagerTextLines =
     try
-        Some(packageManager.ResolveDependencies(scriptExt, packageManagerTextLines, executionTfm))
+        Some(packageManager.ResolveDependencies(implicitIncludeDir, mainScriptName, fileName, scriptExt, packageManagerTextLines, executionTfm))
     with e ->
         let e = ReflectionHelper.stripTieWrapper e
         errorR(Error(FSComp.SR.packageManagerError(e.Message), m))

src/fsharp/DependencyManager.Integration.fsi

@@ -8,9 +8,9 @@ open FSharp.Compiler.Range
 type IDependencyManagerProvider =
     abstract Name: string
     abstract Key: string
-    abstract ResolveDependencies: scriptExt: string * packageManagerTextLines: string seq * tfm: string -> bool * string list * string list
+    abstract ResolveDependencies: scriptDir: string * mainScriptName: string * scriptName: string * scriptExt: string * packageManagerTextLines: string seq * tfm: string -> bool * string list * string list
     abstract DependencyAdding: IEvent<string * string>
-    abstract DependencyAdded: IEvent<string * string * string list * string list>
+    abstract DependencyAdded: IEvent<string * string * string list * string list * string list>
     abstract DependencyFailed: IEvent<string * string>
 
 [<RequireQualifiedAccess>]
@@ -23,4 +23,5 @@ val tryFindDependencyManagerInPath: string list -> string option -> range -> str
 val tryFindDependencyManagerByKey: string list -> string option -> range -> string -> IDependencyManagerProvider option
 val removeDependencyManagerKey: string -> string -> string
 val createPackageManagerUnknownError: string list -> string option -> string -> range -> exn
-val resolve: IDependencyManagerProvider -> string -> range -> string seq -> (bool * string list * string list) option
+val resolve: IDependencyManagerProvider -> string -> string -> string -> string -> range -> string seq -> (bool * string list * string list) option
+

src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj

@@ -20,7 +20,7 @@
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.DependencyManager\FSharp.DependencyManager.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
   </ItemGroup>
 

src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec

@@ -16,8 +16,8 @@
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.Scripting.xml" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.dll" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.xml" target="lib\netstandard2.0" />
-        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.DependencyManager.dll" target="lib\netstandard2.0" />
-        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.DependencyManager.xml" target="lib\netstandard2.0" />
+        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.DependencyManager.Nuget.dll" target="lib\netstandard2.0" />
+        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.DependencyManager.Nuget.xml" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Interactive.Settings.dll" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Interactive.Settings.xml" target="lib\netstandard2.0" />
     </files>

src/fsharp/FSharp.DependencyManager.Nuget/.gitignore

@@ -0,0 +1 @@
+FSharp.DependencyManager.Nuget.nuget.props

…ependencyManager/FSDependencyManager.txt …ncyManager.Nuget/FSDependencyManager.txtsrc/fsharp/FSharp.DependencyManager/FSDependencyManager.txt renamed to src/fsharp/FSharp.DependencyManager.Nuget/FSDependencyManager.txt src/fsharp/FSharp.DependencyManager/FSDependencyManager.txt renamed to src/fsharp/FSharp.DependencyManager.Nuget/FSDependencyManager.txt

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyName>FSharp.DependencyManager</AssemblyName>
+    <AssemblyName>FSharp.DependencyManager.Nuget</AssemblyName>
     <NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
@@ -23,11 +23,15 @@
   <ItemGroup>
     <EmbeddedText Include="FSDependencyManager.txt" />
     <Compile Include="$(FSharpSourcesRoot)\utils\CompilerLocationUtils.fs" />
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager\FSharp.DependencyManager.ProjectFile.fs" />
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager\FSharp.DependencyManager.Utilities.fs" />
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager\FSharp.DependencyManager.fs" />
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.ProjectFile.fs" />
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Utilities.fs" />
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.fsi" />
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.fs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="FSharp.Compiler.Private.Scripting.UnitTests" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />

…yManager/FSharp.DependencyManager.fsproj …et/FSharp.DependencyManager.Nuget.fsprojsrc/fsharp/FSharp.DependencyManager/FSharp.DependencyManager.fsproj renamed to src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj src/fsharp/FSharp.DependencyManager/FSharp.DependencyManager.fsproj renamed to src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.DependencyManager
+namespace FSharp.DependencyManager.Nuget
 
 open System
 open System.Collections
@@ -21,7 +21,7 @@ type PackageReference = {
 
 
 // Resolved assembly information
-type Resolution = {
+type internal Resolution = {
     NugetPackageId : string
     NugetPackageVersion : string
     PackageRoot : string
@@ -31,30 +31,38 @@ type Resolution = {
     InitializeSourcePath : string }
 
 
-module ProjectFile =
+module internal ProjectFile =
 
     let findLoadsFromResolutions (resolutions:Resolution array) =
         resolutions
         |> Array.filter(fun r -> not(String.IsNullOrEmpty(r.NugetPackageId) ||
                                      String.IsNullOrEmpty(r.InitializeSourcePath)) &&
-                                     File.Exists(r.InitializeSourcePath))
+                                 File.Exists(r.InitializeSourcePath))
         |> Array.map(fun r -> r.InitializeSourcePath)
         |> Array.distinct
 
+    let findReferencesFromResolutions (resolutions:Resolution array) =
+        resolutions
+        |> Array.filter(fun r -> not(String.IsNullOrEmpty(r.NugetPackageId)) &&
+                                 File.Exists(r.FullPath))
+        |> Array.map(fun r -> r.FullPath)
+        |> Array.distinct
+
+
     let findIncludesFromResolutions (resolutions:Resolution array) =
         let managedRoots =
             resolutions
             |> Array.filter(fun r -> not(String.IsNullOrEmpty(r.NugetPackageId) ||
                                          String.IsNullOrEmpty(r.PackageRoot)) &&
-                                         Directory.Exists(r.PackageRoot))
+                                     Directory.Exists(r.PackageRoot))
             |> Array.map(fun r -> r.PackageRoot)
             |> Array.distinct
 
         let nativeRoots =
             resolutions
             |> Array.filter(fun r -> not(String.IsNullOrEmpty(r.NugetPackageId) ||
                                          String.IsNullOrEmpty(r.NativePath)) &&
-                                       Directory.Exists(r.NativePath))
+                                     Directory.Exists(r.NativePath))
             |> Array.map(fun r -> r.NativePath)
             |> Array.distinct