Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port issue 1466 to V4 #1573

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Port issue 1466 to V4 #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package-tests.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,15 @@ StandardRunnerTests.Add(new PackageTest(
// WPF TESTS
//////////////////////////////////////////////////////////////////////

//AddToBothLists(new PackageTest(
// 1, "Net60WPFTest", "Run test using WPF under .NET 6.0",
// "testdata/net6.0-windows/WpfTest.dll --trace=Debug",
// new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-6.0") } }));
AddToBothLists(new PackageTest(
1, "Net60WPFTest", "Run test using WPF under .NET 6.0",
"testdata/net6.0-windows/WpfTest.dll --trace=Debug",
new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-6.0") } }));

//AddToBothLists(new PackageTest(
// 1, "Net80WPFTest", "Run test using WPF under .NET 8.0",
// "testdata/net8.0-windows/WpfTest.dll --trace=Debug",
// new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-8.0") } }));
AddToBothLists(new PackageTest(
1, "Net80WPFTest", "Run test using WPF under .NET 8.0",
"testdata/net8.0-windows/WpfTest.dll --trace=Debug",
new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-8.0") } }));

//////////////////////////////////////////////////////////////////////
// RUN TESTS USING EACH OF OUR EXTENSIONS
Expand Down Expand Up @@ -363,7 +363,7 @@ AddToBothLists(new PackageTest(
}
}));

StandardRunnerTests.Add(new PackageTest(
AddToBothLists(new PackageTest(
1, "AppContextBaseDirectory_NET80",
"Test Setting the BaseDirectory to match test assembly location under .NET 8.0",
"testdata/net8.0/AppContextTest.dll",
Expand Down
2 changes: 0 additions & 2 deletions src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ internal sealed class TestAssemblyLoadContext : AssemblyLoadContext
{
private static readonly Logger log = InternalTrace.GetLogger(typeof(TestAssemblyLoadContext));

private readonly string _testAssemblyPath;
private readonly string _basePath;
private readonly TestAssemblyResolver _resolver;
private readonly System.Runtime.Loader.AssemblyDependencyResolver _runtimeResolver;

public TestAssemblyLoadContext(string testAssemblyPath)
{
_testAssemblyPath = testAssemblyPath;
_resolver = new TestAssemblyResolver(this, testAssemblyPath);
_basePath = Path.GetDirectoryName(testAssemblyPath);
_runtimeResolver = new AssemblyDependencyResolver(testAssemblyPath);
Expand Down
Loading
Loading