Skip to content

Commit

Permalink
Fix Rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisMaddock committed Jun 7, 2020
1 parent 3f62216 commit b5f4dc1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions build.cake
Expand Up @@ -691,6 +691,10 @@ void CheckForError(ref List<string> errorDetail)
FilePath GetResultXmlPath(string testAssembly, string framework)
{
var assemblyName = System.IO.Path.GetFileNameWithoutExtension(testAssembly);

// Required for Test suites running under NUnitLite
CreateDirectory($@"test-results\{framework}");

return MakeAbsolute(new FilePath($@"test-results\{framework}\{assemblyName}.xml"));
}

Expand Down
Expand Up @@ -68,7 +68,7 @@ public static IEnumerable<TestCaseData> TestCases
}
});

#if !NETCOREAPP1_6
#if !NETCOREAPP1_1
yield return new TestRunnerFactoryData(
"SingleProject (list ctor)",
new TestPackage(new[] { "a.nunit" }),
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs
Expand Up @@ -56,7 +56,7 @@ public class MasterTestRunner : ITestRunner
private ITestEngineRunner _engineRunner;
private readonly IServiceLocator _services;
#if !NETSTANDARD1_6
private readonly ExtensionService _extensionService;
private readonly IExtensionService _extensionService;
#endif
#if NETFRAMEWORK
private readonly IRuntimeFrameworkService _runtimeService;
Expand Down

0 comments on commit b5f4dc1

Please sign in to comment.