Merge issue

Author: KevinRansom

setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj

@@ -97,7 +97,6 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
   file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Resources.Extensions.dll"
   file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Runtime.CompilerServices.Unsafe.dll"
   file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Threading.Tasks.Dataflow.dll"
-  file source="$(BinariesFolder)\Interactive.DependencyManager\$(Configuration)\netstandard2.0\Interactive.DependencyManager.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
   file source="$(BinariesFolder)\FSharp.Compiler.Server.Shared\$(Configuration)\$(TargetFramework)\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
   file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
   file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.optdata"

setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj

@@ -17,7 +17,8 @@
     <_Dependency Include="FSharp.Build" Version="$(FSProductVersion)" />
     <_Dependency Include="FSharp.Compiler.Interactive.Settings" Version="$(FSProductVersion)" />
     <_Dependency Include="FSharp.Compiler.Private" Version="$(FSProductVersion)" />
-    <_Dependency Include="Interactive.DependencyManager" Version="$(FSProductVersion)" />
+    <_Dependency Include="Microsoft.DotNet.DependencyManager" Version="$(FSProductVersion)" />
+    <_Dependency Include="FSharp.DependencyManager.Nuget" Version="$(FSProductVersion)" />
     <_Dependency Include="FSharp.Compiler.Server.Shared" Version="$(FSProductVersion)" />
     <_Dependency Include="FSharp.Core" Version="$(FSCoreVersion)" />
     <_Dependency Include="FSharp.Editor" Version="$(VSAssemblyVersion)" />