Skip to content

Commit d97bba4

Browse files
davidwrightonCopilotAndyAyersMS
authored
Enable System.Private.CoreLib for testing in CoreRun scenarios (dotnet#131493)
Enable System.Private.CoreLib for testing R2R and WASM. At least one of the suites id known to pass with this enabled. This PR is testing to see how many other failures there are. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Andy Ayers <andya@microsoft.com> Copilot-Session: a5c93aa6-580b-4f11-ac30-860081fab183
1 parent cd7b92a commit d97bba4

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

src/coreclr/crossgen-corelib.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</PropertyGroup>
7373

7474
<PropertyGroup Condition="'$(PublishReadyToRunContainerFormat)' == 'wasm'">
75-
<CrossgenCoreLibOutputPath>$([MSBuild]::NormalizePath('$(BinDir)', '$(CoreLibAssemblyName).NotReadyYet.wasm'))</CrossgenCoreLibOutputPath>
75+
<CrossgenCoreLibOutputPath>$([MSBuild]::NormalizePath('$(BinDir)', '$(CoreLibAssemblyName).wasm'))</CrossgenCoreLibOutputPath>
7676
</PropertyGroup>
7777

7878
<PropertyGroup Condition="'$(UseComposite)' == 'true'">

src/coreclr/hosts/corerun/corerun.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,10 @@ static bool HOST_CONTRACT_CALLTYPE external_assembly_probe(
385385
std::string full_path = dir;
386386
assert(full_path.back() == pal::dir_delim);
387387
full_path.append(name);
388+
#ifdef TARGET_BROWSER
389+
if (BrowserHost_ExternalAssemblyProbe(full_path.c_str(), data_start, size))
390+
return true;
391+
#endif // TARGET_BROWSER
388392
if (pal::try_map_file_readonly(full_path.c_str(), data_start, size))
389393
return true;
390394
}

0 commit comments

Comments
 (0)