wip

Author: DedSec256

ReSharper.FSharp/src/FSharp.TypeProviders.Host/FSharp.TypeProviders.Host/src/Hosts/TypeProvidersTestHost.cs

@@ -1,5 +1,4 @@
-using System.Runtime.InteropServices;
-using JetBrains.Core;
+using JetBrains.Core;
 using JetBrains.Rd.Tasks;
 using JetBrains.Rider.FSharp.TypeProviders.Protocol.Server;
 using JetBrains.Util;

ReSharper.FSharp/src/FSharp/FSharp.Common/FSharp.Common.fsproj

@@ -68,8 +68,8 @@
     <Compile Include="src\Shim\FileSystem\FSharpSourceCache.fs" />
     <Compile Include="src\Shim\FileSystem\AssemblyInfoShim.fs" />
     <Compile Include="src\Shim\AssemblyReader\AssemblyReaderShim.fs" />
-    <Compile Include="src\Shim\TypeProviders\TypeProvidersManager.fs" />
-    <Compile Include="src\Shim\TypeProviders\ExtensionTypingProviderShim.fs" />
+    <Compile Include="src\Shim\TypeProviders\TypeProvidersClient.fs" />
+    <Compile Include="src\Shim\TypeProviders\TypeProvidersShim.fs" />
     <Compile Include="src\Shim\TypeProviders\ZoneMarker.fs" />
     <Compile Include="src\Checker\ScriptFcsProjectProvider.fs" />
     <Compile Include="src\Checker\FcsProjectBuilder.fs" />

ReSharper.FSharp/src/FSharp/FSharp.Common/src/Checker/FcsProjectProvider.fs

@@ -612,7 +612,7 @@ type FcsProjectProvider(lifetime: Lifetime, solution: ISolution, changeManager:
 /// which makes FCS cached resolve results stale
 [<SolutionComponent(Instantiation.DemandAnyThreadUnsafe)>]
 type OutputAssemblyChangeInvalidator(lifetime: Lifetime, outputAssemblies: OutputAssemblies, daemon: IDaemon,
-        psiFiles: IPsiFiles, fcsProjectProvider: IFcsProjectProvider, typeProvidersShim: IProxyExtensionTypingProvider,
+        psiFiles: IPsiFiles, fcsProjectProvider: IFcsProjectProvider, typeProvidersShim: ITypeProvidersShim,
         fcsAssemblyReaderShim: ILazy<IFcsAssemblyReaderShim>) =
 
     interface ISolutionLoadTasksStartPsiListener with