[browser] load core assemblies first (#100141)

Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com> Co-authored-by: Marek Fišera <mara@neptuo.com>

Author: 3 people

eng/testing/linker/trimmingTests.targets

@@ -165,7 +165,7 @@
  <Output TaskParameter="ExitCode" PropertyName="ExecutionExitCode" />
  </Exec>
 
- <Error Condition="'$(ExecutionExitCode)' != '100'" Text="Error: [Failed Test]: %(TestConsoleApps.ProjectCompileItems). The Command %(TestConsoleApps.TestCommand) return a non-success exit code." ContinueOnError="ErrorAndContinue" />
+ <Error Condition="'$(ExecutionExitCode)' != '100'" Text="Error: [Failed Test]: %(TestConsoleApps.ProjectCompileItems). The Command %(TestConsoleApps.TestCommand) return a non-success exit code $(ExecutionExitCode)." ContinueOnError="ErrorAndContinue" />
  </Target>
 
  <Target Name="Build" DependsOnTargets="ExecuteApplications" />

src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.Shared.xml

@@ -11,6 +11,7 @@
  to be trimmed when Invariant=true, and allows for the Settings static cctor (on Unix) to be preserved when Invariant=false. -->
  <type fullname="System.Globalization.GlobalizationMode">
  <method signature="System.Boolean get_Invariant()" body="stub" value="true" feature="System.Globalization.Invariant" featurevalue="true" />
+ <method signature="System.Boolean get_InvariantNoLoad()" body="stub" value="true" feature="System.Globalization.Invariant" featurevalue="true" />
  <method signature="System.Boolean get_PredefinedCulturesOnly()" body="stub" value="true" feature="System.Globalization.PredefinedCulturesOnly" featurevalue="true" />
  </type>
  <type fullname="System.Globalization.GlobalizationMode/Settings">

src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs

@@ -628,7 +628,7 @@ private static CultureData CreateCultureWithInvariantData()
  // all available calendar type(s). The first one is the default calendar
  invariant._waCalendars = new CalendarId[] { CalendarId.GREGORIAN };
 
- if (!GlobalizationMode.Invariant)
+ if (!GlobalizationMode.InvariantNoLoad)
  {
  // Store for specific data about each calendar
  invariant._calendars = new CalendarData[CalendarData.MAX_CALENDARS];
@@ -646,7 +646,7 @@ private static CultureData CreateCultureWithInvariantData()
  invariant._iDefaultMacCodePage = 10000; // default macintosh code page
  invariant._iDefaultEbcdicCodePage = 037; // default EBCDIC code page
 
- if (GlobalizationMode.Invariant)
+ if (GlobalizationMode.InvariantNoLoad)
  {
  invariant._sLocalizedCountry = invariant._sNativeCountry;
  }
@@ -2228,7 +2228,7 @@ private string[] GetNativeDigits()
 
  internal void GetNFIValues(NumberFormatInfo nfi)
  {
- if (GlobalizationMode.Invariant || IsInvariantCulture)
+ if (GlobalizationMode.InvariantNoLoad || IsInvariantCulture)
  {
  nfi._positiveSign = _sPositiveSign!;
  nfi._negativeSign = _sNegativeSign!;

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs

@@ -25,6 +25,21 @@ private static partial class Settings
  // This allows for the whole Settings nested class to be trimmed when Invariant=true, and allows for the Settings
  // static cctor (on Unix) to be preserved when Invariant=false.
  internal static bool Invariant => Settings.Invariant;
+
+ // same as GlobalizationMode.Invariant but doesn't trigger ICU load in GlobalizationMode.Settings.cctor
+ // during runtime startup on Browser platform
+ internal static bool InvariantNoLoad
+ {
+ get
+ {
+#if TARGET_BROWSER
+ return AppContextConfigHelper.GetBooleanConfig("System.Globalization.Invariant", "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT");
+#else
+ return Settings.Invariant;
+#endif
+ }
+ }
+
 #if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
  internal static bool Hybrid => Settings.Hybrid;
 #endif

src/mono/browser/build/BrowserWasmApp.targets

@@ -156,6 +156,8 @@
  RuntimeAssetsLocation="$(WasmRuntimeAssetsLocation)"
  CacheBootResources="$(BlazorCacheBootResources)"
  RuntimeConfigJsonPath="$(_WasmRuntimeConfigFilePath)"
+ IsAot="$(RunAOTCompilation)"
+ IsMultiThreaded="$(WasmEnableThreads)"
  >
  <Output TaskParameter="FileWrites" ItemName="FileWrites" />
  </WasmAppBuilder>

src/mono/browser/runtime/assets.ts

@@ -52,6 +52,9 @@ export function instantiate_asset (asset: AssetEntry, url: string, bytes: Uint8A
  if (fileName.startsWith("/"))
  fileName = fileName.substring(1);
  if (parentDirectory) {
+ if (!parentDirectory.startsWith("/"))
+ parentDirectory = "/" + parentDirectory;
+
  mono_log_debug(`Creating directory '${parentDirectory}'`);
 
  Module.FS_createPath(
@@ -85,8 +88,7 @@ export function instantiate_asset (asset: AssetEntry, url: string, bytes: Uint8A
  } else if (asset.behavior === "pdb") {
  cwraps.mono_wasm_add_assembly(virtualName, offset!, bytes.length);
  } else if (asset.behavior === "icu") {
- if (!mono_wasm_load_icu_data(offset!))
- Module.err(`Error loading ICU asset ${asset.name}`);
+ mono_wasm_load_icu_data(offset!);
  } else if (asset.behavior === "resource") {
  cwraps.mono_wasm_add_satellite_assembly(virtualName, asset.culture || "", offset!, bytes.length);
  }

src/mono/browser/runtime/dotnet.d.ts

@@ -243,8 +243,10 @@ type ResourceExtensions = {
 };
 interface ResourceGroups {
  hash?: string;
+ coreAssembly?: ResourceList;
  assembly?: ResourceList;
  lazyAssembly?: ResourceList;
+ corePdb?: ResourceList;
  pdb?: ResourceList;
  jsModuleWorker?: ResourceList;
  jsModuleNative: ResourceList;
@@ -258,6 +260,9 @@ interface ResourceGroups {
  modulesAfterConfigLoaded?: ResourceList;
  modulesAfterRuntimeReady?: ResourceList;
  extensions?: ResourceExtensions;
+ coreVfs?: {
+ [virtualPath: string]: ResourceList;
+ };
  vfs?: {
  [virtualPath: string]: ResourceList;
  };

src/mono/browser/runtime/globals.ts

@@ -57,14 +57,16 @@ export function setRuntimeGlobals (globalObjects: GlobalObjects) {
 
  const rh: Partial<RuntimeHelpers> = {
  gitHash,
+ coreAssetsInMemory: createPromiseController<void>(),
  allAssetsInMemory: createPromiseController<void>(),
  dotnetReady: createPromiseController<any>(),
  afterInstantiateWasm: createPromiseController<void>(),
  beforePreInit: createPromiseController<void>(),
  afterPreInit: createPromiseController<void>(),
  afterPreRun: createPromiseController<void>(),
  beforeOnRuntimeInitialized: createPromiseController<void>(),
- afterMonoStarted: createPromiseController<GCHandle | undefined>(),
+ afterMonoStarted: createPromiseController<void>(),
+ afterDeputyReady: createPromiseController<GCHandle | undefined>(),
  afterIOStarted: createPromiseController<void>(),
  afterOnRuntimeInitialized: createPromiseController<void>(),
  afterPostRun: createPromiseController<void>(),

src/mono/browser/runtime/icu.ts

@@ -4,8 +4,8 @@
 import cwraps from "./cwraps";
 import { VoidPtr } from "./types/emscripten";
 
-// @offset must be the address of an ICU data archive in the native heap.
-// returns true on success.
-export function mono_wasm_load_icu_data (offset: VoidPtr): boolean {
- return (cwraps.mono_wasm_load_icu_data(offset)) === 1;
+export function mono_wasm_load_icu_data (offset: VoidPtr) {
+ if (!cwraps.mono_wasm_load_icu_data(offset)) {
+ throw new Error("Failed to load ICU data");
+ }
 }