Simplify getting MSBuildLocator in tests

src/OmniSharp.Host/MSBuild/Discovery/MSBuildLocator.cs

@@ -2,7 +2,6 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Reflection;
-//using System.Runtime.Loader;
 using System.Text;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -15,16 +14,6 @@ namespace OmniSharp.MSBuild.Discovery
 {
     internal class MSBuildLocator : DisposableObject, IMSBuildLocator
     {
-        private const string MSBuildPublicKeyToken = "b03f5f7f11d50a3a";
-
-        private static readonly string[] s_msBuildAssemblies =
-        {
-            "Microsoft.Build",
-            "Microsoft.Build.Framework",
-            "Microsoft.Build.Tasks.Core",
-            "Microsoft.Build.Utilities.Core",
-        };
-
         private readonly ILogger _logger;
         private readonly ImmutableArray<MSBuildInstanceProvider> _providers;
 
@@ -100,20 +89,12 @@ public void RegisterInstance(MSBuildInstance instance)
 
             _logger.LogInformation(builder.ToString());
 
-            if (MicrosoftBuildLocator.CanRegister)
+            if (!MicrosoftBuildLocator.CanRegister)
             {
-                MicrosoftBuildLocator.RegisterMSBuildPath(instance.MSBuildPath);
+                return;
             }
 
-            foreach (var msBuildAssemblyName in s_msBuildAssemblies)
-            {
-                var assembly = Assembly.Load($"{msBuildAssemblyName}, Version=15.1.0.0, Culture=neutral, PublicKeyToken={MSBuildPublicKeyToken}");
-                if (assembly is null)
-                {
-                    throw new Exception($"Unable to load {msBuildAssemblyName}'");
-                }
-                _logger.LogInformation($"Loaded {msBuildAssemblyName} from '{assembly.Location}'");
-            }
+            MicrosoftBuildLocator.RegisterMSBuildPath(instance.MSBuildPath);
         }
 
         public ImmutableArray<MSBuildInstance> GetInstances()

tests/OmniSharp.DotNetTest.Tests/OmniSharp.DotNetTest.Tests.csproj

@@ -23,8 +23,8 @@
     <PackageReference Include="xunit" />
     <!--
         Mono's MSBuild does not include the SQLitePCLRaw libraries.
-         We include them when packaging our non-windows .NET Framework builds.
-         Simulate that behavior for these tests.
+        We include them when packaging our non-windows .NET Framework builds.
+        Simulate that behavior for these tests.
     -->
     <PackageReference Include="SQLitePCLRaw.bundle_green" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" PrivateAssets="all" Condition="'$(TargetFramework)' != 'net472'" />

tests/OmniSharp.Lsp.Tests/OmniSharp.Lsp.Tests.csproj

@@ -24,8 +24,8 @@
     <PackageReference Include="xunit" />
     <!--
         Mono's MSBuild does not include the SQLitePCLRaw libraries.
-         We include them when packaging our non-windows .NET Framework builds.
-         Simulate that behavior for these tests.
+        We include them when packaging our non-windows .NET Framework builds.
+        Simulate that behavior for these tests.
     -->
     <PackageReference Include="SQLitePCLRaw.bundle_green" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" PrivateAssets="all" Condition="'$(TargetFramework)' != 'net472'" />

tests/OmniSharp.MSBuild.Tests/AbstractMSBuildTestFixture.cs

@@ -19,19 +19,16 @@ public abstract class AbstractMSBuildTestFixture : AbstractTestFixture, IDisposa
         private readonly IMSBuildLocator _msbuildLocator;
         private readonly IAnalyzerAssemblyLoader _analyzerAssemblyLoader;
 
-        public AbstractMSBuildTestFixture(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public AbstractMSBuildTestFixture(ITestOutputHelper output)
+            : base(output)
         {
             _assemblyLoader = new AssemblyLoader(this.LoggerFactory);
             _analyzerAssemblyLoader = ShadowCopyAnalyzerAssemblyLoader.Instance;
-            _msbuildLocator = this.SharedOmniSharpTestHost.ServiceProvider.GetRequiredService<IMSBuildLocator>();
+            _msbuildLocator = MSBuildLocator.CreateDefault(this.LoggerFactory, _assemblyLoader, msbuildConfiguration: null);
 
-            //if (_msbuildLocator.RegisteredInstance is null)
-            //{
             // Some tests require MSBuild to be discovered early
             // to ensure that the Microsoft.Build.* assemblies can be located
-            //    _msbuildLocator.RegisterDefaultInstance(this.LoggerFactory.CreateLogger("MSBuildTests"), dotNetInfo: null);
-            //}
+            _msbuildLocator.RegisterDefaultInstance(this.LoggerFactory.CreateLogger("MSBuildTests"), dotNetInfo: null);
         }
 
         public void Dispose()

tests/OmniSharp.MSBuild.Tests/LoadProjectsOnDemandTests.cs

@@ -4,7 +4,6 @@
 using OmniSharp.Models;
 using OmniSharp.Models.MembersTree;
 using OmniSharp.Models.V2.CodeActions;
-using OmniSharp.Models.V2.CodeStructure;
 using OmniSharp.MSBuild.Models;
 using OmniSharp.Options;
 using OmniSharp.Roslyn.CSharp.Services.Refactoring.V2;
@@ -17,8 +16,8 @@ namespace OmniSharp.MSBuild.Tests
 {
     public class LoadProjectsOnDemandTests : AbstractMSBuildTestFixture
     {
-        public LoadProjectsOnDemandTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public LoadProjectsOnDemandTests(ITestOutputHelper output)
+            : base(output)
         {
         }
 

tests/OmniSharp.MSBuild.Tests/MSBuildDiagnosticTests.cs

@@ -1,16 +1,14 @@
 using Microsoft.Build.Framework;
 using OmniSharp.MSBuild.Logging;
 using OmniSharp.Utilities;
-using TestUtility;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace OmniSharp.MSBuild.Tests
 {
     public class MSBuildDiagnosticTests : AbstractMSBuildTestFixture
     {
-        public MSBuildDiagnosticTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public MSBuildDiagnosticTests(ITestOutputHelper output) : base(output)
         {
         }
 

tests/OmniSharp.MSBuild.Tests/NotificationTests.cs

@@ -12,8 +12,8 @@ namespace OmniSharp.MSBuild.Tests
 {
     public class NotificationTests : AbstractMSBuildTestFixture
     {
-        public NotificationTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public NotificationTests(ITestOutputHelper output)
+            : base(output)
         {
         }
 

tests/OmniSharp.MSBuild.Tests/OmniSharp.MSBuild.Tests.csproj

@@ -25,8 +25,8 @@
     <PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" PrivateAssets="all" />
     <!--
         Mono's MSBuild does not include the SQLitePCLRaw libraries.
-         We include them when packaging our non-windows .NET Framework builds.
-         Simulate that behavior for these tests.
+        We include them when packaging our non-windows .NET Framework builds.
+        Simulate that behavior for these tests.
     -->
     <PackageReference Include="SQLitePCLRaw.bundle_green" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" PrivateAssets="all" Condition="'$(TargetFramework)' != 'net472'" />

tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs

@@ -18,8 +18,7 @@ public partial class ProjectLoadListenerTests : AbstractMSBuildTestFixture
         private readonly VsTfmAndFileExtHashingAlgorithm _tfmAndFileHashingAlgorithm;
         private readonly VsReferenceHashingAlgorithm _referenceHashingAlgorithm;
 
-        public ProjectLoadListenerTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public ProjectLoadListenerTests(ITestOutputHelper output) : base(output)
         {
             _tfmAndFileHashingAlgorithm = new VsTfmAndFileExtHashingAlgorithm();
             _referenceHashingAlgorithm = new VsReferenceHashingAlgorithm();

tests/OmniSharp.MSBuild.Tests/ProjectWithAdditionalFilesTests.cs

@@ -9,8 +9,8 @@ namespace OmniSharp.MSBuild.Tests
 {
     public class ProjectWithAdditionalFilesTests : AbstractMSBuildTestFixture
     {
-        public ProjectWithAdditionalFilesTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public ProjectWithAdditionalFilesTests(ITestOutputHelper output)
+            : base(output)
         {
         }
 

tests/OmniSharp.MSBuild.Tests/ProjectWithAnalyzersTests.cs

@@ -20,8 +20,8 @@ namespace OmniSharp.MSBuild.Tests
 {
     public class ProjectWithAnalyzersTests : AbstractMSBuildTestFixture
     {
-        public ProjectWithAnalyzersTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public ProjectWithAnalyzersTests(ITestOutputHelper output)
+            : base(output)
         {
         }
 

tests/OmniSharp.MSBuild.Tests/ProjectWithComplexAnalyzersTests.cs

@@ -11,8 +11,7 @@ namespace OmniSharp.MSBuild.Tests
 {
     public class ProjectWithComplexAnalyzersTests : AbstractMSBuildTestFixture
     {
-        public ProjectWithComplexAnalyzersTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public ProjectWithComplexAnalyzersTests(ITestOutputHelper output) : base(output)
         {
         }
 

tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs

@@ -14,8 +14,8 @@ namespace OmniSharp.MSBuild.Tests
 {
     public class WorkspaceInformationTests : AbstractMSBuildTestFixture
     {
-        public WorkspaceInformationTests(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
-            : base(output, sharedOmniSharpHostFixture)
+        public WorkspaceInformationTests(ITestOutputHelper output)
+            : base(output)
         {
         }
 

tests/OmniSharp.Roslyn.CSharp.Tests/OmniSharp.Roslyn.CSharp.Tests.csproj

@@ -23,8 +23,8 @@
     <PackageReference Include="xunit" />
     <!--
         Mono's MSBuild does not include the SQLitePCLRaw libraries.
-         We include them when packaging our non-windows .NET Framework builds.
-         Simulate that behavior for these tests.
+        We include them when packaging our non-windows .NET Framework builds.
+        Simulate that behavior for these tests.
     -->
     <PackageReference Include="SQLitePCLRaw.bundle_green" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" PrivateAssets="all" Condition="'$(TargetFramework)' != 'net472'" />

tests/OmniSharp.Stdio.Tests/OmniSharp.Stdio.Tests.csproj

@@ -21,8 +21,8 @@
     <PackageReference Include="xunit" />
     <!--
         Mono's MSBuild does not include the SQLitePCLRaw libraries.
-         We include them when packaging our non-windows .NET Framework builds.
-         Simulate that behavior for these tests.
+        We include them when packaging our non-windows .NET Framework builds.
+        Simulate that behavior for these tests.
     -->
     <PackageReference Include="SQLitePCLRaw.bundle_green" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" PrivateAssets="all" Condition="'$(TargetFramework)' != 'net472'" />

tests/TestUtility/TestServiceProvider.cs

@@ -167,7 +167,7 @@ private static IConfigurationRoot CreateConfiguration(IConfiguration configurati
 
         private static IMSBuildLocator CreateMSBuildLocator(ILoggerFactory loggerFactory,
             IAssemblyLoader assemblyLoader,
-            IConfiguration configurationData)
+            IConfiguration configurationData = null)
             => MSBuildLocator.CreateDefault(loggerFactory, assemblyLoader, configurationData);
 
         private static ISharedTextWriter CreateSharedTextWriter(ITestOutputHelper testOutput)