Skip to content

[browser] Library mode without workload #122607

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

Draft
maraf wants to merge 7 commits into
base: main
Choose a base branch
from
+27 −17
Draft

[browser] Library mode without workload #122607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5045603
Library mode without workload
maraf Dec 17, 2025
b3709e4
Fix
maraf Dec 17, 2025
991951b
Fix
maraf Dec 17, 2025
5f80cfd
Fix LibraryMode test to expect publish failure without WASM SDK (#122…
Copilot Dec 17, 2025
24c1136
Merge branch 'main' into maraf/BrowserLibraryModeNoWorkload
maraf Dec 18, 2025
5d9b507
Move the test to no-workload
maraf Dec 18, 2025
9985286
Empty _UsingBlazorOrWasmSdk shouldn't trigger requirement for workload
maraf Dec 18, 2025
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
9 changes: 0 additions & 9 deletions src/mono/browser/build/BrowserWasmApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,6 @@
<ProjectCapability Include="DotNetCoreWeb"/>
</ItemGroup>

<!-- When trimming non-exe projects, root the whole intermediate assembly. -->
<Target Name="_RootEntireIntermediateAssembly" AfterTargets="PrepareForILLink" BeforeTargets="_RunILLink" Condition="'$(RuntimeIdentifier)' == 'browser-wasm' And '$(OutputType)' == 'Library'">
<ItemGroup>
<TrimmerRootAssembly Condition="'%(Identity)' == '@(IntermediateAssembly)'">
<RootMode>all</RootMode>
</TrimmerRootAssembly>
</ItemGroup>
</Target>

<Import Project="$(MSBuildThisFileDirectory)EmSdkRepo.Defaults.props" Condition="'$(WasmUseEMSDK_PATH)' == 'true'" />
<Target Name="_SetupEmscripten" BeforeTargets="_SetupToolchain">
<PropertyGroup>
Expand Down
9 changes: 9 additions & 0 deletions ...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,4 +932,13 @@ Copyright (c) .NET Foundation. All rights reserved.
Condition="Exists('$(_DotnetTypesSourcePath)')"
SkipUnchangedFiles="true" />
</Target>

<!-- When trimming non-exe projects, root the whole intermediate assembly. -->
<Target Name="_RootEntireIntermediateAssembly" AfterTargets="PrepareForILLink" BeforeTargets="_RunILLink" Condition="'$(RuntimeIdentifier)' == 'browser-wasm' And '$(OutputType)' == 'Library'">
<ItemGroup>
<TrimmerRootAssembly Condition="'%(Identity)' == '@(IntermediateAssembly)'">
<RootMode>all</RootMode>
</TrimmerRootAssembly>
</ItemGroup>
</Target>
</Project>
1 change: 0 additions & 1 deletion .../nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
'$(WasmProfilers)' != '' or
'$(RunAOTCompilation)' == 'true' or
'$(WasmBuildNative)' == 'true' or
'$(_UsingBlazorOrWasmSdk)' != 'true' or
'$(EmccInitialHeapSize)' != '' or
'$(EmccMaximumHeapSize)' != '' " >true</_WasmNativeWorkloadNeeded>

Expand Down
25 changes: 18 additions & 7 deletions src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,12 @@ void AssertFile(string suffix)
}
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task LibraryModeBuild(bool useWasmSdk)
[Theory, TestCategory("no-workload")]
[InlineData(false, false)]
[InlineData(true, false)]
[InlineData(false, true)]
[InlineData(true, true)]
public async Task LibraryMode(bool useWasmSdk, bool isPublish)
{
var config = Configuration.Release;
ProjectInfo info = CopyTestAsset(config, aot: false, TestAsset.LibraryModeTestApp, "libraryMode");
Expand All @@ -309,13 +311,22 @@ public async Task LibraryModeBuild(bool useWasmSdk)
{ "Microsoft.NET.Sdk.WebAssembly", "Microsoft.NET.Sdk" }
});
}
BuildProject(info, config, new BuildOptions(AssertAppBundle: useWasmSdk));

// Publishing without WASM SDK is expected to fail
bool expectSuccess = useWasmSdk || !isPublish;
if (isPublish)
PublishProject(info, config, new PublishOptions(AssertAppBundle: useWasmSdk, ExpectSuccess: expectSuccess));
else
BuildProject(info, config, new BuildOptions(AssertAppBundle: useWasmSdk, ExpectSuccess: expectSuccess));

if (useWasmSdk)
{
var result = await RunForBuildWithDotnetRun(new BrowserRunOptions(config, ExpectedExitCode: 100));
var result = isPublish
? await RunForPublishWithWebServer(new BrowserRunOptions(config, ExpectedExitCode: 100))
: await RunForBuildWithDotnetRun(new BrowserRunOptions(config, ExpectedExitCode: 100));

Assert.Contains("WASM Library MyExport is called", result.TestOutput);
}

}

[Theory]
Expand Down
Loading