Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/nuget/Microsoft.NET.Test.Sdk-17…
Browse files Browse the repository at this point in the history
….6.1
  • Loading branch information
OsirisTerje committed Jun 3, 2023
2 parents 858dbb7 + f4eaedd commit 0d60bbe
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -27,7 +27,7 @@
using System.Reflection;
using NUnit.VisualStudio.TestAdapter.Internal;

#if !NET462
#if !NET462 && !NETSTANDARD
using System.Runtime.Loader;
#endif

Expand Down Expand Up @@ -84,7 +84,7 @@ private static MethodInfo TryGetSingleMethod(string assemblyPath, string reflect
{
try
{
#if !NET462
#if !NET462 && !NETSTANDARD
var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath);
#else
var assembly = Assembly.LoadFrom(assemblyPath);
Expand Down

0 comments on commit 0d60bbe

Please sign in to comment.