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

Allow loading dlls with arbitrary extensions

This commit is contained in:
Steve Sanderson 2020-03-04 10:46:08 +00:00
parent 4c8a17435a
commit 98cd3ab349
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Components/Web.JS/dist/Release/blazor.server.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
src/Components/Web.JS/dist/Release/blazor.webassembly.js generated vendored
View File

File diff suppressed because one or more lines are too long

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

@ -198,11 +198,13 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
MONO.loaded_files = []; MONO.loaded_files = [];
// 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
// Mono requires the assembly filenames to have a '.dll' extension, so supply such names regardless
// of the extensions in the URLs. This allows loading assemblies with arbitrary filenames.
resourceLoader.loadResources(resources.assembly, filename => `_framework/_bin/${filename}`) resourceLoader.loadResources(resources.assembly, filename => `_framework/_bin/${filename}`)
.forEach(addResourceAsAssembly); .forEach(r => addResourceAsAssembly(r, changeExtension(r.name, '.dll')));
if (resources.pdb) { if (resources.pdb) {
resourceLoader.loadResources(resources.pdb, filename => `_framework/_bin/${filename}`) resourceLoader.loadResources(resources.pdb, filename => `_framework/_bin/${filename}`)
.forEach(addResourceAsAssembly); .forEach(r => addResourceAsAssembly(r, r.name));
} }
}); });
@ -222,7 +224,7 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
return module; return module;
async function addResourceAsAssembly(dependency: LoadingResource) { async function addResourceAsAssembly(dependency: LoadingResource, loadAsName: string) {
const runDependencyId = `blazor:${dependency.name}`; const runDependencyId = `blazor:${dependency.name}`;
Module.addRunDependency(runDependencyId); Module.addRunDependency(runDependencyId);
@ -235,7 +237,7 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
const heapAddress = Module._malloc(data.length); const heapAddress = Module._malloc(data.length);
const heapMemory = new Uint8Array(Module.HEAPU8.buffer, heapAddress, data.length); const heapMemory = new Uint8Array(Module.HEAPU8.buffer, heapAddress, data.length);
heapMemory.set(data); heapMemory.set(data);
mono_wasm_add_assembly(dependency.name, heapAddress, data.length); mono_wasm_add_assembly(loadAsName, heapAddress, data.length);
MONO.loaded_files.push(toAbsoluteUrl(dependency.url)); MONO.loaded_files.push(toAbsoluteUrl(dependency.url));
} catch (errorInfo) { } catch (errorInfo) {
onError(errorInfo); onError(errorInfo);
@ -322,3 +324,12 @@ async function compileWasmModule(wasmResource: LoadingResource, imports: any): P
const arrayBufferResult = await WebAssembly.instantiate(arrayBuffer, imports); const arrayBufferResult = await WebAssembly.instantiate(arrayBuffer, imports);
return arrayBufferResult.instance; return arrayBufferResult.instance;
} }
function changeExtension(filename: string, newExtensionWithLeadingDot: string) {
const lastDotIndex = filename.lastIndexOf('.');
if (lastDotIndex < 0) {
throw new Error(`No extension to replace in '${filename}'`);
}
return filename.substr(0, lastDotIndex) + newExtensionWithLeadingDot;
}