[wasm] Move `src/tests/BuildWasmApps/*` to `src/mono/wasm` (#74698)

- This will help simplifying the path subsets in
`eng/pipelines/common/evaluate-default-paths.yml`, which would then help
to avoid a lot of unrelated non-wasm builds on PRs

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e3aa63b..d00f62f 100644 (file)
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -74,7 +74,8 @@
 /src/mono/nuget/*Workload.Mono.Toolchain*/ @lewing @radical
 /src/mono/nuget/*MonoAOTCompiler*/ @lewing @radical
 
-/src/tests/BuildWasmApps/ @radical
+/src/mono/wasm/Wasm* @radical
+/src/mono/wasm/testassets @radical
 /src/tasks/WasmAppBuilder/ @radical
 /src/tasks/WorkloadBuildTasks/ @radical
 /src/tasks/AotCompilerTask/ @radical

diff --git a/docs/workflow/testing/testing-workloads.md b/docs/workflow/testing/testing-workloads.md
index 4bb29e9..d824148 100644 (file)
--- a/docs/workflow/testing/testing-workloads.md
+++ b/docs/workflow/testing/testing-workloads.md
@@ -21,7 +21,7 @@ Example for wasm:
                           VersionBand="$(SdkBandVersion)" />
 ```
 
-- Currently, this is used only by `src/tests/BuildWasmApps/Wasm.Build.Tests`
+- Currently, this is used only by `src/mono/wasm/Wasm.Build.Tests`
 
 ## Multiple runtime packs
 

diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
index 6191449..75361e1 100644 (file)
--- a/eng/pipelines/common/evaluate-default-paths.yml
+++ b/eng/pipelines/common/evaluate-default-paths.yml
@@ -74,7 +74,7 @@ jobs:
       exclude:
       # wasm runtime changes will trigger all wasm jobs anyway
       - src/mono/wasm/*
-      - src/tests/BuildWasmApps/*
+      - src/mono/wasm/*
       - eng/pipelines/common/evaluate-default-paths.yml
     - subset: installer
       include:
@@ -116,8 +116,8 @@ jobs:
     - subset: wasmbuildtests
       include:
       - src/tasks/*
-      - src/tests/BuildWasmApps/Directory.Build*
-      - src/tests/BuildWasmApps/Wasm.Build.Tests/*
+      - src/mono/wasm/Directory.Build*
+      - src/mono/wasm/Wasm.Build.Tests/*
       - src/mono/wasm/build/*
       - src/mono/wasm/host/*
       - src/mono/wasm/runtime/*
@@ -141,8 +141,8 @@ jobs:
       include:
       - src/mono/wasm/debugger/*
       - src/mono/wasm/runtime/*
-      - src/tests/BuildWasmApps/Directory.Build*
-      - src/tests/BuildWasmApps/Wasm.Debugger.Tests/*
+      - src/mono/wasm/Directory.Build*
+      - src/mono/wasm/debugger/Wasm.Debugger.Tests/*
       - eng/testing/ProvisioningVersions.props
       - src/mono/mono/*
       exclude:

diff --git a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
index 54c4baf..96f61a1 100644 (file)
--- a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
+++ b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
@@ -7,7 +7,7 @@ steps:
       /p:Configuration=${{ parameters.configForBuild }}
       /p:ContinuousIntegrationBuild=true
       /t:InstallWorkloadUsingArtifacts
-      $(Build.SourcesDirectory)/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj
+      $(Build.SourcesDirectory)/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
     displayName: "Install workload using artifacts"
 
   - script: >-

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 221bbde..cbcd14c 100644 (file)
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -581,14 +581,14 @@
     <ProjectReference Include="@(TrimmingTestProjects)" />
 
     <!-- wasm.build.tests are run on _WasmBuildTests job on CI, and with library tests locally. -->
-    <ProjectReference Include="$(RepoRoot)\src\tests\BuildWasmApps\Wasm.Build.Tests\*.Tests.csproj"
+    <ProjectReference Include="$(RepoRoot)\src\mono\wasm\Wasm.Build.Tests\*.Tests.csproj"
                       Exclude="@(ProjectExclusions)"
                       Condition="'$(TargetOS)' == 'Browser' and
                                     (('$(ContinuousIntegrationBuild)' == 'true' and '$(TestWasmBuildTests)' == 'true') or
                                      ('$(ContinuousIntegrationBuild)' != 'true' and '$(TestAssemblies)' == 'true'))"
                       BuildInParallel="false" />
 
-    <ProjectReference Include="$(RepoRoot)\src\tests\BuildWasmApps\Wasm.Debugger.Tests\*.Tests.csproj"
+    <ProjectReference Include="$(RepoRoot)\src\mono\wasm\debugger\Wasm.Debugger.Tests\*.Tests.csproj"
                       Exclude="@(ProjectExclusions)"
                       Condition="'$(TargetOS)' == 'Browser' and
                                     (('$(ContinuousIntegrationBuild)' == 'true' and '$(TestWasmDebuggerTests)' == 'true') or

diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile
index 151a7d9..10a5469 100644 (file)
--- a/src/mono/wasm/Makefile
+++ b/src/mono/wasm/Makefile
@@ -97,7 +97,7 @@ run-tests-%:
        EMSDK_PATH=$(EMSDK_PATH) PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
 
 run-build-tests:
-       PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/tests/BuildWasmApps/Wasm.Build.Tests/ /t:Test $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
+       PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/mono/wasm//Wasm.Build.Tests/ /t:Test $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
 
 run-browser-tests-%:
        PATH="$(GECKODRIVER):$(CHROMEDRIVER):$(PATH)" XHARNESS_COMMAND="test-browser --browser=$(XHARNESS_BROWSER)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
@@ -105,7 +105,7 @@ run-browser-tests-%:
 build-debugger-tests-helix:
        $(DOTNET) build -restore -bl:$(TOP)/artifacts/log/$(CONFIG)/Wasm.Debugger.Tests.binlog \
        /p:ContinuousIntegrationBuild=true /p:ArchiveTests=true \
-       $(TOP)/src/tests/BuildWasmApps/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj \
+       $(TOP)/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj \
        $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
 
 submit-debugger-tests-helix: build-debugger-tests-helix

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BrowserRunner.cs b/src/mono/wasm/Wasm.Build.Tests/BrowserRunner.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BrowserRunner.cs
rename to src/mono/wasm/Wasm.Build.Tests/BrowserRunner.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildAndRunAttribute.cs b/src/mono/wasm/Wasm.Build.Tests/BuildAndRunAttribute.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BuildAndRunAttribute.cs
rename to src/mono/wasm/Wasm.Build.Tests/BuildAndRunAttribute.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs
rename to src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BuildPublishTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BuildPublishTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/BuildPublishTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs
rename to src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs b/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/CleanTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/CommandResult.cs b/src/mono/wasm/Wasm.Build.Tests/CommandResult.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/CommandResult.cs
rename to src/mono/wasm/Wasm.Build.Tests/CommandResult.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/ConfigSrcTests.cs b/src/mono/wasm/Wasm.Build.Tests/ConfigSrcTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/ConfigSrcTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/ConfigSrcTests.cs

diff --git a/src/mono/wasm/Wasm.Build.Tests/Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/Directory.Build.props
new file mode 100644 (file)
index 0000000..dd08eb4
--- /dev/null
+++ b/src/mono/wasm/Wasm.Build.Tests/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup>
+    <!-- needs to be set early -->
+    <Scenario>BuildWasmApps</Scenario>
+    <IsTestProject>true</IsTestProject>
+    <AssemblyBeingTested>Wasm.Build.Tests</AssemblyBeingTested>
+  </PropertyGroup>
+
+  <Import Project="..\..\..\libraries\Directory.Build.props" />
+</Project>

diff --git a/src/tests/BuildWasmApps/Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/Directory.Build.targets
similarity index 82%
rename from src/tests/BuildWasmApps/Directory.Build.targets
rename to src/mono/wasm/Wasm.Build.Tests/Directory.Build.targets
index 68e5c1b..43eea04 100644 (file)
--- a/src/tests/BuildWasmApps/Directory.Build.targets
+++ b/src/mono/wasm/Wasm.Build.Tests/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\libraries\Directory.Build.targets" />
+  <Import Project="..\..\..\libraries\Directory.Build.targets" />
 
   <PropertyGroup>
     <BundleDir>$(OutDir)</BundleDir>

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/DotNetCommand.cs b/src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/DotNetCommand.cs
rename to src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/EnvironmentVariables.cs b/src/mono/wasm/Wasm.Build.Tests/EnvironmentVariables.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/EnvironmentVariables.cs
rename to src/mono/wasm/Wasm.Build.Tests/EnvironmentVariables.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/HelperExtensions.cs b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/HelperExtensions.cs
rename to src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/InvariantGlobalizationTests.cs b/src/mono/wasm/Wasm.Build.Tests/InvariantGlobalizationTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/InvariantGlobalizationTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/InvariantGlobalizationTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs b/src/mono/wasm/Wasm.Build.Tests/MainWithArgsTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/MainWithArgsTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeBuildTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/SimpleSourceChangeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/SimpleSourceChangeRebuildTest.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/SimpleSourceChangeRebuildTest.cs
rename to src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/SimpleSourceChangeRebuildTest.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/ProcessExtensions.cs b/src/mono/wasm/Wasm.Build.Tests/ProcessExtensions.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/ProcessExtensions.cs
rename to src/mono/wasm/Wasm.Build.Tests/ProcessExtensions.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/README.md b/src/mono/wasm/Wasm.Build.Tests/README.md
similarity index 92%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/README.md
rename to src/mono/wasm/Wasm.Build.Tests/README.md
index 79a0a89..60d8dce 100644 (file)
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/README.md
+++ b/src/mono/wasm/Wasm.Build.Tests/README.md
@@ -13,7 +13,7 @@ being generated.
 - Running:
 
 Linux/macOS: `$ make -C src/mono/wasm run-build-tests`
-Windows: `.\dotnet.cmd build .\src\tests\BuildWasmApps\Wasm.Build.Tests\Wasm.Build.Tests.csproj -c Release -t:Test -p:TargetOS=Browser -p:TargetArchitecture=wasm`
+Windows: `.\dotnet.cmd build .\src\mono\wasm\BuildWasmApps\Wasm.Build.Tests\Wasm.Build.Tests.csproj -c Release -t:Test -p:TargetOS=Browser -p:TargetArchitecture=wasm`
 
 - Specific tests can be run via `XUnitClassName`, and `XUnitMethodName`
   - eg. `XUnitClassName=Wasm.Build.Tests.BlazorWasmTests`

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/RebuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/RebuildTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/RebuildTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/RebuildTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/RunCommand.cs b/src/mono/wasm/Wasm.Build.Tests/RunCommand.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/RunCommand.cs
rename to src/mono/wasm/Wasm.Build.Tests/RunCommand.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/RunHost.cs b/src/mono/wasm/Wasm.Build.Tests/RunHost.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/RunHost.cs
rename to src/mono/wasm/Wasm.Build.Tests/RunHost.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs b/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/SharedBuildPerTestClassFixture.cs b/src/mono/wasm/Wasm.Build.Tests/SharedBuildPerTestClassFixture.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/SharedBuildPerTestClassFixture.cs
rename to src/mono/wasm/Wasm.Build.Tests/SharedBuildPerTestClassFixture.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/ToolCommand.cs b/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/ToolCommand.cs
rename to src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Utils.cs b/src/mono/wasm/Wasm.Build.Tests/Utils.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/Utils.cs
rename to src/mono/wasm/Wasm.Build.Tests/Utils.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj
rename to src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs b/src/mono/wasm/Wasm.Build.Tests/WasmBuildAppTest.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs
rename to src/mono/wasm/Wasm.Build.Tests/WasmBuildAppTest.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmNativeDefaultsTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/WasmNativeDefaultsTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmRunOutOfAppBundleTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmRunOutOfAppBundleTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/WasmRunOutOfAppBundleTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/WasmRunOutOfAppBundleTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmSIMDTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmSIMDTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/WasmSIMDTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/WasmSIMDTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WorkloadTests.cs b/src/mono/wasm/Wasm.Build.Tests/WorkloadTests.cs
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/WorkloadTests.cs
rename to src/mono/wasm/Wasm.Build.Tests/WorkloadTests.cs

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Directory.Build.props
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.props
rename to src/mono/wasm/Wasm.Build.Tests/data/Blazor.Directory.Build.props

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Directory.Build.targets
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.targets
rename to src/mono/wasm/Wasm.Build.Tests/data/Blazor.Directory.Build.targets

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props
rename to src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets
rename to src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/data/Local.Directory.Build.props
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props
rename to src/mono/wasm/Wasm.Build.Tests/data/Local.Directory.Build.props

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/data/Local.Directory.Build.targets
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.targets
rename to src/mono/wasm/Wasm.Build.Tests/data/Local.Directory.Build.targets

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.cmd
rename to src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/RunScriptTemplate.sh
rename to src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/data/Workloads.Directory.Build.props
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.props
rename to src/mono/wasm/Wasm.Build.Tests/data/Workloads.Directory.Build.props

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/data/Workloads.Directory.Build.targets
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.targets
rename to src/mono/wasm/Wasm.Build.Tests/data/Workloads.Directory.Build.targets

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Build.Tests/data/nuget7.config
rename to src/mono/wasm/Wasm.Build.Tests/data/nuget7.config

diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
index 1881223..2b4e7be 100644 (file)
--- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
@@ -26,7 +26,7 @@
   <ItemGroup>
     <ProjectReference Include="..\BrowserDebugHost\BrowserDebugHost.csproj" />
     <ProjectReference Include="..\BrowserDebugProxy\BrowserDebugProxy.csproj" />
-    <ProjectReference Include="..\tests\debugger-test\debugger-test.csproj" ReferenceOutputAssembly="false" Private="false" />
+    <ProjectReference Include="..\tests\debugger-test\debugger-test.csproj" AdditionalProperties="RuntimeConfiguration=Release" ReferenceOutputAssembly="false" Private="false" />
 
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
     <!-- needed for ConditionalFact etc -->

diff --git a/src/mono/wasm/debugger/README.md b/src/mono/wasm/debugger/README.md
index dad724c..938e8c0 100644 (file)
--- a/src/mono/wasm/debugger/README.md
+++ b/src/mono/wasm/debugger/README.md
@@ -3,3 +3,8 @@
 ## Debug proxy
 
 - Protocol messages are truncated when logged, to 64k, by default. But this can be changed by setting `WASM_DONT_TRUNCATE_LOG_MESSAGES=1`.
+
+## Projects
+
+- `DebuggerTestSuite` - project with all the tests, and the test harness
+- `Wasm.Debugger.Tests` - a wrapper project to fit in the global build

diff --git a/src/mono/wasm/debugger/Wasm.Debugger.Tests/Directory.Build.props b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Directory.Build.props
new file mode 100644 (file)
index 0000000..0909239
--- /dev/null
+++ b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <Import Project="..\..\..\..\libraries\Directory.Build.props" />
+</Project>

diff --git a/src/mono/wasm/debugger/Wasm.Debugger.Tests/Directory.Build.targets b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Directory.Build.targets
new file mode 100644 (file)
index 0000000..be4716c
--- /dev/null
+++ b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Directory.Build.targets
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="..\..\..\..\libraries\Directory.Build.targets" />
+
+  <PropertyGroup>
+    <BundleDir>$(OutDir)</BundleDir>
+    <RunScriptOutputPath  Condition="'$(OS)' != 'Windows_NT'">$(OutDir)\RunTests.sh</RunScriptOutputPath>
+    <RunScriptOutputPath  Condition="'$(OS)' == 'Windows_NT'">$(OutDir)\RunTests.cmd</RunScriptOutputPath>
+  </PropertyGroup>
+</Project>

diff --git a/src/tests/BuildWasmApps/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
similarity index 97%
rename from src/tests/BuildWasmApps/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
rename to src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
index 19fbd1a..8a0a2e9 100644 (file)
--- a/src/tests/BuildWasmApps/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
+++ b/src/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj"
+    <ProjectReference Include="../DebuggerTestSuite/DebuggerTestSuite.csproj"
                       ReferenceOutputAssembly="false"
                       Private="false"
                       GlobalPropertiesToRemove="TargetFramework;TargetFrameworks;Configuration;TargetOS;TargetArchitecture"

diff --git a/src/tests/BuildWasmApps/Wasm.Debugger.Tests/data/RunScriptTemplate.cmd b/src/mono/wasm/debugger/Wasm.Debugger.Tests/data/RunScriptTemplate.cmd
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Debugger.Tests/data/RunScriptTemplate.cmd
rename to src/mono/wasm/debugger/Wasm.Debugger.Tests/data/RunScriptTemplate.cmd

diff --git a/src/tests/BuildWasmApps/Wasm.Debugger.Tests/data/RunScriptTemplate.sh b/src/mono/wasm/debugger/Wasm.Debugger.Tests/data/RunScriptTemplate.sh
similarity index 100%
rename from src/tests/BuildWasmApps/Wasm.Debugger.Tests/data/RunScriptTemplate.sh
rename to src/mono/wasm/debugger/Wasm.Debugger.Tests/data/RunScriptTemplate.sh

diff --git a/src/mono/wasm/runtime/workers/README.md b/src/mono/wasm/runtime/workers/README.md
index 5b120f1..b6347fe 100644 (file)
--- a/src/mono/wasm/runtime/workers/README.md
+++ b/src/mono/wasm/runtime/workers/README.md
@@ -37,6 +37,6 @@ Some other places that may need to be modified include:
 * `eng/liveBuilds.targets`
 * `src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.prop`
 * [`../../build/WasmApp.targets`](../../build/WasmApp.targets)
-* `src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs`
+* `src/mono/wasm//Wasm.Build.Tests/BuildTestBase.cs`
 * etc
 

diff --git a/src/mono/wasm/sln/WasmBuild.sln b/src/mono/wasm/sln/WasmBuild.sln
index 4ac6e4e..63ad36c 100755 (executable)
--- a/src/mono/wasm/sln/WasmBuild.sln
+++ b/src/mono/wasm/sln/WasmBuild.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmAppBuilder", "..\..\..\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoAOTCompiler", "..\..\..\tasks\AotCompilerTask\MonoAOTCompiler.csproj", "{A9C02284-0387-42E7-BF78-47DF13656D5E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Build.Tests", "..\..\..\tests\BuildWasmApps\Wasm.Build.Tests\Wasm.Build.Tests.csproj", "{94E18644-B0E5-4DBB-9CE4-EA1515ACE4C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Build.Tests", "..\Wasm.Build.Tests\Wasm.Build.Tests.csproj", "{94E18644-B0E5-4DBB-9CE4-EA1515ACE4C2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DebuggerTestSuite", "..\debugger\DebuggerTestSuite\DebuggerTestSuite.csproj", "{4C0EE027-FC30-4167-B2CF-A6D18F00E08F}"
 EndProject

diff --git a/src/tests/BuildWasmApps/testassets/AppUsingNativeLib/Program.cs b/src/mono/wasm/testassets/AppUsingNativeLib/Program.cs
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/AppUsingNativeLib/Program.cs
rename to src/mono/wasm/testassets/AppUsingNativeLib/Program.cs

diff --git a/src/tests/BuildWasmApps/testassets/AppUsingNativeLib/native-lib.cpp b/src/mono/wasm/testassets/AppUsingNativeLib/native-lib.cpp
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/AppUsingNativeLib/native-lib.cpp
rename to src/mono/wasm/testassets/AppUsingNativeLib/native-lib.cpp

diff --git a/src/tests/BuildWasmApps/testassets/AppUsingNativeLib/native-lib.h b/src/mono/wasm/testassets/AppUsingNativeLib/native-lib.h
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/AppUsingNativeLib/native-lib.h
rename to src/mono/wasm/testassets/AppUsingNativeLib/native-lib.h

diff --git a/src/tests/BuildWasmApps/testassets/AppUsingSkiaSharp/Program.cs b/src/mono/wasm/testassets/AppUsingSkiaSharp/Program.cs
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/AppUsingSkiaSharp/Program.cs
rename to src/mono/wasm/testassets/AppUsingSkiaSharp/Program.cs

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/App.razor b/src/mono/wasm/testassets/Blazor_net50/App.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/App.razor
rename to src/mono/wasm/testassets/Blazor_net50/App.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Blazor_net50.csproj b/src/mono/wasm/testassets/Blazor_net50/Blazor_net50.csproj
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Blazor_net50.csproj
rename to src/mono/wasm/testassets/Blazor_net50/Blazor_net50.csproj

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Pages/Counter.razor b/src/mono/wasm/testassets/Blazor_net50/Pages/Counter.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Pages/Counter.razor
rename to src/mono/wasm/testassets/Blazor_net50/Pages/Counter.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Pages/FetchData.razor b/src/mono/wasm/testassets/Blazor_net50/Pages/FetchData.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Pages/FetchData.razor
rename to src/mono/wasm/testassets/Blazor_net50/Pages/FetchData.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Pages/Index.razor b/src/mono/wasm/testassets/Blazor_net50/Pages/Index.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Pages/Index.razor
rename to src/mono/wasm/testassets/Blazor_net50/Pages/Index.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Program.cs b/src/mono/wasm/testassets/Blazor_net50/Program.cs
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Program.cs
rename to src/mono/wasm/testassets/Blazor_net50/Program.cs

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/MainLayout.razor b/src/mono/wasm/testassets/Blazor_net50/Shared/MainLayout.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/MainLayout.razor
rename to src/mono/wasm/testassets/Blazor_net50/Shared/MainLayout.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/MainLayout.razor.css b/src/mono/wasm/testassets/Blazor_net50/Shared/MainLayout.razor.css
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/MainLayout.razor.css
rename to src/mono/wasm/testassets/Blazor_net50/Shared/MainLayout.razor.css

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/NavMenu.razor b/src/mono/wasm/testassets/Blazor_net50/Shared/NavMenu.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/NavMenu.razor
rename to src/mono/wasm/testassets/Blazor_net50/Shared/NavMenu.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/NavMenu.razor.css b/src/mono/wasm/testassets/Blazor_net50/Shared/NavMenu.razor.css
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/NavMenu.razor.css
rename to src/mono/wasm/testassets/Blazor_net50/Shared/NavMenu.razor.css

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/SurveyPrompt.razor b/src/mono/wasm/testassets/Blazor_net50/Shared/SurveyPrompt.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/Shared/SurveyPrompt.razor
rename to src/mono/wasm/testassets/Blazor_net50/Shared/SurveyPrompt.razor

diff --git a/src/tests/BuildWasmApps/testassets/Blazor_net50/_Imports.razor b/src/mono/wasm/testassets/Blazor_net50/_Imports.razor
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/Blazor_net50/_Imports.razor
rename to src/mono/wasm/testassets/Blazor_net50/_Imports.razor

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/Class1.cs b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/Class1.cs
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/Class1.cs
rename to src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/Class1.cs

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj
rename to src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj

diff --git a/src/tests/BuildWasmApps/testassets/resx/words.es-ES.resx b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.es-ES.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/resx/words.es-ES.resx
rename to src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.es-ES.resx

diff --git a/src/tests/BuildWasmApps/testassets/resx/words.ja-JP.resx b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.ja-JP.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/resx/words.ja-JP.resx
rename to src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.ja-JP.resx

diff --git a/src/tests/BuildWasmApps/testassets/resx/words.resx b/src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/resx/words.resx
rename to src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.resx

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyInMain/resx/words.es-ES.resx b/src/mono/wasm/testassets/SatelliteAssemblyInMain/resx/words.es-ES.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyInMain/resx/words.es-ES.resx
rename to src/mono/wasm/testassets/SatelliteAssemblyInMain/resx/words.es-ES.resx

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyInMain/resx/words.ja-JP.resx b/src/mono/wasm/testassets/SatelliteAssemblyInMain/resx/words.ja-JP.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyInMain/resx/words.ja-JP.resx
rename to src/mono/wasm/testassets/SatelliteAssemblyInMain/resx/words.ja-JP.resx

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyInMain/resx/words.resx b/src/mono/wasm/testassets/SatelliteAssemblyInMain/resx/words.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyInMain/resx/words.resx
rename to src/mono/wasm/testassets/SatelliteAssemblyInMain/resx/words.resx

diff --git a/src/tests/BuildWasmApps/testassets/mono.png b/src/mono/wasm/testassets/mono.png
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/mono.png
rename to src/mono/wasm/testassets/mono.png

diff --git a/src/tests/BuildWasmApps/testassets/native-libs/native-lib.o b/src/mono/wasm/testassets/native-libs/native-lib.o
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/native-libs/native-lib.o
rename to src/mono/wasm/testassets/native-libs/native-lib.o

diff --git a/src/tests/BuildWasmApps/testassets/native-libs/simple.c b/src/mono/wasm/testassets/native-libs/simple.c
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/native-libs/simple.c
rename to src/mono/wasm/testassets/native-libs/simple.c

diff --git a/src/tests/BuildWasmApps/testassets/native-libs/variadic.c b/src/mono/wasm/testassets/native-libs/variadic.c
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/native-libs/variadic.c
rename to src/mono/wasm/testassets/native-libs/variadic.c

diff --git a/src/tests/BuildWasmApps/testassets/native-libs/variadic.o b/src/mono/wasm/testassets/native-libs/variadic.o
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/native-libs/variadic.o
rename to src/mono/wasm/testassets/native-libs/variadic.o

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.es-ES.resx b/src/mono/wasm/testassets/resx/words.es-ES.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.es-ES.resx
rename to src/mono/wasm/testassets/resx/words.es-ES.resx

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.ja-JP.resx b/src/mono/wasm/testassets/resx/words.ja-JP.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.ja-JP.resx
rename to src/mono/wasm/testassets/resx/words.ja-JP.resx

diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.resx b/src/mono/wasm/testassets/resx/words.resx
similarity index 100%
rename from src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/resx/words.resx
rename to src/mono/wasm/testassets/resx/words.resx

diff --git a/src/tests/BuildWasmApps/Directory.Build.props b/src/tests/BuildWasmApps/Directory.Build.props
deleted file mode 100644 (file)
index a7a271a..0000000
--- a/src/tests/BuildWasmApps/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="..\..\libraries\Directory.Build.props" />
-</Project>

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Directory.Build.props b/src/tests/BuildWasmApps/Wasm.Build.Tests/Directory.Build.props
deleted file mode 100644 (file)
index a48db59..0000000
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- needs to be set early -->
-    <Scenario>BuildWasmApps</Scenario>
-  </PropertyGroup>
-
-  <Import Project="..\Directory.Build.props" />
-</Project>

diff --git a/src/tests/Common/dirs.proj b/src/tests/Common/dirs.proj
index 1ead56f..2233c07 100644 (file)
--- a/src/tests/Common/dirs.proj
+++ b/src/tests/Common/dirs.proj
@@ -10,7 +10,6 @@
       <DisabledProjects Include="$(TestRoot)*\**\cs_template.csproj" />
       <DisabledProjects Include="$(TestRoot)Common\**\*.*proj" />
       <DisabledProjects Include="$(TestRoot)FunctionalTests\**\*.csproj" /> <!-- They need to be isolated from the existing setup -->
-      <DisabledProjects Include="$(TestRoot)BuildWasmApps\**\*.csproj" /> <!-- built and run with libraries -->
       <DisabledProjects Include="$(TestRoot)GC\Performance\Framework\GCPerfTestFramework.csproj" />
       <DisabledProjects Include="$(TestRoot)Loader\classloader\StaticVirtualMethods\**\generatetest.csproj" /> <!-- test generators -->
       <DisabledProjects Include="$(TestRoot)Performance\Scenario\JitBench\unofficial_dotnet\JitBench.csproj" /> <!-- no official build support for SDK-style netcoreapp2.0 projects -->