Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2cd8db0
Copy native wasm files to runtime pack
maraf Dec 12, 2025
0f58a1c
Register CoreCLR.sfxproj to get RuntimeList.xml
maraf Dec 12, 2025
301d804
WasmTestRunner and WasmSymbolicator
maraf Dec 12, 2025
61dbd7f
Don't import Mono NativeBuild targets for CoreCLR
maraf Dec 12, 2025
8066b26
Mono Sample with CoreCLR
maraf Dec 12, 2025
7d2620b
Defaults for CoreCLR on wasm
maraf Dec 12, 2025
15a1b5d
Placeholder for CoreCLR native build
maraf Dec 12, 2025
ff67465
Append .dll extention to mainAssemblyName
maraf Dec 12, 2025
8212ed6
Copy test runners
maraf Dec 12, 2025
5d4e456
Merge remote-tracking branch 'upstream/main' into BrowserCoreClrInTree
maraf Dec 15, 2025
55f90fb
Wasm.Build.Tests SDK
maraf Dec 15, 2025
63af39e
Skip InstallWorkloadFromArtifacts if no workloads selected
maraf Dec 16, 2025
2a736b1
WBT running main
maraf Dec 16, 2025
a7ee811
Prepare for skipping files from coreclr runtime pack
maraf Dec 16, 2025
84b8780
Pass DefaultTargetFramework to running browser
maraf Dec 16, 2025
5117784
Default to TestUsingWorkloads=false when RuntimeFlavor=CoreCLR
maraf Dec 16, 2025
54bc98f
Publish build artifacts
maraf Dec 16, 2025
03d4bcd
Include SDK related packages in coreclr-packages.proj
maraf Dec 17, 2025
e4baffa
Build Wasm.Build.Tests on CI for CoreCLR
maraf Dec 17, 2025
e2717cb
Build Wasm.Build.Tests on CI for CoreCLR (unique name)
maraf Dec 17, 2025
1c01837
Fix paths
maraf Dec 17, 2025
e9918f1
Build Wasm.Build.Tests on CI for CoreCLR (configuration=debug)
maraf Dec 17, 2025
ecdf53e
Build Wasm.Build.Tests on CI for CoreCLR (TestUsingWorkloads=false)
maraf Dec 17, 2025
5bbf891
Typo
maraf Dec 17, 2025
4e6dfa6
Fix RuntimeFlavor for build. Apply -trait CoreCLR. Reduce Scenarios f…
maraf Dec 18, 2025
7a53945
RuntimeFlavor for WBT on Mono
maraf Dec 18, 2025
8329823
BundlerFriendly WBT only on Mono
maraf Dec 18, 2025
ed443f1
RuntimeFlavor=Mono for linker-tests
maraf Dec 18, 2025
22c1723
testRunNamePrefixSuffix for CoreCLR
maraf Dec 18, 2025
23f7560
Merge branch 'main' into BrowserCoreClrInTree
maraf Dec 18, 2025
db6086e
Update eng/testing/tests.browser.targets
maraf Dec 18, 2025
59968bd
Async main. Assert runtime pack name. Remove unused MSBuild value
maraf Dec 18, 2025
6d491ed
Merge branch 'main' into BrowserCoreClrInTree
maraf Dec 18, 2025
731d877
fix?
pavelsavara Dec 19, 2025
4eef793
disable asyncV2 for now
pavelsavara Dec 19, 2025
48f9df3
KnownWebAssemblySdkPack
maraf Dec 19, 2025
7fdab9e
fix
pavelsavara Dec 19, 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
Prev Previous commit
Next Next commit
Don't import Mono NativeBuild targets for CoreCLR
  • Loading branch information
maraf committed Dec 12, 2025
commit 61dbd7f1d086901c15079438b1c7e7ebaaaac0cc
2 changes: 1 addition & 1 deletion src/mono/browser/build/WasmApp.InTree.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<Import Sdk="Microsoft.NET.Sdk.WebAssembly" Project="Sdk.props" Condition="'$(UsingNativeAOT)' != 'true' and '$(UsingMicrosoftNETSdkWebAssembly)' == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)BrowserWasmApp.props" Condition="'$(UsingNativeAOT)' != 'true'" />
<Import Project="$(MSBuildThisFileDirectory)BrowserWasmApp.props" Condition="'$(UsingNativeAOT)' != 'true' and '$(RuntimeFlavor)' == 'Mono'" />

<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsOutputTypeLibrary)' == 'true'">
<OutputType>library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/browser/build/WasmApp.InTree.targets
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<!-- TODO: this breaks runtime tests on Helix due to the file not being there for some reason. Once this is fixed we can remove the UpdateRuntimePack target here -->
<Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" Condition="'$(TargetingpacksTargetsImported)' != 'true' and '$(ImportTargetingPacksTargetsInWasmAppTargets)' == 'true'"/>
<Import Project="$(MSBuildThisFileDirectory)BrowserWasmApp.targets" Condition="'$(UsingNativeAOT)' != 'true'" />
<Import Project="$(MSBuildThisFileDirectory)BrowserWasmApp.targets" Condition="'$(UsingNativeAOT)' != 'true' and '$(RuntimeFlavor)' == 'Mono'" />
<Import Project="$(MSBuildThisFileDirectory)EmSdkRepo.Defaults.props" Condition="'$(UsingNativeAOT)' == 'true' and '$(EMSDK_PATH)' != ''" />
<Import Project="$(MSBuildThisFileDirectory)WasmApp.InTree.CI.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true'" />

Expand Down