rebase fixes

Author: DedSec256

ReSharper.FSharp/src/FSharp.Common/src/Shim/TypeProviders/TypeProvidersManager.fs

@@ -2,6 +2,7 @@
 
 open System
 open System.Collections.Concurrent
+open System.Collections.Generic
 open System.Threading
 open FSharp.Compiler.ExtensionTyping
 open FSharp.Core.CompilerServices

rider-fsharp/src/test/kotlin/Extensions.kt

@@ -26,10 +26,10 @@ fun withSettings(project: Project, settings: List<String>, function: () -> Unit)
     }
 }
 
-fun BaseTestWithSolution.withTypeProviders(function: () -> Unit) {
+fun BaseTestWithSolution.withTypeProviders(shadowCopyMode: Boolean, function: () -> Unit) {
     val settings = mutableListOf("FSharp/FSharpOptions/FSharpExperimentalFeatures/OutOfProcessTypeProviders/@EntryValue")
     if (shadowCopyMode) settings.add("FSharp/FSharpOptions/FSharpExperimentalFeatures/HostTypeProvidersFromTempFolder/@EntryValue")
-    withSettings(project, settings, function) {
+    withSettings(project, settings) {
         try {
             function()
         } finally {