Remove assembly load notification (#8393)

* Remove assembly addednotification from fsievaluation session

* Remove AssemblyReferenceAdded notification

* Update FSharpScriptTests.fs

Author: KevinRansom

src/fsharp/CompileOps.fs

@@ -4835,10 +4835,10 @@ and [<Sealed>] TcImports(tcConfigP: TcConfigProvider, initialResolutions: TcAsse
 
 /// Process #r in F# Interactive.
 /// Adds the reference to the tcImports and add the ccu to the type checking environment.
-let RequireDLL (ctok, tcImports: TcImports, tcEnv, thisAssemblyName, m, file, assemblyReferenceAdded: string -> unit) =
+let RequireDLL (ctok, tcImports: TcImports, tcEnv, thisAssemblyName, m, file) =
     let resolutions = CommitOperationResult(tcImports.TryResolveAssemblyReference(ctok, AssemblyReference(m, file, None), ResolveAssemblyReferenceMode.ReportErrors))
     let dllinfos, ccuinfos = tcImports.RegisterAndImportReferencedAssemblies(ctok, resolutions) |> Cancellable.runWithoutCancellation
-   
+
     let asms = 
         ccuinfos |> List.map (function
             | ResolvedImportedAssembly asm -> asm
@@ -4847,11 +4847,7 @@ let RequireDLL (ctok, tcImports: TcImports, tcEnv, thisAssemblyName, m, file, as
     let g = tcImports.GetTcGlobals()
     let amap = tcImports.GetImportMap()
     let buildTcEnv tcEnv asm =
-        let tcEnv = AddCcuToTcEnv(g, amap, m, tcEnv, thisAssemblyName, asm.FSharpViewOfMetadata, asm.AssemblyAutoOpenAttributes, asm.AssemblyInternalsVisibleToAttributes)
-        match asm.FSharpViewOfMetadata.FileName with
-        | Some asmPath -> assemblyReferenceAdded asmPath
-        | None -> ()
-        tcEnv
+        AddCcuToTcEnv(g, amap, m, tcEnv, thisAssemblyName, asm.FSharpViewOfMetadata, asm.AssemblyAutoOpenAttributes, asm.AssemblyInternalsVisibleToAttributes)
     let tcEnv = (tcEnv, asms) ||> List.fold buildTcEnv
     tcEnv, (dllinfos, asms)
 

src/fsharp/CompileOps.fsi

@@ -684,7 +684,7 @@ val WriteOptimizationData: TcGlobals * filename: string * inMem: bool * CcuThunk
 
 /// Process #r in F# Interactive.
 /// Adds the reference to the tcImports and add the ccu to the type checking environment.
-val RequireDLL: CompilationThreadToken * TcImports * TcEnv * thisAssemblyName: string * referenceRange: range * file: string * assemblyReferenceAdded: (string -> unit) -> TcEnv * (ImportedBinary list * ImportedAssembly list)
+val RequireDLL: CompilationThreadToken * TcImports * TcEnv * thisAssemblyName: string * referenceRange: range * file: string -> TcEnv * (ImportedBinary list * ImportedAssembly list)
 
 /// Processing # commands
 val ProcessMetaCommandsFromInput : 

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

@@ -19,9 +19,6 @@ type FSharpScript(?additionalArgs: string[]) =
     let argv = Array.append baseArgs additionalArgs
     let fsi = FsiEvaluationSession.Create (config, argv, stdin, stdout, stderr)
 
-    [<CLIEvent>]
-    member __.AssemblyReferenceAdded = fsi.AssemblyReferenceAdded
-
     member __.ValueBound = fsi.ValueBound
 
     [<CLIEvent>]

src/fsharp/fsi/fsi.fs

@@ -956,7 +956,6 @@ type internal FsiDynamicCompiler
     let outfile = "TMPFSCI.exe"
     let assemblyName = "FSI-ASSEMBLY"
 
-    let assemblyReferenceAddedEvent = Control.Event<string>()
     let valueBoundEvent = Control.Event<_>()
     let dependencyAddingEvent = Control.Event<string * string>()
     let dependencyAddedEvent = Control.Event<string * string>()
@@ -1260,7 +1259,7 @@ type internal FsiDynamicCompiler
         let tcState = istate.tcState 
         let tcEnv,(_dllinfos,ccuinfos) = 
             try
-                RequireDLL (ctok, tcImports, tcState.TcEnvFromImpls, assemblyName, m, path, assemblyReferenceAddedEvent.Trigger)
+                RequireDLL (ctok, tcImports, tcState.TcEnvFromImpls, assemblyName, m, path)
             with e ->
                 tcConfigB.RemoveReferencedAssemblyByPath(m,path)
                 reraise()
@@ -1402,8 +1401,6 @@ type internal FsiDynamicCompiler
     member __.FormatValue(obj:obj, objTy) = 
         valuePrinter.FormatValue(obj, objTy)
 
-    member __.AssemblyReferenceAdded = assemblyReferenceAddedEvent.Publish
-
     member __.ValueBound = valueBoundEvent.Publish
 
     member __.DependencyAdding = dependencyAddingEvent.Publish
@@ -1909,8 +1906,6 @@ type internal FsiInteractionProcessor
 
     let referencedAssemblies = Dictionary<string, DateTime>()
 
-    let assemblyReferencedEvent = Control.Event<string>()
-
     let mutable currState = initialInteractiveState
     let event = Control.Event<unit>()
     let setCurrState s = currState <- s; event.Trigger()
@@ -2451,8 +2446,6 @@ type internal FsiInteractionProcessor
         let fsiInteractiveChecker = FsiInteractiveChecker(legacyReferenceResolver, checker, tcConfig, istate.tcGlobals, istate.tcImports, istate.tcState)
         fsiInteractiveChecker.ParseAndCheckInteraction(ctok, SourceText.ofString text)
 
-    member __.AssemblyReferenceAdded = assemblyReferencedEvent.Publish
-
 
 //----------------------------------------------------------------------------
 // Server mode:
@@ -2862,10 +2855,6 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i
         |> commitResultNonThrowing errorOptions scriptPath errorLogger
         |> function Choice1Of2 (_), errs -> Choice1Of2 (), errs | Choice2Of2 exn, errs -> Choice2Of2 exn, errs
 
-    [<CLIEvent>]
-    /// Event fires every time an assembly reference is added to the execution environment, e.g., via `#r`.
-    member __.AssemblyReferenceAdded = fsiDynamicCompiler.AssemblyReferenceAdded
-
     /// Event fires when a root-level value is bound to an identifier, e.g., via `let x = ...`.
     member __.ValueBound = fsiDynamicCompiler.ValueBound
 

src/fsharp/fsi/fsi.fsi

@@ -234,10 +234,6 @@ type FsiEvaluationSession =
     /// A host calls this to report an unhandled exception in a standard way, e.g. an exception on the GUI thread gets printed to stderr
     member ReportUnhandledException : exn: exn -> unit
 
-    [<CLIEvent>]
-    /// Event fires every time an assembly reference is added to the execution environment, e.g., via `#r`.
-    member AssemblyReferenceAdded: IEvent<string>
-
     [<CLIEvent>]
     /// Event fires every time a path is added to the include search list, e.g., via `#I`.
     member IncludePathAdded: IEvent<string>

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

@@ -30,34 +30,21 @@ type DependencyManagerInteractiveTests() =
 #r @"nuget:Newtonsoft.Json, Version=9.0.1"
 0"""
         use script = scriptHost()
-        let mutable assemblyResolveEventCount = 0
-        let mutable foundAssemblyReference = false
-        Event.add (fun (assembly: string) ->
-            assemblyResolveEventCount <- assemblyResolveEventCount + 1
-            foundAssemblyReference <- String.Compare("Newtonsoft.Json.dll", Path.GetFileName(assembly), StringComparison.OrdinalIgnoreCase) = 0)
-            script.AssemblyReferenceAdded
         let opt = script.Eval(text) |> getValue
         let value = opt.Value
         Assert.AreEqual(typeof<int>, value.ReflectionType)
         Assert.AreEqual(0, value.ReflectionValue :?> int)
-        Assert.Greater(assemblyResolveEventCount, 0)
-        Assert.AreEqual(true, foundAssemblyReference)
 
     [<Test>]
     member __.``SmokeTest - #r nuget package not found``() =
         let text = """
 #r @"nuget:System.Collections.Immutable.DoesNotExist, version=1.5.0"
 0"""
         use script = scriptHost()
-        let mutable assemblyResolveEventCount = 0
-        Event.add (fun (assembly: string) ->
-            assemblyResolveEventCount <- assemblyResolveEventCount + 1)
-            script.AssemblyReferenceAdded
         let opt = script.Eval(text) |> getValue
         let value = opt.Value
         Assert.AreEqual(typeof<int>, value.ReflectionType)
         Assert.AreEqual(0, value.ReflectionValue :?> int)
-        Assert.AreEqual(0, assemblyResolveEventCount)
 
     [<Test>]
     member __.``Dependency add events successful``() =

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

@@ -65,26 +65,21 @@ type InteractiveTests() =
     [<Test>]
     member __.``Assembly reference event successful``() =
         use script = new FSharpScript()
-        let testAssembly = "System.dll"
-        let mutable assemblyResolveEventCount = 0
-        let mutable foundAssemblyReference = false
-        Event.add (fun (assembly: string) ->
-            assemblyResolveEventCount <- assemblyResolveEventCount + 1
-            foundAssemblyReference <- String.Compare(testAssembly, Path.GetFileName(assembly), StringComparison.OrdinalIgnoreCase) = 0)
-            script.AssemblyReferenceAdded
-        script.Eval(sprintf "#r \"%s\"" testAssembly) |> ignoreValue
-        Assert.AreEqual(1, assemblyResolveEventCount)
-        Assert.True(foundAssemblyReference)
+        let testCode = """
+#r "System.dll"
+let stacktype= typeof<System.Collections.Stack>
+stacktype.Name = "Stack"
+"""
+        let opt = script.Eval(testCode) |> getValue
+        let value = opt.Value
+        Assert.AreEqual(true, value.ReflectionValue :?> bool)
 
     [<Test>]
-    member __.``Assembly reference event unsuccessful``() =
+    member __.``Assembly reference unsuccessful``() =
         use script = new FSharpScript()
         let testAssembly = "not-an-assembly-that-can-be-found.dll"
-        let mutable foundAssemblyReference = false
-        Event.add (fun _ -> foundAssemblyReference <- true) script.AssemblyReferenceAdded
         let _result, errors = script.Eval(sprintf "#r \"%s\"" testAssembly)
         Assert.AreEqual(1, errors.Length)
-        Assert.False(foundAssemblyReference)
 
     [<Test>]
     member __.``Add include path event successful``() =
@@ -130,13 +125,10 @@ type InteractiveTests() =
     [<Test>]
     member __.``Nuget reference fires multiple events``() =
         use script = new FSharpScript(additionalArgs=[|"/langversion:preview"|])
-        let mutable assemblyRefCount = 0
         let mutable includeAddCount = 0
-        Event.add (fun _ -> assemblyRefCount <- assemblyRefCount + 1) script.AssemblyReferenceAdded
         Event.add (fun _ -> includeAddCount <- includeAddCount + 1) script.IncludePathAdded
         script.Eval("#r \"nuget:include=NUnitLite, version=3.11.0\"") |> ignoreValue
         script.Eval("0") |> ignoreValue
-        Assert.GreaterOrEqual(assemblyRefCount, 2)
         Assert.GreaterOrEqual(includeAddCount, 1)
 
 /// Native dll resolution is not implemented on desktop
@@ -183,8 +175,6 @@ printfn ""%A"" result
 123
 "
         use script = new FSharpScript(additionalArgs=[|"/langversion:preview"|])
-        let mutable assemblyRefCount = 0;
-        Event.add (fun _ -> assemblyRefCount <- assemblyRefCount + 1) script.AssemblyReferenceAdded
         let opt = script.Eval(code)  |> getValue
         let value = opt.Value
         Assert.AreEqual(123, value.ReflectionValue :?> int32)
@@ -202,8 +192,6 @@ let tInput = new DenseTensor<float>(inputValues.AsMemory(), new ReadOnlySpan<int
 tInput.Length
 "
         use script = new FSharpScript(additionalArgs=[|"/langversion:preview"|])
-        let mutable assemblyRefCount = 0;
-        Event.add (fun _ -> assemblyRefCount <- assemblyRefCount + 1) script.AssemblyReferenceAdded
         let opt = script.Eval(code)  |> getValue
         let value = opt.Value
         Assert.AreEqual(4L, value.ReflectionValue :?> int64)
@@ -230,7 +218,6 @@ else
 123
 "
         use script = new FSharpScript(additionalArgs=[|"/langversion:preview"|])
-        let mutable assemblyRefCount = 0;
         let opt = script.Eval(code)  |> getValue
         let value = opt.Value
         Assert.AreEqual(123, value.ReflectionValue :?> int32)