Re-enable MSBuild unit tests for AppVeyor

src/OmniSharp.MSBuild/MSBuildEnvironment.cs

@@ -6,8 +6,27 @@ namespace OmniSharp.MSBuild
 {
  public static class MSBuildEnvironment
  {
+ private static bool s_isInitialized;
+ private static string s_msbuildFolder;
+
+ public static bool IsInitialized => s_isInitialized;
+
+ public static string MSBuildFolder
+ {
+ get
+ {
+ EnsureInitialized();
+ return s_msbuildFolder;
+ }
+ }
+
  public static void Initialize(ILogger logger)
  {
+ if (s_isInitialized)
+ {
+ throw new InvalidOperationException("MSBuildEnvironment is already initialized");
+ }
+
  // If OmniSharp is running normally, MSBuild is located in an 'msbuild' folder beneath OmniSharp.exe.
  var msbuildFolder = Path.Combine(AppContext.BaseDirectory, "msbuild");
 
@@ -63,6 +82,17 @@ public static void Initialize(ILogger logger)
  {
  logger.LogError("Could not locate MSBuild Sdks path to set MSBuildSDKsPath");
  }
+
+ s_msbuildFolder = msbuildFolder;
+ s_isInitialized = true;
+ }
+
+ private static void EnsureInitialized()
+ {
+ if (!s_isInitialized)
+ {
+ throw new InvalidOperationException("MSBuildEnvironment is not initialized");
+ }
  }
 
  private static string FindMSBuildFolderFromSolution()

src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs

@@ -124,6 +124,10 @@ public static ProjectFileInfo Create(
  {
  globalProperties.Add(PropertyNames.MSBuildExtensionsPath, options.MSBuildExtensionsPath);
  }
+ else
+ {
+ globalProperties.Add(PropertyNames.MSBuildExtensionsPath, MSBuildEnvironment.MSBuildFolder);
+ }
 
  if (PlatformHelper.IsMono)
  {

tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs

@@ -17,10 +17,13 @@ public ProjectFileInfoTests(ITestOutputHelper output)
  this._testAssets = TestAssets.Instance;
  this._logger = new TestLogger(output);
 
- MSBuildEnvironment.Initialize(this._logger);
+ if (!MSBuildEnvironment.IsInitialized)
+ {
+ MSBuildEnvironment.Initialize(this._logger);
+ }
  }
 
- [ConditionalFact(typeof(NotOnAppVeyor))]
+ [Fact]
  public void HelloWorld_has_correct_property_values()
  {
  var projectFolder = _testAssets.GetTestProjectFolder("HelloWorld");
@@ -35,7 +38,7 @@ public void HelloWorld_has_correct_property_values()
  Assert.Equal("bin/Debug/netcoreapp1.0/", projectFileInfo.OutputPath.Replace('\\', '/'));
  }
 
- [ConditionalFact(typeof(NotOnAppVeyor))]
+ [Fact]
  public void NetStandardAndNetCoreApp_has_correct_property_values()
  {
  var projectFolder = _testAssets.GetTestProjectFolder("NetStandardAndNetCoreApp");