diff --git a/docs/using-nativeaot/compiling.md b/docs/using-nativeaot/compiling.md index aecfc85de93d..616de71bac69 100644 --- a/docs/using-nativeaot/compiling.md +++ b/docs/using-nativeaot/compiling.md @@ -61,18 +61,20 @@ Install and activate Emscripten. See [Install Emscripten](https://emscripten.org For WebAssembly, it is always a cross-architecture scenario as the compiler runs on Windows/Linux/MacOS and the runtime is for WebAssembly. WebAssembly is not integrated into the main ILCompiler so first remove (if you added it from above) ```xml - + ``` Then, the required package reference is ```xml - + ``` and the publish command (there is no Release build currently) ```bash > dotnet publish -r browser-wasm -c Debug /p:TargetArchitecture=wasm /p:PlatformTarget=AnyCPU /p:MSBuildEnableWorkloadResolver=false --self-contained ``` +Publishing using `PublishAot=true` is not currently supported for WebAssembly. + Note that the wasm-tools workload is identified as a dependency even though its not used, and this confuses the toolchain, hence `/p:MSBuildEnableWorkloadResolver=false` #### WebAssembly native libraries diff --git a/docs/workflow/building/coreclr/nativeaot.md b/docs/workflow/building/coreclr/nativeaot.md index 5099c170f386..e9231c247d3c 100644 --- a/docs/workflow/building/coreclr/nativeaot.md +++ b/docs/workflow/building/coreclr/nativeaot.md @@ -95,8 +95,8 @@ Working on the Jit itself, one possible workflow is taking advantage of the gene It is also possible to publish an ordinary console project for Wasm using packages produced by the build: `build nativeaot.packages && build nativeaot.packages -a wasm -os Browser`, assuming all the binaries mentioned above have been built (note that the order is important - the build always produces an architecture-independent package that has a dependency on an architecture-dependent one, and we want that architecture-dependent package to be built for Wasm). Add the `path-to-repo/artifacts/packages/[Debug|Release]/Shipping` directory to your project's `NuGet.Config`, and the following two references to the project file itself: ```xml - - + + ``` You should now be able to publish the project for Wasm: `dotnet publish --self-contained -r browser-wasm /p:MSBuildEnableWorkloadResolver=false`. This produces `YourApp.html` and `YourApp.js` files under `bin\\\browser-wasm\native`. The former can be opened in the browser, the latter - run via NodeJS. diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.LLVM.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.LLVM.targets index 0a9e302d90ad..fb9c254e3e66 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.LLVM.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.LLVM.targets @@ -1,4 +1,5 @@ + diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets index 1dedec027cdb..b649f8cc6de7 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets @@ -54,22 +54,23 @@ - - - - + + + + true + - - @(ResolvedILCompilerPack->'%(PackageDirectory)') - @(ResolvedTargetILCompilerPack->'%(PackageDirectory)') - @(ResolvedILCompilerPack->'%(PackageDirectory)') - + + + - + %(PackageDefinitions.ResolvedPath) %(PackageDefinitions.ResolvedPath)