diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index 4de589c8947a22a87869b1a33d7b232e190d9aa3..33816e9c3e2a3d124ac4c3faf37963fc94a764dd 100644
--- a/build/Targets/Packages.props
+++ b/build/Targets/Packages.props
@@ -93,8 +93,7 @@
15.3.178-pre-g209fb07c2e
10.0.0.0-alpha
14.0.249-master2E2DC10C
- 1.3.269-rc
- 1.3.269-rc
+ 1.11.2290
14.3.25407
14.3.25407
15.0.26606
diff --git a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
index 14743e22e5a23fa244425128c334baeed4d9ae61..fede7cb517d3244c951ea1280c82acd681aa94cb 100644
--- a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
+++ b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec
@@ -17,7 +17,7 @@
$projectUrl$
$tags$
-
+
diff --git a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
index c6c2bc3f94d505a1de295a7a2c00d701d4be64c3..22cf8b26001453d2689018744d443390df5a5c00 100644
--- a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
+++ b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec
@@ -15,7 +15,7 @@
$tags$
true
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec b/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec
index 5b6505d4f890d75b14a48836708be5a0cf37b1b0..230405ba272af3b40135b4df390afe4ebcf3380f 100644
--- a/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec
+++ b/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec
@@ -14,13 +14,13 @@
$tags$
-
-
+
+
-
-
-
+
+
+
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/Interop/NativeMethods.cs b/src/VisualStudio/IntegrationTest/TestUtilities/Interop/NativeMethods.cs
index 3ae1f5579806a497a860259eb3c53c6c40b31c3e..fb3cd5fa84c5bd4aa23caa46f26b92f493a48ab0 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/Interop/NativeMethods.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/Interop/NativeMethods.cs
@@ -14,19 +14,6 @@ internal static class NativeMethods
private const string Kernel32 = "kernel32.dll";
private const string Ole32 = "ole32.dll";
private const string User32 = "User32.dll";
- private const string SetupConfigurationNative = "x86\\Microsoft.VisualStudio.Setup.Configuration.Native.dll";
-
- #region Microsoft.VisualStudio.Setup.Configuration.Native.dll
-
- public const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154);
-
- [DllImport(SetupConfigurationNative, BestFitMapping = false, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, EntryPoint = "GetSetupConfiguration", ExactSpelling = true, PreserveSig = true, SetLastError = false, ThrowOnUnmappableChar = false)]
- public static extern int GetSetupConfiguration(
- [Out, MarshalAs(UnmanagedType.Interface)] out ISetupConfiguration setupConfiguration,
- [In] IntPtr pReserved
- );
-
- #endregion
#region kernel32.dll
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
index b91fd12d7466ac661073d7843b3927a779c63874..d23b9a64912e7ca1e37a975e368c94689679d8c1 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
@@ -197,29 +197,9 @@ private void UpdateCurrentlyRunningInstance(ImmutableHashSet requiredPac
_currentlyRunningInstance = new VisualStudioInstance(hostProcess, dte, supportedPackageIds, installationPath);
}
- private static ISetupConfiguration GetSetupConfiguration()
- {
- try
- {
- return new SetupConfiguration();
- }
- catch (COMException comException) when (comException.HResult == NativeMethods.REGDB_E_CLASSNOTREG)
- {
- // Fallback to P/Invoke if the COM registration is missing
- var hresult = NativeMethods.GetSetupConfiguration(out var setupConfiguration, pReserved: IntPtr.Zero);
-
- if (hresult < 0)
- {
- throw Marshal.GetExceptionForHR(hresult);
- }
-
- return setupConfiguration;
- }
- }
-
private static IEnumerable EnumerateVisualStudioInstances()
{
- var setupConfiguration = GetSetupConfiguration() as ISetupConfiguration2;
+ var setupConfiguration = new SetupConfiguration();
var instanceEnumerator = setupConfiguration.EnumAllInstances();
var instances = new ISetupInstance[3];
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
index 4b0a795363e3325914687b4e16fabd4d0311c46c..25e93530fee36a18159675e43c71b73808e7b112 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj
@@ -47,7 +47,6 @@
-