From 39916defb9a00c9efb941a3600d912f9c5c692cd Mon Sep 17 00:00:00 2001 From: Aaron R Robinson Date: Tue, 8 Aug 2023 09:04:58 -0700 Subject: [PATCH 1/3] Add note about NAOT --- .../DllImportSearchPath.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xml/System.Runtime.InteropServices/DllImportSearchPath.xml b/xml/System.Runtime.InteropServices/DllImportSearchPath.xml index a159588d6d1..48dff3335f0 100644 --- a/xml/System.Runtime.InteropServices/DllImportSearchPath.xml +++ b/xml/System.Runtime.InteropServices/DllImportSearchPath.xml @@ -49,11 +49,11 @@ Specifies the paths that are used to search for DLLs that provide functions for platform invokes. - attribute to apply a set of paths to an entire assembly or to an individual platform invoke. - + attribute to apply a set of paths to an entire assembly or to an individual platform invoke. + ]]> @@ -137,7 +137,7 @@ 2 - When searching for assembly dependencies, include the directory that contains the assembly itself, and search that directory first. This value is used by the .NET Framework, before the paths are passed to the Win32 LoadLibraryEx function. + When searching for assembly dependencies, include the directory that contains the assembly itself, and search that directory first. When used in NativeAOT, the application's directory is considered the "assembly directory" and searched. This value is used by the .NET Framework, before the paths are passed to the Win32 LoadLibraryEx function. From ca298558c9db8d1935cde74c5025cbda2d6e0b40 Mon Sep 17 00:00:00 2001 From: Aaron R Robinson Date: Tue, 8 Aug 2023 14:46:04 -0700 Subject: [PATCH 2/3] Review feedback --- xml/System.Runtime.InteropServices/DllImportSearchPath.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/System.Runtime.InteropServices/DllImportSearchPath.xml b/xml/System.Runtime.InteropServices/DllImportSearchPath.xml index 48dff3335f0..1c62398b109 100644 --- a/xml/System.Runtime.InteropServices/DllImportSearchPath.xml +++ b/xml/System.Runtime.InteropServices/DllImportSearchPath.xml @@ -137,7 +137,7 @@ 2 - When searching for assembly dependencies, include the directory that contains the assembly itself, and search that directory first. When used in NativeAOT, the application's directory is considered the "assembly directory" and searched. This value is used by the .NET Framework, before the paths are passed to the Win32 LoadLibraryEx function. + When searching for assembly dependencies, include the directory that contains the assembly itself, and search that directory first. When used in Native AOT and single-file scenarios, the application's installation directory is considered the "assembly directory" and is searched. @@ -178,7 +178,7 @@ 0 - Search the application directory, and then call the Win32 [LoadLibraryEx](https://go.microsoft.com/fwlink/?LinkId=236091) function with the LOAD_WITH_ALTERED_SEARCH_PATH flag. This value is ignored if any other value is specified. Operating systems that do not support the attribute use this value, and ignore other values. + Search the application directory, and then call the Win32 LoadLibraryEx function with the LOAD_WITH_ALTERED_SEARCH_PATH flag. This value is ignored if any other value is specified. Operating systems that do not support the attribute use this value, and ignore other values. From b819851bc0b3882de2158b6e8d83ea0f37a6ac7c Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Tue, 8 Aug 2023 15:17:24 -0700 Subject: [PATCH 3/3] Update xml/System.Runtime.InteropServices/DllImportSearchPath.xml Co-authored-by: Jan Kotas --- xml/System.Runtime.InteropServices/DllImportSearchPath.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/System.Runtime.InteropServices/DllImportSearchPath.xml b/xml/System.Runtime.InteropServices/DllImportSearchPath.xml index 1c62398b109..3aeb22408f2 100644 --- a/xml/System.Runtime.InteropServices/DllImportSearchPath.xml +++ b/xml/System.Runtime.InteropServices/DllImportSearchPath.xml @@ -137,7 +137,7 @@ 2 - When searching for assembly dependencies, include the directory that contains the assembly itself, and search that directory first. When used in Native AOT and single-file scenarios, the application's installation directory is considered the "assembly directory" and is searched. + When searching for assembly dependencies, include the directory that contains the assembly itself, and search that directory first. When used in Native AOT and single-file deployment models, the application's installation directory is considered the "assembly directory" and is searched.