awakecoding
diff --git a/‎src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
Lines changed: 14 additions & 9 deletions b/‎src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
Lines changed: 14 additions & 9 deletions
diff --git a/‎test/xUnit/csharp/test_NativeInterop.cs
Lines changed: 8 additions & 4 deletions b/‎test/xUnit/csharp/test_NativeInterop.cs
Lines changed: 8 additions & 4 deletions
@@ -596,17 +596,22 @@ public static unsafe class PowerShellUnsafeAssemblyLoad
         /// <summary>
         /// Load an assembly in memory from unmanaged code.
         /// </summary>
-        /// <param name="data">
-        /// Unmanaged pointer to assembly data buffer.
-        /// </param>
-        /// <param name="size">
-        /// Size in bytes of the assembly data buffer.
-        /// </param>
+        /// <param name="data">Unmanaged pointer to assembly data buffer.</param>
+        /// <param name="size">Size in bytes of the assembly data buffer.</param>
+        /// <returns>Returns zero on success and non-zero on failure</returns>
         [UnmanagedCallersOnly]
-        public static void LoadAssemblyFromNativeMemory(IntPtr data, int size)
+        public static int LoadAssemblyFromNativeMemory(IntPtr data, int size)
         {
-            using var stream = new UnmanagedMemoryStream((byte*)data, size);
-            AssemblyLoadContext.Default.LoadFromStream(stream);
+            try
+            {
+                using var stream = new UnmanagedMemoryStream((byte*)data, size);
+                AssemblyLoadContext.Default.LoadFromStream(stream);
+                return 0;
+            }
+            catch
+            {
+                return -1;
+            }
         }
     }
 }
@@ -35,17 +35,21 @@ public static void TestLoadNativeInMemoryAssembly()
             string asmFullName = SearchAssembly(asmName.Name);
             Assert.Null(asmFullName);
 
-            unsafe { LoadAssemblyTest(testDll); }
+            unsafe
+            {
+                int ret = LoadAssemblyTest(testDll);
+                Assert.Equal(0, ret);
+            }
 
             asmFullName = SearchAssembly(asmName.Name);
             Assert.Equal(asmName.FullName, asmFullName);
         }
 
-        private static unsafe void LoadAssemblyTest(string assemblyPath)
+        private static unsafe int LoadAssemblyTest(string assemblyPath)
         {
             // The 'LoadAssemblyFromNativeMemory' method is annotated with 'UnmanagedCallersOnly' attribute,
             // so we have to use the 'unmanaged' function pointer to invoke it.
-            delegate* unmanaged<IntPtr, int, void> funcPtr = &PowerShellUnsafeAssemblyLoad.LoadAssemblyFromNativeMemory;
+            delegate* unmanaged<IntPtr, int, int> funcPtr = &PowerShellUnsafeAssemblyLoad.LoadAssemblyFromNativeMemory;
 
             int length = 0;
             IntPtr nativeMem = IntPtr.Zero;
@@ -62,7 +66,7 @@ private static unsafe void LoadAssemblyTest(string assemblyPath)
                 }
 
                 // Call the function pointer.
-                funcPtr(nativeMem, length);
+                return funcPtr(nativeMem, length);
             }
             finally
             {
Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,21 @@ public static void TestLoadNativeInMemoryAssembly()`
`35`	`35`	`string asmFullName = SearchAssembly(asmName.Name);`
`36`	`36`	`Assert.Null(asmFullName);`
`37`	`37`
`38`		`- unsafe { LoadAssemblyTest(testDll); }`
	`38`	`+ unsafe`
	`39`	`+ {`
	`40`	`+ int ret = LoadAssemblyTest(testDll);`
	`41`	`+ Assert.Equal(0, ret);`
	`42`	`+ }`
`39`	`43`
`40`	`44`	`asmFullName = SearchAssembly(asmName.Name);`
`41`	`45`	`Assert.Equal(asmName.FullName, asmFullName);`
`42`	`46`	`}`
`43`	`47`
`44`		`- private static unsafe void LoadAssemblyTest(string assemblyPath)`
	`48`	`+ private static unsafe int LoadAssemblyTest(string assemblyPath)`
`45`	`49`	`{`
`46`	`50`	`// The 'LoadAssemblyFromNativeMemory' method is annotated with 'UnmanagedCallersOnly' attribute,`
`47`	`51`	`// so we have to use the 'unmanaged' function pointer to invoke it.`
`48`		`- delegate* unmanaged<IntPtr, int, void> funcPtr = &PowerShellUnsafeAssemblyLoad.LoadAssemblyFromNativeMemory;`
	`52`	`+ delegate* unmanaged<IntPtr, int, int> funcPtr = &PowerShellUnsafeAssemblyLoad.LoadAssemblyFromNativeMemory;`
`49`	`53`
`50`	`54`	`int length = 0;`
`51`	`55`	`IntPtr nativeMem = IntPtr.Zero;`
`@@ -62,7 +66,7 @@ private static unsafe void LoadAssemblyTest(string assemblyPath)`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`// Call the function pointer.`
`65`		`- funcPtr(nativeMem, length);`
	`69`	`+ return funcPtr(nativeMem, length);`
`66`	`70`	`}`
`67`	`71`	`finally`
`68`	`72`	`{`