Update dependency notification (#8455)

* Rework dependency notifications

* rework Dependency events

Author: KevinRansom

src/fsharp/DependencyManager.Integration.fs

@@ -64,7 +64,7 @@ type internal IDependencyManagerProvider =
     abstract Key: string
     abstract ResolveDependencies: scriptExt: string * packageManagerTextLines: string seq * tfm: string -> bool * string list * string list
     abstract DependencyAdding: IEvent<string * string>
-    abstract DependencyAdded: IEvent<string * string>
+    abstract DependencyAdded: IEvent<string * string * string list * string list>
     abstract DependencyFailed: IEvent<string * string>
 
 [<RequireQualifiedAccess>]
@@ -96,23 +96,35 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn
             Some (fun () -> new ReflectionDependencyManagerProvider(theType, nameProperty, keyProperty, resolveDependenciesMethod, outputDir) :> IDependencyManagerProvider)
 
     interface IDependencyManagerProvider with
+
         member __.Name     = instance |> nameProperty
+
         member __.Key      = instance |> keyProperty
         member this.ResolveDependencies(scriptDir, 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) :?> _
-            if succeeded then triggerEvent dependencyAddedEvent
-            else triggerEvent dependencyFailedEvent
+
+            for prLine in packageManagerTextLines do
+                if succeeded then
+                    dependencyAddedEvent.Trigger(key, prLine, generatedScripts, additionalIncludeFolders)
+                else
+                    dependencyFailedEvent.Trigger(key, prLine)
+
             succeeded, generatedScripts, additionalIncludeFolders
+
         member __.DependencyAdding = dependencyAddingEvent.Publish
+
         member __.DependencyAdded = dependencyAddedEvent.Publish
+
         member __.DependencyFailed = dependencyFailedEvent.Publish
 
+
 // Resolution Path = Location of FSharp.Compiler.Private.dll
 let assemblySearchPaths = lazy (
     [

src/fsharp/DependencyManager.Integration.fsi

@@ -10,7 +10,7 @@ type IDependencyManagerProvider =
     abstract Key: string
     abstract ResolveDependencies: scriptExt: string * packageManagerTextLines: string seq * tfm: string -> bool * string list * string list
     abstract DependencyAdding: IEvent<string * string>
-    abstract DependencyAdded: IEvent<string * string>
+    abstract DependencyAdded: IEvent<string * string * string list * string list>
     abstract DependencyFailed: IEvent<string * string>
 
 [<RequireQualifiedAccess>]

src/fsharp/fsi/fsi.fs

@@ -958,7 +958,7 @@ type internal FsiDynamicCompiler
 
     let valueBoundEvent = Control.Event<_>()
     let dependencyAddingEvent = Control.Event<string * string>()
-    let dependencyAddedEvent = Control.Event<string * string>()
+    let dependencyAddedEvent = Control.Event<string * string * string list * string list>()
     let dependencyFailedEvent = Control.Event<string * string>()
 
     let mutable fragmentId = 0

src/fsharp/fsi/fsi.fsi

@@ -240,7 +240,7 @@ type FsiEvaluationSession =
 
     [<CLIEvent>]
     /// Event fires at the successful completion of adding a dependency via the dependency manager.
-    member DependencyAdded: IEvent<string * string>
+    member DependencyAdded: IEvent<string * string * string list * string list>
 
     [<CLIEvent>]
     /// Event fires at the failure to adding a dependency via the dependency manager.

tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs

@@ -57,19 +57,27 @@ type DependencyManagerInteractiveTests() =
         let mutable dependencyAddedEventCount = 0
         let mutable foundDependencyAdding = false
         let mutable foundDependencyAdded = false
+        let mutable packageRootsCount = 0
+        let mutable generatedScriptsCount = 0
         Event.add (fun (dep: string * string) ->
             let key, dependency = dep
             dependencyAddingEventCount <- dependencyAddingEventCount + 1
             foundDependencyAdding <- foundDependencyAdding || (key = "nuget" && dependency = referenceText))
             script.DependencyAdding
-        Event.add (fun (dep: string * string) ->
-            let key, dependency = dep
+        Event.add (fun (dep: string * string * string list * string list) ->
+            let key, dependency, _generatedScripts, _packageRoots = dep
+            generatedScriptsCount <- _generatedScripts.Length
+            packageRootsCount <- _packageRoots.Length
             dependencyAddedEventCount <- dependencyAddedEventCount + 1
             foundDependencyAdded <- foundDependencyAdded || (key = "nuget" && dependency = referenceText))
             script.DependencyAdded
         script.Eval(text) |> ignoreValue
         Assert.AreEqual(1, dependencyAddingEventCount)
         Assert.AreEqual(1, dependencyAddedEventCount)
+        Assert.AreEqual(1, dependencyAddingEventCount)
+        Assert.AreEqual(1, dependencyAddedEventCount)
+        Assert.AreEqual(1, generatedScriptsCount)
+        Assert.AreEqual(1, dependencyAddedEventCount)
         Assert.AreEqual(true, foundDependencyAdding)
         Assert.AreEqual(true, foundDependencyAdded)