Skip to content

[browser][CoreCLR] Drop coreVfs resource support from loader #130784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelsavara merged 3 commits into from
Jul 16, 2026
Merged

[browser][CoreCLR] Drop coreVfs resource support from loader #130784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
259d53c
Drop coreVfs resource support in CoreCLR/Browser loader
Copilot Jul 15, 2026
e0e736b
feedback
pavelsavara Jul 16, 2026
d305316
Merge branch 'main' into copilot/fix-coreclr-browser-issue-121486
pavelsavara Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/native/libs/Common/JavaScript/loader/assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,6 @@ export async function prefetchAllResources(extraVfs?: VfsAsset[]): Promise<void>
// Data assets: fetch and discard
if (resources.coreAssembly) resources.coreAssembly.forEach(a => enqueueAsset(a, "assembly"));
if (resources.assembly) resources.assembly.forEach(a => enqueueAsset(a, "assembly"));
if (resources.coreVfs) resources.coreVfs.forEach(a => enqueueAsset(a, "vfs"));
if (resources.vfs) resources.vfs.forEach(a => enqueueAsset(a, "vfs"));
if (extraVfs) extraVfs.forEach(a => enqueueAsset(a, "vfs"));
if (resources.icu) resources.icu.forEach(a => enqueueAsset(a, "icu"));
Expand Down
2 changes: 0 additions & 2 deletions src/native/libs/Common/JavaScript/loader/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ function mergeResources(target: Assets, source: Assets): Assets {
source.wasmNative = [...target.wasmNative!, ...source.wasmNative || []];
source.icu = [...target.icu!, ...source.icu || []];
source.vfs = [...target.vfs!, ...source.vfs || []];
source.coreVfs = [...target.coreVfs!, ...source.coreVfs || []];
source.modulesAfterConfigLoaded = [...target.modulesAfterConfigLoaded!, ...source.modulesAfterConfigLoaded || []];
source.modulesAfterRuntimeReady = [...target.modulesAfterRuntimeReady!, ...source.modulesAfterRuntimeReady || []];
source.extensions = { ...target.extensions!, ...source.extensions || {} };
Expand Down Expand Up @@ -129,5 +128,4 @@ function normalizeResources(target: Assets) {
if (!target.satelliteResources) target.satelliteResources = {};
if (!target.extensions) target.extensions = {};
if (!target.vfs) target.vfs = [];
if (!target.coreVfs) target.coreVfs = [];
}
1 change: 0 additions & 1 deletion src/native/libs/Common/JavaScript/loader/dotnet.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ interface Assets {
modulesAfterConfigLoaded?: JsAsset[];
modulesAfterRuntimeReady?: JsAsset[];
extensions?: ResourceExtensions;
coreVfs?: VfsAsset[];
vfs?: VfsAsset[];
}
type Asset = {
Expand Down
2 changes: 0 additions & 2 deletions src/native/libs/Common/JavaScript/loader/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ export async function createRuntime(downloadOnly: boolean, httpCacheOnly: boolea
const wasmNativePromise: Promise<Response> = fetchMainWasm(resources.wasmNative[0]);

const coreAssembliesPromise = forEachResource(resources.coreAssembly, fetchAssembly);
const coreVfsPromise = forEachResource(resources.coreVfs, fetchVfs);

const icuResourceName = getIcuResourceName();
const icuDataPromise = forEachResource(resources.icu, fetchIcu, asset => asset.name === icuResourceName);
Expand Down Expand Up @@ -158,7 +157,6 @@ export async function createRuntime(downloadOnly: boolean, httpCacheOnly: boolea
await nativeModulePromiseController.promise;
runtimeState.nativeReady = true;
await coreAssembliesPromise;
await coreVfsPromise;
await vfsPromise;
await icuDataPromise;
await wasmNativePromise; // this is just to propagate errors
Expand Down
1 change: 0 additions & 1 deletion src/native/libs/Common/JavaScript/types/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ export interface Assets {
modulesAfterConfigLoaded?: JsAsset[];
modulesAfterRuntimeReady?: JsAsset[];
extensions?: ResourceExtensions;
coreVfs?: VfsAsset[];
vfs?: VfsAsset[];
}
Comment thread
pavelsavara marked this conversation as resolved.
Comment thread
pavelsavara marked this conversation as resolved.
export type Asset = {
Expand Down
1 change: 1 addition & 0 deletions src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ public class ResourcesData
[DataMember(EmitDefaultValue = false)]
public Dictionary<string, AdditionalAsset> runtimeAssets { get; set; }

// this field this only for Mono
Comment thread
pavelsavara marked this conversation as resolved.
[DataMember(EmitDefaultValue = false)]
public Dictionary<string, ResourceHashesByNameDictionary> coreVfs { get; set; }

Expand Down
Loading