[automated] Merge branch 'release/7.0' => 'release/7.0-staging'

NuGet.config

@@ -9,7 +9,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-edbcdac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-edbcdace/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-b0eec69" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b0eec69e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!--

eng/Version.Details.xml

@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.23115.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.23211.1">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>8f5f53bc4ac6f86aa1f4044a5ec0095cfb231713</Sha>
+      <Sha>dcfe6c939c3ee3701ad0902a51ade8d737a193da</Sha>
     </Dependency>
     <Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22459.1">
       <Uri>https://github.com/dotnet/msquic</Uri>
@@ -50,85 +50,85 @@
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.6">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>edbcdace786fb39c68c0b8b1038272f480d09598</Sha>
+      <Sha>b0eec69ee7bdab81823db7d6482cb6cff9f07e48</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.6">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>edbcdace786fb39c68c0b8b1038272f480d09598</Sha>
+      <Sha>b0eec69ee7bdab81823db7d6482cb6cff9f07e48</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
     <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -258,9 +258,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23164.3">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23211.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
+      <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

@@ -53,22 +53,22 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.23164.3</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23164.3</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>7.0.0-beta.23164.3</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23164.3</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23164.3</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23164.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23164.3</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23164.3</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23164.3</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.23211.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23211.2</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>7.0.0-beta.23211.2</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23211.2</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23211.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23211.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23211.2</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23211.2</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23211.2</MicrosoftDotNetPackageTestingVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->
@@ -177,7 +177,7 @@
     <MicrosoftNETILLinkTasksVersion>7.0.100-1.23207.1</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23115.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23211.1</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <MicrosoftNativeQuicMsQuicVersion>2.1.1</MicrosoftNativeQuicMsQuicVersion>
     <SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>

eng/common/native/init-compiler.sh

@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
     # Set default versions
     if [[ -z "$majorVersion" ]]; then
         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
+        if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
         elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
 
         for version in "${versions[@]}"; do

eng/pipelines/runtime-extra-platforms-other.yml

@@ -143,7 +143,7 @@ jobs:
     jobParameters:
       testScope: innerloop
       nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
+      buildArgs: -s mono+mono.mscordbi+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
       timeoutInMinutes: 120
       condition: >-
         or(

eng/pipelines/runtime-official.yml

@@ -144,7 +144,7 @@ stages:
       # - windows_arm
       # - windows_arm64
       jobParameters:
-        buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig)
+        buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
         nameSuffix: AllSubsets_Mono
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
@@ -159,7 +159,7 @@ stages:
       platforms:
       - Browser_wasm
       jobParameters:
-        buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig) /p:MonoWasmBuildVariant=perftrace
+        buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoWasmBuildVariant=perftrace
         nameSuffix: AllSubsets_Mono_perftrace
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         runtimeVariant: perftrace
@@ -175,7 +175,7 @@ stages:
       platforms:
       - Browser_wasm
       jobParameters:
-        buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig) /p:MonoWasmBuildVariant=multithread
+        buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoWasmBuildVariant=multithread
         nameSuffix: AllSubsets_Mono_multithread
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         runtimeVariant: multithread

global.json

@@ -1,16 +1,16 @@
 {
   "sdk": {
-    "version": "7.0.104",
+    "version": "7.0.105",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "7.0.104"
+    "dotnet": "7.0.105"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3",
-    "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23164.3",
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23211.2",
+    "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23211.2",
     "Microsoft.Build.NoTargets": "3.5.0",
     "Microsoft.Build.Traversal": "3.1.6",
     "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/InteropHelpers.cs

@@ -309,8 +309,8 @@ internal static unsafe void FixupModuleCell(ModuleFixupCell* pCell)
 
                 hModule = NativeLibrary.LoadBySearch(
                     callingAssembly,
-                    searchAssemblyDirectory: false,
-                    dllImportSearchPathFlags: 0,
+                    searchAssemblyDirectory: (dllImportSearchPath & (uint)DllImportSearchPath.AssemblyDirectory) != 0,
+                    dllImportSearchPathFlags: (int)(dllImportSearchPath & ~(uint)DllImportSearchPath.AssemblyDirectory),
                     ref loadLibErrorTracker,
                     moduleName);
 

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.cs

@@ -20,7 +20,7 @@ internal static IntPtr LoadLibraryByName(string libraryName, Assembly assembly,
             bool searchAssemblyDirectory;
             if (searchPath.HasValue)
             {
-                searchPathFlags = (int)(searchPath.Value & ~DllImportSearchPath.AssemblyDirectory);
+                searchPathFlags = (int)(searchPath!.Value & ~DllImportSearchPath.AssemblyDirectory);
                 searchAssemblyDirectory = (searchPath.Value & DllImportSearchPath.AssemblyDirectory) != 0;
             }
             else

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeMethodFixupNode.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Reflection.Metadata;
 using System.Runtime.InteropServices;
 
 using Internal.IL.Stubs;
@@ -97,23 +98,35 @@ public PInvokeMethodData(PInvokeLazyFixupField pInvokeLazyFixupField)
             PInvokeMetadata metadata = pInvokeLazyFixupField.PInvokeMetadata;
             ModuleDesc declaringModule = ((MetadataType)pInvokeLazyFixupField.TargetMethod.OwningType).Module;
 
-            DllImportSearchPath? dllImportSearchPath = default;
-            if (declaringModule.Assembly is EcmaAssembly asm)
+            CustomAttributeValue<TypeDesc>? decodedAttr = null;
+
+            // Look for DefaultDllImportSearchPath on the method
+            if (pInvokeLazyFixupField.TargetMethod is EcmaMethod method)
+            {
+                decodedAttr = method.GetDecodedCustomAttribute("System.Runtime.InteropServices", "DefaultDllImportSearchPathsAttribute");
+            }
+
+            // If the attribute it wasn't found on the method, look for it on the assembly
+            if (!decodedAttr.HasValue && declaringModule.Assembly is EcmaAssembly asm)
             {
                 // We look for [assembly:DefaultDllImportSearchPaths(...)]
                 var attrHandle = asm.MetadataReader.GetCustomAttributeHandle(asm.AssemblyDefinition.GetCustomAttributes(),
                     "System.Runtime.InteropServices", "DefaultDllImportSearchPathsAttribute");
                 if (!attrHandle.IsNil)
                 {
                     var attr = asm.MetadataReader.GetCustomAttribute(attrHandle);
-                    var decoded = attr.DecodeValue(new CustomAttributeTypeProvider(asm));
-                    if (decoded.FixedArguments.Length == 1 &&
-                        decoded.FixedArguments[0].Value is int searchPath)
-                    {
-                        dllImportSearchPath = (DllImportSearchPath)searchPath;
-                    }
+                    decodedAttr = attr.DecodeValue(new CustomAttributeTypeProvider(asm));
                 }
             }
+
+            DllImportSearchPath? dllImportSearchPath = default;
+            if (decodedAttr.HasValue
+                && decodedAttr.Value.FixedArguments.Length == 1
+                && decodedAttr.Value.FixedArguments[0].Value is int searchPath)
+            {
+                dllImportSearchPath = (DllImportSearchPath)searchPath;
+            }
+
             ModuleData = new PInvokeModuleData(metadata.Module, dllImportSearchPath, declaringModule);
 
             EntryPointName = metadata.Name;