huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wtgodbe/MergePreview8' of https://github.com/dotnet/aspnetcore into wtgodbe/MergePreview8

This commit is contained in:
Will Godbe 2020-08-28 09:14:25 -07:00
parent 72a7635b62 f883065f3e
commit 96b1c236d0
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
View File

@ -256,9 +256,6 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
`_framework/${icuDataResourceName}`, `_framework/${icuDataResourceName}`,
resourceLoader.bootConfig.resources.runtime[icuDataResourceName], resourceLoader.bootConfig.resources.runtime[icuDataResourceName],
'globalization'); 'globalization');
} else {
// Use invariant culture if the app does not carry icu data.
MONO.mono_wasm_setenv("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1");
} }
// Override the mechanism for fetching the main wasm file so we can connect it to our cache // Override the mechanism for fetching the main wasm file so we can connect it to our cache
@ -288,6 +285,9 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
if (icuDataResource) { if (icuDataResource) {
loadICUData(icuDataResource); loadICUData(icuDataResource);
} else {
// Use invariant culture if the app does not carry icu data.
MONO.mono_wasm_setenv("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1");
} }
// Fetch the assemblies and PDBs in the background, telling Mono to wait until they are loaded // Fetch the assemblies and PDBs in the background, telling Mono to wait until they are loaded
@ -382,12 +382,6 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
// Turn off full-gc to prevent browser freezing. // Turn off full-gc to prevent browser freezing.
const mono_wasm_enable_on_demand_gc = cwrap('mono_wasm_enable_on_demand_gc', null, ['number']); const mono_wasm_enable_on_demand_gc = cwrap('mono_wasm_enable_on_demand_gc', null, ['number']);
mono_wasm_enable_on_demand_gc(0); mono_wasm_enable_on_demand_gc(0);
let timeZone = "UTC";
try {
timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
} catch { }
MONO.mono_wasm_setenv("TZ", timeZone);
const load_runtime = cwrap('mono_wasm_load_runtime', null, ['string', 'number']); const load_runtime = cwrap('mono_wasm_load_runtime', null, ['string', 'number']);
// -1 enables debugging with logging disabled. 0 disables debugging entirely. // -1 enables debugging with logging disabled. 0 disables debugging entirely.
load_runtime(appBinDirName, hasDebuggingEnabled() ? -1 : 0); load_runtime(appBinDirName, hasDebuggingEnabled() ? -1 : 0);

3
src/Grpc/test/InteropTests/InteropTests.csproj
View File

@ -3,9 +3,6 @@
<PropertyGroup> <PropertyGroup>
<ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets> <ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework> <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<!-- https://github.com/dotnet/aspnetcore/issues/24182 -->
<BuildHelixPayload>false</BuildHelixPayload>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>