diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 7b404e2c37b74..bf6fdc7c4d173 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -116,6 +116,9 @@ jobs: - src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/* - src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/* - src/mono/mono/* + - eng/testing/scenarios/BuildWasmAppsJobsList.txt + - eng/Version.Details.xml + - src/mono/wasm/emscripten-version.txt - subset: wasmdebuggertests include: - src/mono/wasm/debugger/* diff --git a/eng/testing/scenarios/BuildWasmAppsJobsList.txt b/eng/testing/scenarios/BuildWasmAppsJobsList.txt index 8afeea6cdeeb1..c44096b4b7b47 100644 --- a/eng/testing/scenarios/BuildWasmAppsJobsList.txt +++ b/eng/testing/scenarios/BuildWasmAppsJobsList.txt @@ -17,3 +17,4 @@ Wasm.Build.Tests.SatelliteAssembliesTests Wasm.Build.Tests.WasmBuildAppTest Wasm.Build.Tests.WasmNativeDefaultsTests Wasm.Build.Tests.WorkloadTests +Wasm.Build.Tests.WasmTemplateTests diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs index d3684c3cfe3db..c23339c6d0c5e 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs @@ -18,7 +18,7 @@ public WasmTemplateTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur { } - [Theory] + [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))] [InlineData("Debug")] [InlineData("Release")] public void BrowserBuildThenPublish(string config) @@ -61,7 +61,7 @@ public void BrowserBuildThenPublish(string config) UseCache: false)); } - [Theory] + [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))] [InlineData("Debug")] [InlineData("Release")] public void ConsoleBuildThenPublish(string config) @@ -76,10 +76,10 @@ public void ConsoleBuildThenPublish(string config) BuildProject(buildArgs, id: id, new BuildProjectOptions( - DotnetWasmFromRuntimePack: false, + DotnetWasmFromRuntimePack: true, CreateProject: false, HasV8Script: false, - MainJS: "main.mjs", + MainJS: "main.cjs", Publish: false, TargetFramework: "net7.0" )); @@ -92,13 +92,14 @@ public void ConsoleBuildThenPublish(string config) _testOutput.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}"); Console.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}"); + bool expectRelinking = config == "Release"; BuildProject(buildArgs, id: id, new BuildProjectOptions( - DotnetWasmFromRuntimePack: false, + DotnetWasmFromRuntimePack: !expectRelinking, CreateProject: false, HasV8Script: false, - MainJS: "main.mjs", + MainJS: "main.cjs", Publish: true, TargetFramework: "net7.0", UseCache: false));