Merge pull request #236 from icsharpcode/233/fix-solution-tests

GrahamTheCoder · web-flow · commit 66605e8822a5 · 2019-01-18T13:50:07.000Z
233/fix solution tests
diff --git a/TestData/CSToVBCharacterization/ConvertSingleProject/EmptyVb/VisualBasicLibrary.vbproj b/TestData/CSToVBCharacterization/ConvertSingleProject/EmptyVb/VisualBasicLibrary.vbproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{6D723A94-7862-4FA1-923F-2C923E83158C}</ProjectGuid>
-	<ProjectTypeGuids>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <ProjectTypeGuids>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>EmptyVb</RootNamespace>
     <AssemblyName>EmptyVb</AssemblyName>
diff --git a/TestData/CSToVBCharacterization/ConvertSolution/EmptyVb/VisualBasicLibrary.vbproj b/TestData/CSToVBCharacterization/ConvertSolution/EmptyVb/VisualBasicLibrary.vbproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{6D723A94-7862-4FA1-923F-2C923E83158C}</ProjectGuid>
-	<ProjectTypeGuids>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <ProjectTypeGuids>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>EmptyVb</RootNamespace>
     <AssemblyName>EmptyVb</AssemblyName>
diff --git a/TestData/CharacterizationTestSolution/EmptyVb/VisualBasicLibrary.vbproj b/TestData/CharacterizationTestSolution/EmptyVb/VisualBasicLibrary.vbproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{6D723A94-7862-4FA1-923F-2C923E83158C}</ProjectGuid>
-	<ProjectTypeGuids>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <ProjectTypeGuids>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>EmptyVb</RootNamespace>
     <AssemblyName>EmptyVb</AssemblyName>
diff --git a/TestData/VBToCSCharacterization/ConvertSingleProject/EmptyVb/VisualBasicLibrary.csproj b/TestData/VBToCSCharacterization/ConvertSingleProject/EmptyVb/VisualBasicLibrary.csproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{DF56BBFF-B43A-0050-1067-E6EC5C14212C}</ProjectGuid>
-	<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>EmptyVb</RootNamespace>
     <AssemblyName>EmptyVb</AssemblyName>
diff --git a/TestData/VBToCSCharacterization/ConvertSolution/EmptyVb/VisualBasicLibrary.csproj b/TestData/VBToCSCharacterization/ConvertSolution/EmptyVb/VisualBasicLibrary.csproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{DF56BBFF-B43A-0050-1067-E6EC5C14212C}</ProjectGuid>
-	<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>EmptyVb</RootNamespace>
     <AssemblyName>EmptyVb</AssemblyName>
diff --git a/Tests/CSharp/SolutionAndProjectTests.cs b/Tests/CSharp/SolutionAndProjectTests.cs
@@ -13,16 +13,16 @@ namespace CodeConverter.Tests.CSharp
 {
     public class SolutionAndProjectTests : ProjectConverterTestBase
     {
-        [Fact(Skip = "Hits nullref on appveyor")]
-        public void ConvertSolution()
+        [Fact]
+        public async Task ConvertSolution()
         {
-            ConvertProjectsWhere<VBToCSConversion>(p => true);
+            await ConvertProjectsWhere<VBToCSConversion>(p => true);
         }
 
-        [Fact(Skip = "Hits nullref on appveyor")]
-        public void ConvertSingleProject()
+        [Fact]
+        public async Task ConvertSingleProject()
         {
-            ConvertProjectsWhere<VBToCSConversion>(p => p.Name == "VisualBasicLibrary");
+            await ConvertProjectsWhere<VBToCSConversion>(p => p.Name == "VisualBasicLibrary");
         }
     }
 }
diff --git a/Tests/TestRunners/ProjectConverterTestBase.cs b/Tests/TestRunners/ProjectConverterTestBase.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading.Tasks;
 using ICSharpCode.CodeConverter;
 using ICSharpCode.CodeConverter.CSharp;
 using ICSharpCode.CodeConverter.Shared;
@@ -19,6 +20,7 @@ namespace CodeConverter.Tests.TestRunners
     /// For all files in the testdata folder relevant to the testname, ensures they match the result of the conversion.
     /// Any extra files generated by the conversion are ignored.
     /// </summary>
+    [Collection("Uses MSBuild - everything using MSBuild must be in the same XUnit collection to avoid parallel builds which fail due to https://github.com/dotnet/roslyn/issues/30096")]
     public class ProjectConverterTestBase
     {
         /// <summary>
@@ -28,14 +30,18 @@ public class ProjectConverterTestBase
         /// </summary>
         private bool _writeNewCharacterization = false;
 
-        public void ConvertProjectsWhere<TLanguageConversion>(Func<Project, bool> shouldConvertProject, [CallerMemberName] string testName = "") where TLanguageConversion : ILanguageConversion, new()
+        public async Task ConvertProjectsWhere<TLanguageConversion>(Func<Project, bool> shouldConvertProject, [CallerMemberName] string testName = "") where TLanguageConversion : ILanguageConversion, new()
         {
-            using (var workspace = MSBuildWorkspace.Create())
+            using (var workspace = MSBuildWorkspace.Create(new Dictionary<string, string>()
+            {
+                {"Configuration", "Debug"},
+                {"Platform", "AnyCPU"}
+            }))
             {
                 var originalSolutionDir = Path.Combine(GetTestDataDirectory(), "CharacterizationTestSolution");
                 var solutionFile = Path.Combine(originalSolutionDir, "CharacterizationTestSolution.sln");
 
-                var solution = workspace.OpenSolutionAsync(solutionFile).GetAwaiter().GetResult();
+                var solution = await workspace.OpenSolutionAsync(solutionFile);
                 var languageNameToConvert = typeof(TLanguageConversion) == typeof(VBToCSConversion)
                     ? LanguageNames.VisualBasic
                     : LanguageNames.CSharp;
diff --git a/Tests/VB/SolutionAndProjectTests.cs b/Tests/VB/SolutionAndProjectTests.cs
@@ -1,21 +1,22 @@
-﻿using CodeConverter.Tests.TestRunners;
+﻿using System.Threading.Tasks;
+using CodeConverter.Tests.TestRunners;
 using ICSharpCode.CodeConverter.VB;
 using Xunit;
 
 namespace CodeConverter.Tests.VB
 {
     public class SolutionAndProjectTests : ProjectConverterTestBase
     {
-        [Fact(Skip = "Hits nullref on appveyor")]
-        public void ConvertSolution()
+        [Fact]
+        public async Task ConvertSolution()
         {
-            ConvertProjectsWhere<CSToVBConversion>(p => true);
+            await ConvertProjectsWhere<CSToVBConversion>(p => true);
         }
 
-        [Fact(Skip = "Hits nullref on appveyor")]
-        public void ConvertSingleProject()
+        [Fact]
+        public async Task ConvertSingleProject()
         {
-            ConvertProjectsWhere<CSToVBConversion>(p => p.Name == "CSharpConsoleApp");
+            await ConvertProjectsWhere<CSToVBConversion>(p => p.Name == "CSharpConsoleApp");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,16 @@ namespace CodeConverter.Tests.CSharp`
`13`	`13`	`{`
`14`	`14`	`public class SolutionAndProjectTests : ProjectConverterTestBase`
`15`	`15`	`{`
`16`		`- [Fact(Skip = "Hits nullref on appveyor")]`
`17`		`- public void ConvertSolution()`
	`16`	`+ [Fact]`
	`17`	`+ public async Task ConvertSolution()`
`18`	`18`	`{`
`19`		`- ConvertProjectsWhere<VBToCSConversion>(p => true);`
	`19`	`+ await ConvertProjectsWhere<VBToCSConversion>(p => true);`
`20`	`20`	`}`
`21`	`21`
`22`		`- [Fact(Skip = "Hits nullref on appveyor")]`
`23`		`- public void ConvertSingleProject()`
	`22`	`+ [Fact]`
	`23`	`+ public async Task ConvertSingleProject()`
`24`	`24`	`{`
`25`		`- ConvertProjectsWhere<VBToCSConversion>(p => p.Name == "VisualBasicLibrary");`
	`25`	`+ await ConvertProjectsWhere<VBToCSConversion>(p => p.Name == "VisualBasicLibrary");`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,22 @@`
`1`		`-using CodeConverter.Tests.TestRunners;`
	`1`	`+using System.Threading.Tasks;`
	`2`	`+using CodeConverter.Tests.TestRunners;`
`2`	`3`	`using ICSharpCode.CodeConverter.VB;`
`3`	`4`	`using Xunit;`
`4`	`5`
`5`	`6`	`namespace CodeConverter.Tests.VB`
`6`	`7`	`{`
`7`	`8`	`public class SolutionAndProjectTests : ProjectConverterTestBase`
`8`	`9`	`{`
`9`		`- [Fact(Skip = "Hits nullref on appveyor")]`
`10`		`- public void ConvertSolution()`
	`10`	`+ [Fact]`
	`11`	`+ public async Task ConvertSolution()`
`11`	`12`	`{`
`12`		`- ConvertProjectsWhere<CSToVBConversion>(p => true);`
	`13`	`+ await ConvertProjectsWhere<CSToVBConversion>(p => true);`
`13`	`14`	`}`
`14`	`15`
`15`		`- [Fact(Skip = "Hits nullref on appveyor")]`
`16`		`- public void ConvertSingleProject()`
	`16`	`+ [Fact]`
	`17`	`+ public async Task ConvertSingleProject()`
`17`	`18`	`{`
`18`		`- ConvertProjectsWhere<CSToVBConversion>(p => p.Name == "CSharpConsoleApp");`
	`19`	`+ await ConvertProjectsWhere<CSToVBConversion>(p => p.Name == "CSharpConsoleApp");`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`	`}`