From 963e8e2150c9efbfd7a159817c227a9153ea8850 Mon Sep 17 00:00:00 2001
From: Emmanuel Ferdman <emmanuelferdman@gmail.com>
Date: Sat, 28 Sep 2024 10:26:13 +0300
Subject: [PATCH] [browser] update incorrect references

Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>
---
 .github/CODEOWNERS                                     |  1 -
 docs/coding-guidelines/mono-code-guide.md              |  4 ++--
 .../building/libraries/webassembly-instructions.md     |  4 ++--
 docs/workflow/debugging/mono/wasm-debugging.md         |  2 +-
 eng/pipelines/common/evaluate-default-paths.yml        |  2 +-
 src/mono/browser/README.md                             |  8 ++++----
 src/mono/browser/runtime/diagnostics-mock.d.ts         |  2 +-
 src/mono/browser/runtime/dotnet.d.ts                   |  2 +-
 src/mono/browser/runtime/rollup.config.js              |  4 ++--
 src/mono/mono/component/diagnostics_server.c           |  2 +-
 src/mono/wasi/Makefile                                 | 10 +++++-----
 src/mono/wasi/mono-include/wasm-config.h.in            |  2 +-
 src/mono/wasm/threads.md                               |  2 +-
 13 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2d544524862e2..47a365e54a516 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -71,7 +71,6 @@
 /src/mono/browser @lewing @pavelsavara
 /src/mono/wasi @lewing @pavelsavara
 /src/mono/wasm @lewing @pavelsavara
-/src/mono/wasm/debugger @thaystg @ilonatommy
 /src/mono/browser/debugger @thaystg @ilonatommy
 /src/mono/wasm/build @maraf @akoeplinger
 /src/mono/wasi/build @maraf @akoeplinger
diff --git a/docs/coding-guidelines/mono-code-guide.md b/docs/coding-guidelines/mono-code-guide.md
index 334aebab25a95..f5e1b948ab34a 100644
--- a/docs/coding-guidelines/mono-code-guide.md
+++ b/docs/coding-guidelines/mono-code-guide.md
@@ -285,11 +285,11 @@ As a matter of courtesy, notify the .NET macios and .NET Android teams if changi
 
 ### WASM
 
-The WASM and WASI runtimes in [`src/mono/wasm/runtime`](../../src/mono/wasm/runtime) and
+The WASM and WASI runtimes in [`src/mono/browser/runtime`](../../src/mono/browser/runtime) and
 `src/mono/wasi` are effectively external API clients.  When possible they should use existing `MONO_API` functions.
 
 As a matter of expedience, the wasm project has sometimes taken advantage of static linking by
-adding declarations of internal Mono functions in `src/mono/wasm/runtime/driver.c` and directly
+adding declarations of internal Mono functions in `src/mono/browser/runtime/driver.c` and directly
 calling Mono internals.
 
 In general new code should not do this.  When modifying existing code, mysterious WASM failures may
diff --git a/docs/workflow/building/libraries/webassembly-instructions.md b/docs/workflow/building/libraries/webassembly-instructions.md
index 891e129a9366c..1f230eedbdef4 100644
--- a/docs/workflow/building/libraries/webassembly-instructions.md
+++ b/docs/workflow/building/libraries/webassembly-instructions.md
@@ -6,7 +6,7 @@ If you haven't already done so, please read [this document](../../README.md#Buil
 
 ## Building
 
-At this time no other build dependencies are necessary to start building for WebAssembly. Emscripten will be downloaded and installed automatically in the build process. To read how to build on specific platforms, see [Building](../../../../src/mono/wasm/README.md#building).
+At this time no other build dependencies are necessary to start building for WebAssembly. Emscripten will be downloaded and installed automatically in the build process. To read how to build on specific platforms, see [Building](../../../../src/mono/browser/README.md#building).
 
 This document explains how to work on the runtime or libraries. If you haven't already done so, please read [this document](../../README.md#Configurations) to understand configurations.
 
@@ -158,4 +158,4 @@ Open a PR request with the new image.
 
 # Test libraries
 
-You can read about running library tests in [Libraries tests](../../../../src/mono/wasm/README.md#libraries-tests).
+You can read about running library tests in [Libraries tests](../../../../src/mono/browser/README.md#libraries-tests).
diff --git a/docs/workflow/debugging/mono/wasm-debugging.md b/docs/workflow/debugging/mono/wasm-debugging.md
index 80b06319eb36e..26b5f62ec478b 100644
--- a/docs/workflow/debugging/mono/wasm-debugging.md
+++ b/docs/workflow/debugging/mono/wasm-debugging.md
@@ -269,7 +269,7 @@ The name of the script and the location of the `<script>` tag depends on whether
 Blazor WebAssembly project (template `blazorwasm`) or a Blazor project (template `blazor`).
 
 See the runtime `DotnetHostBuilder` interface in
-[dotnet.d.ts](../../../../src/mono/wasm/runtime/dotnet.d.ts) for additional configuration functions.
+[dotnet.d.ts](../../../../src/mono/browser/runtime/dotnet.d.ts) for additional configuration functions.
 
 ## Blazor WebAssembly
 
diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
index 28991920c330d..022b5b01adfe8 100644
--- a/eng/pipelines/common/evaluate-default-paths.yml
+++ b/eng/pipelines/common/evaluate-default-paths.yml
@@ -287,7 +287,7 @@ jobs:
       - src/mono/tests/*
       - src/mono/tools/*
       - src/mono/wasi/*
-      - src/mono/wasm/debugger/*
+      - src/mono/browser/debugger/*
       - src/mono/wasm/host/*
       - src/mono/wasm/templates/*
       - src/mono/wasm/testassets/*
diff --git a/src/mono/browser/README.md b/src/mono/browser/README.md
index ad15c64b0aeab..202f36683e040 100644
--- a/src/mono/browser/README.md
+++ b/src/mono/browser/README.md
@@ -232,7 +232,7 @@ There is also the [wa-edit](https://github.com/radekdoulik/wa-info#wa-edit) tool
 
 Bumping Emscripten version involves these steps:
 
-* update https://github.com/dotnet/runtime/blob/main/src/mono/wasm/emscripten-version.txt
+* update https://github.com/dotnet/runtime/blob/main/src/mono/browser/emscripten-version.txt
 * bump emscripten versions in docker images in https://github.com/dotnet/dotnet-buildtools-prereqs-docker
 * bump emscripten in https://github.com/dotnet/emsdk
 * bump docker images in https://github.com/dotnet/icu, update emscripten files in eng/patches/
@@ -244,7 +244,7 @@ Bumping Emscripten version involves these steps:
 
 Two things to keep in mind:
 
-1. We use the Azure DevOps NPM registry (configured in `src/mono/wasm/runtime/.npmrc`).  When
+1. We use the Azure DevOps NPM registry (configured in `src/mono/browser/runtime/.npmrc`).  When
    updating `package.json`, you will need to be logged in (see instructions for Windows and
    mac/Linux, below) in order for the registry to populate with the correct package versions.
    Otherwise, CI builds will fail.
@@ -275,7 +275,7 @@ npm update --lockfile-version=1
 Go to https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-public-npm/connect/npm and log in and click on the "Other" tab.
 Follow the instructions to set up your `~/.npmrc` with a personal authentication token.
 
-In folder `src/mono/wasm/runtime/`
+In folder `src/mono/browser/runtime/`
 
 ```sh
 rm -rf node_modules
@@ -288,7 +288,7 @@ npm update --lockfile-version=1
 ## Code style
 
 * Is enforced via [eslint](https://eslint.org/) and rules are in `./.eslintrc.js`
-* You could check the style by running `npm run lint` in `src/mono/wasm/runtime` directory
+* You could check the style by running `npm run lint` in `src/mono/browser/runtime` directory
 * You can install [plugin into your VS Code](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) to show you the errors as you type
 
 ## Builds on CI
diff --git a/src/mono/browser/runtime/diagnostics-mock.d.ts b/src/mono/browser/runtime/diagnostics-mock.d.ts
index d1f24c99761d4..97fd980fe740f 100644
--- a/src/mono/browser/runtime/diagnostics-mock.d.ts
+++ b/src/mono/browser/runtime/diagnostics-mock.d.ts
@@ -1,7 +1,7 @@
 //! Licensed to the .NET Foundation under one or more agreements.
 //! The .NET Foundation licenses this file to you under the MIT license.
 //!
-//! This is generated file, see src/mono/wasm/runtime/rollup.config.js
+//! This is generated file, see src/mono/browser/runtime/rollup.config.js
 
 //! This is not considered public API with backward compatibility guarantees. 
 
diff --git a/src/mono/browser/runtime/dotnet.d.ts b/src/mono/browser/runtime/dotnet.d.ts
index 1357bc4a0b613..01218688846cb 100644
--- a/src/mono/browser/runtime/dotnet.d.ts
+++ b/src/mono/browser/runtime/dotnet.d.ts
@@ -1,7 +1,7 @@
 //! Licensed to the .NET Foundation under one or more agreements.
 //! The .NET Foundation licenses this file to you under the MIT license.
 //!
-//! This is generated file, see src/mono/wasm/runtime/rollup.config.js
+//! This is generated file, see src/mono/browser/runtime/rollup.config.js
 
 //! This is not considered public API with backward compatibility guarantees. 
 
diff --git a/src/mono/browser/runtime/rollup.config.js b/src/mono/browser/runtime/rollup.config.js
index 6f718c373d404..31d3ed7e6e345 100644
--- a/src/mono/browser/runtime/rollup.config.js
+++ b/src/mono/browser/runtime/rollup.config.js
@@ -24,7 +24,7 @@ const wasmEnableSIMD = process.env.WASM_ENABLE_SIMD === "1" ? true : false;
 const wasmEnableExceptionHandling = process.env.WASM_ENABLE_EH === "1" ? true : false;
 const wasmEnableJsInteropByValue = process.env.ENABLE_JS_INTEROP_BY_VALUE == "1" ? true : false;
 const monoDiagnosticsMock = process.env.MonoDiagnosticsMock === "true" ? true : false;
-// because of stack walk at src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
+// because of stack walk at src/mono/browser/debugger/BrowserDebugProxy/MonoProxy.cs
 // and unit test at with timers.mjs
 const keep_fnames = /(mono_wasm_runtime_ready|mono_wasm_fire_debugger_agent_message_with_data|mono_wasm_fire_debugger_agent_message_with_data_to_pause|mono_wasm_schedule_timer_tick)/;
 const keep_classnames = /(ManagedObject|ManagedError|Span|ArraySegment|WasmRootBuffer|SessionOptionsBuilder)/;
@@ -44,7 +44,7 @@ const terserConfig = {
 };
 const plugins = isDebug ? [writeOnChangePlugin()] : [terser(terserConfig), writeOnChangePlugin()];
 const banner = "//! Licensed to the .NET Foundation under one or more agreements.\n//! The .NET Foundation licenses this file to you under the MIT license.\n";
-const banner_dts = banner + "//!\n//! This is generated file, see src/mono/wasm/runtime/rollup.config.js\n\n//! This is not considered public API with backward compatibility guarantees. \n";
+const banner_dts = banner + "//!\n//! This is generated file, see src/mono/browser/runtime/rollup.config.js\n\n//! This is not considered public API with backward compatibility guarantees. \n";
 // emcc doesn't know how to load ES6 module, that's why we need the whole rollup.js
 const inlineAssert = [
     {
diff --git a/src/mono/mono/component/diagnostics_server.c b/src/mono/mono/component/diagnostics_server.c
index 02179f785eb35..9717f4473e8a2 100644
--- a/src/mono/mono/component/diagnostics_server.c
+++ b/src/mono/mono/component/diagnostics_server.c
@@ -192,7 +192,7 @@ mono_wasm_diagnostic_server_post_resume_runtime (void)
 #define QUEUE_CLOSE_SENTINEL ((uint8_t*)(intptr_t)-1)
 
 /* single-reader single-writer one-element queue. See
- * src/mono/wasm/runtime/diagnostics/server_pthread/stream-queue.ts
+ * src/mono/browser/runtime/diagnostics/server_pthread/stream-queue.ts
  */
 typedef struct WasmIpcStreamQueue {
 	uint8_t *buf; /* or QUEUE_CLOSE_SENTINEL */
diff --git a/src/mono/wasi/Makefile b/src/mono/wasi/Makefile
index 13e2d9cb613ea..16f62c1c856c4 100644
--- a/src/mono/wasi/Makefile
+++ b/src/mono/wasi/Makefile
@@ -70,7 +70,7 @@ run-build-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/mono/wasm/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj \
+	$(TOP)/src/mono/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj \
 	$(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
 
 submit-debugger-tests-helix: build-debugger-tests-helix
@@ -108,14 +108,14 @@ submit-tests-helix:
 run-debugger-tests:
 	rm -f $(TOP)/artifacts/bin/DebuggerTestSuite/x64/Debug/*log; \
 	if [ ! -z "$(TEST_FILTER)" ]; then \
-	$(DOTNET) test  $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing&FullyQualifiedName$(TEST_FILTER)" $(TEST_ARGS); \
+	$(DOTNET) test  $(TOP)/src/mono/browser/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing&FullyQualifiedName$(TEST_FILTER)" $(TEST_ARGS); \
 	else \
-		$(DOTNET) test  $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing" $(TEST_ARGS); \
+		$(DOTNET) test  $(TOP)/src/mono/browser/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing" $(TEST_ARGS); \
 	fi
 
 build-dbg-proxy:
-	$(DOTNET) build $(TOP)/src/mono/wasm/debugger/wasiDebugHost $(MSBUILD_ARGS)
+	$(DOTNET) build $(TOP)/src/mono/browser/debugger/wasiDebugHost $(MSBUILD_ARGS)
 build-dbg-testsuite:
-	$(DOTNET) build $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS)
+	$(DOTNET) build $(TOP)/src/mono/browser/debugger/DebuggerTestSuite $(MSBUILD_ARGS)
 build-app-host:
 	$(DOTNET) build $(TOP)/src/mono/wasm/host $(_MSBUILD_WASM_BUILD_ARGS) $(MSBUILD_ARGS)
diff --git a/src/mono/wasi/mono-include/wasm-config.h.in b/src/mono/wasi/mono-include/wasm-config.h.in
index 4c33fd663663c..ef5748359fdc1 100644
--- a/src/mono/wasi/mono-include/wasm-config.h.in
+++ b/src/mono/wasi/mono-include/wasm-config.h.in
@@ -12,4 +12,4 @@
 
 #endif/*__MONO_WASM_CONFIG_H__*/
 
-// TODOWASI deduplicate with src/mono/wasm/runtime/wasm-config.h.in
\ No newline at end of file
+// TODOWASI deduplicate with src/mono/browser/runtime/wasm-config.h.in
\ No newline at end of file
diff --git a/src/mono/wasm/threads.md b/src/mono/wasm/threads.md
index 5216281fadedd..824bbd6495cc2 100644
--- a/src/mono/wasm/threads.md
+++ b/src/mono/wasm/threads.md
@@ -80,7 +80,7 @@ a worker thread will use `async_run_in_main_thread` to queue up work for the mai
 
 To run the debugger tests in the runtime [built with enabled support for multi-threading](#building-the-runtime) we use:
 ```
-dotnet test src/mono/wasm/debugger/DebuggerTestSuite -e RuntimeConfiguration=Debug -e Configuration=Debug -e DebuggerHost=chrome -e WasmEnableThreads=true
+dotnet test src/mono/browser/debugger/DebuggerTestSuite -e RuntimeConfiguration=Debug -e Configuration=Debug -e DebuggerHost=chrome -e WasmEnableThreads=true
 ```
 
 ## JS interop on dedicated threads ##