diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs index bff02ea6bac5c5..9bae4217c8cb58 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs @@ -29,7 +29,7 @@ public partial class AssemblyLoadContext [RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")] [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "AssemblyNative_LoadFromPath", StringMarshalling = StringMarshalling.Utf16)] - private static partial void LoadFromPath(IntPtr ptrNativeAssemblyBinder, string? ilPath, string? niPath, ObjectHandleOnStack retAssembly); + private static partial void LoadFromPath(IntPtr ptrNativeAssemblyBinder, string? ilPath, ObjectHandleOnStack retAssembly); internal static Assembly[] GetLoadedAssemblies() { @@ -61,10 +61,10 @@ internal static Assembly[] GetLoadedAssemblies() internal static partial bool TraceSatelliteSubdirectoryPathProbed(string filePath, int hResult); [RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")] - private RuntimeAssembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath) + private RuntimeAssembly InternalLoadFromPath(string? assemblyPath) { RuntimeAssembly? loadedAssembly = null; - LoadFromPath(_nativeAssemblyLoadContext, assemblyPath, nativeImagePath, ObjectHandleOnStack.Create(ref loadedAssembly)); + LoadFromPath(_nativeAssemblyLoadContext, assemblyPath, ObjectHandleOnStack.Create(ref loadedAssembly)); return loadedAssembly!; } diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.NativeAot.cs index 9c2206e87a860c..0103e5fe54d75a 100644 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.NativeAot.cs +++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.NativeAot.cs @@ -41,7 +41,7 @@ public void StartProfileOptimization(string profile) { } - private static Assembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath) + private static Assembly InternalLoadFromPath(string? assemblyPath) { ArgumentNullException.ThrowIfNull(assemblyPath); diff --git a/src/coreclr/vm/assemblynative.cpp b/src/coreclr/vm/assemblynative.cpp index 17c2f079eaae04..97ee4dfc6dfbab 100644 --- a/src/coreclr/vm/assemblynative.cpp +++ b/src/coreclr/vm/assemblynative.cpp @@ -196,7 +196,7 @@ Assembly* AssemblyNative::LoadFromPEImage(AssemblyBinder* pBinder, PEImage *pIma RETURN pCurDomain->LoadAssembly(&spec, pPEAssembly, FILE_LOADED); } -extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, LPCWSTR pwzNIPath, QCall::ObjectHandleOnStack retLoadedAssembly) +extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, QCall::ObjectHandleOnStack retLoadedAssembly) { QCALL_CONTRACT; diff --git a/src/coreclr/vm/assemblynative.hpp b/src/coreclr/vm/assemblynative.hpp index df89823fb38c33..9a4a9ad9a0df9c 100644 --- a/src/coreclr/vm/assemblynative.hpp +++ b/src/coreclr/vm/assemblynative.hpp @@ -115,7 +115,7 @@ extern "C" void QCALLTYPE AssemblyNative_PrepareForAssemblyLoadContextRelease(IN extern "C" void QCALLTYPE AssemblyNative_InternalLoad(NativeAssemblyNameParts* pAssemblyName, QCall::ObjectHandleOnStack requestingAssembly, QCall::StackCrawlMarkHandle stackMark,BOOL fThrowOnFileNotFound, QCall::ObjectHandleOnStack assemblyLoadContext, QCall::ObjectHandleOnStack retAssembly); -extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, LPCWSTR pwzNIPath, QCall::ObjectHandleOnStack retLoadedAssembly); +extern "C" void QCALLTYPE AssemblyNative_LoadFromPath(INT_PTR ptrNativeAssemblyBinder, LPCWSTR pwzILPath, QCall::ObjectHandleOnStack retLoadedAssembly); extern "C" void QCALLTYPE AssemblyNative_LoadFromStream(INT_PTR ptrNativeAssemblyBinder, INT_PTR ptrAssemblyArray, INT32 cbAssemblyArrayLength, INT_PTR ptrSymbolArray, INT32 cbSymbolArrayLength, QCall::ObjectHandleOnStack retLoadedAssembly); #ifdef TARGET_WINDOWS diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs index 6b4d7ce9a21b07..569e1c039d3b18 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs @@ -345,7 +345,7 @@ public Assembly LoadFromAssemblyPath(string assemblyPath) { VerifyIsAlive(); - return InternalLoadFromPath(assemblyPath, null); + return InternalLoadFromPath(assemblyPath); } } @@ -368,7 +368,7 @@ public Assembly LoadFromNativeImagePath(string nativeImagePath, string? assembly { VerifyIsAlive(); - return InternalLoadFromPath(assemblyPath, nativeImagePath); + return InternalLoadFromPath(assemblyPath); } } diff --git a/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs index 57db6533e5d04a..65c8025483a900 100644 --- a/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs @@ -43,16 +43,13 @@ private static void KeepLoaderAllocator() [RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")] [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod -#pragma warning disable IDE0060 - private Assembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath) + private Assembly InternalLoadFromPath(string? assemblyPath) { StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller; assemblyPath = assemblyPath?.Replace('\\', Path.DirectorySeparatorChar); - // TODO: Handle nativeImagePath return InternalLoadFile(NativeALC, assemblyPath, ref stackMark); } -#pragma warning restore IDE0060 [RequiresUnreferencedCode("Types and members the loaded assembly depends on might be removed")] internal Assembly InternalLoad(ReadOnlySpan arrAssembly, ReadOnlySpan arrSymbols)