[wasm] Rename binaries mono -> dotnet. (#18373)

13 files changed, 83 insertions, 83 deletions

diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile
index 9c594ae44cf..211e8394c18 100644
--- a/sdks/wasm/Makefile
+++ b/sdks/wasm/Makefile
@@ -142,8 +142,8 @@ define InterpBuildTemplate
 builds/$(1)/:
 	mkdir -p $$@
 
-builds/$(1)/mono.js: builds/$(1)/driver.o builds/$(1)/corebindings.o builds/$(1)/zlib-helper.o src/library_mono.js src/binding_support.js src/dotnet_support.js $(TOP)/sdks/out/$(2)/lib/libmonosgen-2.0.a | builds/$(1)/ emsdk_env.sh $(5)
-	$(EMCC) $(EMCC_FLAGS) $(3) --js-library src/library_mono.js --js-library src/binding_support.js --js-library src/dotnet_support.js builds/$(1)/driver.o builds/$(1)/corebindings.o builds/$(1)/zlib-helper.o $(4) -o builds/$(1)/mono.js
+builds/$(1)/dotnet.js: builds/$(1)/driver.o builds/$(1)/corebindings.o builds/$(1)/zlib-helper.o src/library_mono.js src/binding_support.js src/dotnet_support.js $(TOP)/sdks/out/$(2)/lib/libmonosgen-2.0.a | builds/$(1)/ emsdk_env.sh $(5)
+	$(EMCC) $(EMCC_FLAGS) $(3) --js-library src/library_mono.js --js-library src/binding_support.js --js-library src/dotnet_support.js builds/$(1)/driver.o builds/$(1)/corebindings.o builds/$(1)/zlib-helper.o $(4) -o builds/$(1)/dotnet.js
 
 builds/$(1)/driver.o: src/driver.c src/corebindings.c src/pinvoke-tables-default.h | builds/$(1)/ emsdk_env.sh
 	$(EMCC) $(EMCC_FLAGS) $(3) -Oz -DCORE_BINDINGS -I$(WASM_RUNTIME_DIR)/include/mono-2.0 src/driver.c -c -o $$@
@@ -154,7 +154,7 @@ builds/$(1)/corebindings.o: src/corebindings.c | builds/$(1)/ emsdk_env.sh
 builds/$(1)/zlib-helper.o: src/zlib-helper.c | builds/$(1)/ emsdk_env.sh
 	$(EMCC) $(3) -Oz -I$(WASM_RUNTIME_DIR)/include/mono-2.0 -s USE_ZLIB=1 src/zlib-helper.c -c -o $$@
 
-build-native: builds/$(1)/mono.js
+build-native: builds/$(1)/dotnet.js
 
 endef
 
@@ -225,18 +225,18 @@ build-hello-netcore: packager.exe samples/hello/bin/Debug/netcoreapp3.0/hello.dl
 	$(PACKAGER) --debugrt --emscripten-sdkdir=$(EMSCRIPTEN_SDK_DIR) --mono-sdkdir=$(TOP)/sdks/out -appdir=bin/hello-netcore --nobinding --builddir=obj/hello-netcore --framework=netcoreapp3.0 --netcore-sdkdir=$(NETCOREAPP_DIR)/runtimes/webassembly-wasm/lib/netcoreapp3.0 --template=runtime-tests.js --linker samples/hello/bin/Debug/netcoreapp3.0/hello.dll
 	ninja -v -C obj/hello-netcore
 
-bin/hello-netcore/mono.js: build-hello-netcore
+bin/hello-netcore/dotnet.js: build-hello-netcore
 
-run-hello-netcore: bin/hello-netcore/mono.js
+run-hello-netcore: bin/hello-netcore/dotnet.js
 	(cd bin/hello-netcore && $(SM) runtime.js --run hello.dll)
 
 build-aot-hello-netcore: packager.exe samples/hello/bin/Debug/netcoreapp3.0/hello.dll $(NETCOREAPP_DIR)
 	$(PACKAGER) --debugrt --simd --no-native-strip --emscripten-sdkdir=$(EMSCRIPTEN_SDK_DIR) --mono-sdkdir=$(TOP)/sdks/out -appdir=bin/aot-hello-netcore --nobinding --builddir=obj/aot-hello-netcore --framework=netcoreapp3.0 --netcore-sdkdir=$(NETCOREAPP_DIR)/runtimes/webassembly-wasm/lib/netcoreapp3.0 --template=runtime-tests.js --aot --linker samples/hello/bin/Debug/netcoreapp3.0/hello.dll
 	ninja -v -C obj/aot-hello-netcore
 
-bin/aot-hello-netcore/mono.js: build-aot-hello-netcore
+bin/aot-hello-netcore/dotnet.js: build-aot-hello-netcore
 
-run-aot-hello-netcore: bin/aot-hello-netcore/mono.js
+run-aot-hello-netcore: bin/aot-hello-netcore/dotnet.js
 	(cd bin/aot-hello-netcore && $(RUN_V8) --experimental-wasm-simd runtime.js -- --run hello.dll)
 
 # Path to <mono repo>/netcore/netcore/corefx/tests/extracted
@@ -251,16 +251,16 @@ COREFX_TESTS_DIR=
 # $(5) - command line arguments
 define NetcoreTestTemplate
 
-bin/$(2)/mono.js: packager.exe runtime-tests.js corefx-exclusions.rsp
+bin/$(2)/dotnet.js: packager.exe runtime-tests.js corefx-exclusions.rsp
 	@if test -z "$(COREFX_TESTS_DIR)"; then echo "COREFX_TESTS_DIR is not set"; exit 1; fi
 	cd xunit-runner && dotnet build /nologo /v:q
 	$(PACKAGER) --debugrt --emscripten-sdkdir=$(EMSCRIPTEN_SDK_DIR) --search-path=$(COREFX_TESTS_DIR)/$(3) --template=runtime-tests.js --appdir=bin/$(2) --builddir=obj/$(2) --asset=corefx-exclusions.rsp --framework=netcoreapp3.0 --netcore-sdkdir=$(NETCOREAPP_DIR)/runtimes/webassembly-wasm/lib/netcoreapp3.0 --search-path=$(COREFX_TESTS_DIR)/$(3) xunit-runner/bin/Debug/netcoreapp3.0/xunit-runner.dll $(5) $(COREFX_TESTS_DIR)/$(3)/$(4)
 	ninja -v -C obj/$(2)
 #	$(PACKAGER) --debugrt --search-path=$(WASM_BCL_DIR)/tests --search-path=$(XUNIT_DIR) --template=runtime-tests.js --appdir=bin/$(2) --builddir=obj/$(2) --asset=xunit-exclusions.rsp xunit-runner.exe $(WASM_BCL_DIR)/tests/xunit.execution.dotnet.dll $(WASM_BCL_DIR)/tests/$(3) $(WASM_BCL_DIR)/tests/Xunit.NetCore.Extensions.dll
 
-build-$(1): bin/$(2)/mono.js
+build-$(1): bin/$(2)/dotnet.js
 
-run-$(1): bin/$(2)/mono.js
+run-$(1): bin/$(2)/dotnet.js
 	(cd bin/$(2) && $$(SM) runtime.js --enable-gc --run xunit-runner.dll $(4) `cat corefx-exclusions.rsp | grep -v '#'`)
 
 endef
@@ -387,13 +387,13 @@ xunit-runner.exe: xunit-runner/xunit-runner.cs
 # $(4) - command line arguments
 define XunitTestTemplate
 
-bin/$(2)/mono.js: packager.exe $(WASM_FRAMEWORK)/.stamp-framework xunit-runner.exe runtime-tests.js xunit-exclusions.rsp
+bin/$(2)/dotnet.js: packager.exe $(WASM_FRAMEWORK)/.stamp-framework xunit-runner.exe runtime-tests.js xunit-exclusions.rsp
 	$(PACKAGER) --debugrt --search-path=$(WASM_BCL_DIR)/tests --search-path=$(XUNIT_DIR) --template=runtime-tests.js --appdir=bin/$(2) --builddir=obj/$(2) --asset=xunit-exclusions.rsp xunit-runner.exe $(WASM_BCL_DIR)/tests/xunit.execution.dotnet.dll $(WASM_BCL_DIR)/tests/$(3) $(WASM_BCL_DIR)/tests/Xunit.NetCore.Extensions.dll
 	ninja -v -C obj/$(2)
 
-build-$(1): bin/$(2)/mono.js
+build-$(1): bin/$(2)/dotnet.js
 
-run-$(1): bin/$(2)/mono.js
+run-$(1): bin/$(2)/dotnet.js
 	(cd bin/$(2) && $$(SM) runtime.js --enable-gc --run xunit-runner.exe $(3) $(4) `cat xunit-exclusions.rsp | grep -v '#'`)
 
 endef
diff --git a/sdks/wasm/README.md b/sdks/wasm/README.md
index d763264a9ed..9a1773e098d 100644
--- a/sdks/wasm/README.md
+++ b/sdks/wasm/README.md
@@ -11,38 +11,38 @@
                 |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
                 |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
                 |--- mono.js                - Mono WebAssembly implementations
-                |--- mono.wasm              - Mono WebAssembly implementations
-                |--- mono.wasm.map          - Mono WebAssembly implementations
+                |--- dotnet.wasm              - Mono WebAssembly implementations
+                |--- dotnet.wasm.map          - Mono WebAssembly implementations
                 |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
             |--- release                - Release build of the runtime.
                 |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
                 |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-                |--- mono.js                - Mono WebAssembly implementations
-                |--- mono.wasm              - Mono WebAssembly implementations
+                |--- dotnet.js                - Mono WebAssembly implementations
+                |--- dotnet.wasm              - Mono WebAssembly implementations
                 |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
             |--- release-dynamic         - Release build of the runtime with dynamic linking enabled
                 |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
                 |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-                |--- mono.js                - Mono WebAssembly implementations
-                |--- mono.wasm              - Mono WebAssembly implementations
+                |--- dotnet.js                - Mono WebAssembly implementations
+                |--- dotnet.wasm              - Mono WebAssembly implementations
                 |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
             |--- threads-debug          - Debug build that includes pthreads.
                 |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
                 |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-                |--- mono.js                - Mono WebAssembly implementations
-                |--- mono.wasm              - Mono WebAssembly implementations
-                |--- mono.wasm.map          - Mono WebAssembly implementations
-                |--- mono.js.mem            - Mono WebAssembly implementations
-                |--- mono.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
+                |--- dotnet.js                - Mono WebAssembly implementations
+                |--- dotnet.wasm              - Mono WebAssembly implementations
+                |--- dotnet.wasm.map          - Mono WebAssembly implementations
+                |--- dotnet.js.mem            - Mono WebAssembly implementations
+                |--- dotnet.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
                 |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
             |--- threads-release        - Release build that includes pthreads.
                 |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
                 |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-                |--- mono.js                - Mono WebAssembly implementations
-                |--- mono.wasm              - Mono WebAssembly implementations
-                |--- mono.wasm.map          - Mono WebAssembly implementations
-                |--- mono.js.mem            - Mono WebAssembly implementations
-                |--- mono.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
+                |--- dotnet.js                - Mono WebAssembly implementations
+                |--- dotnet.wasm              - Mono WebAssembly implementations
+                |--- dotnet.wasm.map          - Mono WebAssembly implementations
+                |--- dotnet.js.mem            - Mono WebAssembly implementations
+                |--- dotnet.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
                 |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
 
     ```
@@ -207,20 +207,20 @@ During the main build two directories will be created:
         |--- threads-debug          - Debug build that includes pthreads.
             |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
             |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-            |--- mono.js                - Mono WebAssembly implementations
-            |--- mono.wasm              - Mono WebAssembly implementations
-            |--- mono.wasm.map          - Mono WebAssembly implementations
-            |--- mono.js.mem            - Mono WebAssembly implementations
-            |--- mono.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
+            |--- dotnet.js                - Mono WebAssembly implementations
+            |--- dotnet.wasm              - Mono WebAssembly implementations
+            |--- dotnet.wasm.map          - Mono WebAssembly implementations
+            |--- dotnet.js.mem            - Mono WebAssembly implementations
+            |--- dotnet.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
             |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
         |--- threads-release        - Release build that includes pthreads.
             |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
             |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-            |--- mono.js                - Mono WebAssembly implementations
-            |--- mono.wasm              - Mono WebAssembly implementations
-            |--- mono.wasm.map          - Mono WebAssembly implementations
-            |--- mono.js.mem            - Mono WebAssembly implementations
-            |--- mono.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
+            |--- dotnet.js                - Mono WebAssembly implementations
+            |--- dotnet.wasm              - Mono WebAssembly implementations
+            |--- dotnet.wasm.map          - Mono WebAssembly implementations
+            |--- dotnet.js.mem            - Mono WebAssembly implementations
+            |--- dotnet.worker.js         - pthreads worker.  File must be deployed with the rest of the generated code files.
             |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
 
 ```
@@ -249,10 +249,10 @@ During the main build one directory will be created:
         |--- release-dynamic        - Release build that includes dynamic linking support.
             |--- corebindings.o         - Runtime linked lib - NOT DISTRIBUTED
             |--- driver.o               - Runtime linked lib - NOT DISTRIBUTED
-            |--- mono.js                - Mono WebAssembly implementations
-            |--- mono.wasm              - Mono WebAssembly implementations
-            |--- mono.wasm.map          - Mono WebAssembly implementations
-            |--- mono.js.mem            - Mono WebAssembly implementations
+            |--- dotnet.js                - Mono WebAssembly implementations
+            |--- dotnet.wasm              - Mono WebAssembly implementations
+            |--- dotnet.wasm.map          - Mono WebAssembly implementations
+            |--- dotnet.js.mem            - Mono WebAssembly implementations
             |--- zlib-helper.o          - Runtime linked lib - NOT DISTRIBUTED
 
 ```
diff --git a/sdks/wasm/debug.html b/sdks/wasm/debug.html
index 2c8c3b25d37..b395840c382 100644
--- a/sdks/wasm/debug.html
+++ b/sdks/wasm/debug.html
@@ -30,6 +30,6 @@
 		};
       </script>
       <script type="text/javascript" src="runtime.js"></script>
-      <script async type="text/javascript" src="mono.js"></script>
+      <script async type="text/javascript" src="dotnet.js"></script>
   </body>
   </html>
\ No newline at end of file
diff --git a/sdks/wasm/debugger-driver.html b/sdks/wasm/debugger-driver.html
index 42d4bcee4b0..564652d02c8 100644
--- a/sdks/wasm/debugger-driver.html
+++ b/sdks/wasm/debugger-driver.html
@@ -16,7 +16,7 @@
       </script>
       <script type="text/javascript" src="mono-config.js"></script>
       <script type="text/javascript" src="runtime.js"></script>
-      <script async type="text/javascript" src="mono.js"></script>
+      <script async type="text/javascript" src="dotnet.js"></script>
 	  Stuff goes here
   </body>
   </html> 
diff --git a/sdks/wasm/docs/packager.md b/sdks/wasm/docs/packager.md
index c5352418ec2..c1aa49a0341 100644
--- a/sdks/wasm/docs/packager.md
+++ b/sdks/wasm/docs/packager.md
@@ -90,8 +90,8 @@ The following ouput directory structure is created:
          |--- publish               // Output from the `packager.exe` application 
             |--- managed            // Where to find the managed assemblies generated by packager.exe
             |--- mono-config.js     // Configuration file referenced in `sample.html` and `runtime.js`
-            |--- mono.js            // Mono WebAssembly implementations
-            |--- mono.wasm          // Mono WebAssembly implementations
+            |--- dotnet.js          // Mono WebAssembly implementations
+            |--- dotnet.wasm        // Mono WebAssembly implementations
             |--- runtime.js         // Handles the loading of the Mono WebAssembly modules
             |--- sample.html        // sample html file
             |--- server.py          // python test server
diff --git a/sdks/wasm/hello-io.html b/sdks/wasm/hello-io.html
index 1cb2986e718..a10503c35e7 100644
--- a/sdks/wasm/hello-io.html
+++ b/sdks/wasm/hello-io.html
@@ -14,6 +14,6 @@
 		<script type="text/javascript" src="mono-config.js"></script>
 		<script type="text/javascript" src="runtime.js"></script>
 		<script type="text/javascript" src="mono-loader.js"></script>
-		<script defer type="text/javascript" src="mono.js"></script>
+		<script defer type="text/javascript" src="dotnet.js"></script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/sdks/wasm/packager.cs b/sdks/wasm/packager.cs
index 454c9aa1a50..b94d285d46d 100644
--- a/sdks/wasm/packager.cs
+++ b/sdks/wasm/packager.cs
@@ -715,7 +715,7 @@ class Driver {
 		else
 			wasm_runtime_dir = Path.Combine (tool_prefix, "builds", use_release_runtime ? "release" : "debug");
 		if (!emit_ninja) {
-			var interp_files = new List<string> { "mono.js", "mono.wasm" };
+			var interp_files = new List<string> { "dotnet.js", "dotnet.wasm" };
 			if (enable_threads) {
 				interp_files.Add ("mono.worker.js");
 			}
@@ -943,8 +943,8 @@ class Driver {
 				ninja.WriteLine ($"  flags = -s USE_ZLIB=1 -I{runtime_dir}/include/mono-2.0");
 			}
 		} else {
-			ninja.WriteLine ("build $appdir/mono.js: cpifdiff $wasm_runtime_dir/mono.js");
-			ninja.WriteLine ("build $appdir/mono.wasm: cpifdiff $wasm_runtime_dir/mono.wasm");
+			ninja.WriteLine ("build $appdir/dotnet.js: cpifdiff $wasm_runtime_dir/dotnet.js");
+			ninja.WriteLine ("build $appdir/dotnet.wasm: cpifdiff $wasm_runtime_dir/dotnet.wasm");
 			if (enable_threads) {
 				ninja.WriteLine ("build $appdir/mono.worker.js: cpifdiff $wasm_runtime_dir/mono.worker.js");
 			}
@@ -1075,9 +1075,9 @@ class Driver {
 		}
 		if (build_wasm) {
 			string zlibhelper = enable_zlib ? "$builddir/zlib-helper.o" : "";
-			ninja.WriteLine ($"build $appdir/mono.js $appdir/mono.wasm: emcc-link $builddir/driver.o {zlibhelper} {wasm_core_bindings} {ofiles} {profiler_libs} {extra_link_libs} {runtime_libs} | $tool_prefix/src/library_mono.js $tool_prefix/src/dotnet_support.js {wasm_core_support} $emsdk_env");
-			ninja.WriteLine ("  out_js=$appdir/mono.js");
-			ninja.WriteLine ("  out_wasm=$appdir/mono.wasm");
+			ninja.WriteLine ($"build $appdir/dotnet.js $appdir/dotnet.wasm: emcc-link $builddir/driver.o {zlibhelper} {wasm_core_bindings} {ofiles} {profiler_libs} {extra_link_libs} {runtime_libs} | $tool_prefix/src/library_mono.js $tool_prefix/src/dotnet_support.js {wasm_core_support} $emsdk_env");
+			ninja.WriteLine ("  out_js=$appdir/dotnet.js");
+			ninja.WriteLine ("  out_wasm=$appdir/dotnet.wasm");
 		}
 		if (enable_linker) {
 			switch (linkMode) {
diff --git a/sdks/wasm/runtime-tests.js b/sdks/wasm/runtime-tests.js
index decaed50fec..20f19961c2a 100644
--- a/sdks/wasm/runtime-tests.js
+++ b/sdks/wasm/runtime-tests.js
@@ -132,7 +132,7 @@ if (typeof window == "undefined")
   load ("mono-config.js");
 
 var Module = { 
-	mainScriptUrlOrBlob: "mono.js",
+	mainScriptUrlOrBlob: "dotnet.js",
 
 	print: function(x) { print ("WASM: " + x) },
 	printErr: function(x) { print ("WASM-ERR: " + x) },
@@ -192,7 +192,7 @@ var Module = {
 };
 
 if (typeof window == "undefined")
-  load ("mono.js");
+  load ("dotnet.js");
 
 const IGNORE_PARAM_COUNT = -1;
 
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.targets b/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.targets
index 1b8413bbe22..616dec6d15a 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.targets
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.targets
@@ -79,11 +79,11 @@
 		</PropertyGroup>
 
 		<ItemGroup>
-			<_WasmOutput Include="$(_MonoWasmRuntimePath)mono.js" TargetPath="mono.js" />
-			<_WasmOutput Include="$(_MonoWasmRuntimePath)mono.wasm" TargetPath="mono.wasm" />
+			<_WasmOutput Include="$(_MonoWasmRuntimePath)dotnet.js" TargetPath="dotnet.js" />
+			<_WasmOutput Include="$(_MonoWasmRuntimePath)dotnet.wasm" TargetPath="dotnet.wasm" />
 			<_WasmOutput Include="$(_MonoWasmRuntimePath)mono.worker.js" TargetPath="mono.worker.js" Condition="'$(EnableMonoWasmThreads)'=='true'"/>
-			<_WasmOutput Include="$(_MonoWasmRuntimePath)mono.wasm.map" TargetPath="mono.wasm.map" Condition="'$(_MonoWasmDebugRuntime)'=='true'"/>
-			<_WasmOutput Include="$(_MonoWasmRuntimePath)mono.js.mem" TargetPath="mono.js.mem" Condition="'$(EnableMonoWasmThreads)'=='true'"/>
+			<_WasmOutput Include="$(_MonoWasmRuntimePath)dotnet.wasm.map" TargetPath="dotnet.wasm.map" Condition="'$(_MonoWasmDebugRuntime)'=='true'"/>
+			<_WasmOutput Include="$(_MonoWasmRuntimePath)dotnet.js.mem" TargetPath="dotnet.js.mem" Condition="'$(EnableMonoWasmThreads)'=='true'"/>
 		</ItemGroup>
 
 		<AssignTargetPath
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj b/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj
index 38778ca5883..71490053552 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj
@@ -9,24 +9,24 @@
   </PropertyGroup>
   <ItemGroup>
     <None Update="build\netstandard2.0\Mono.WebAssembly.Runtime.props" Pack="True" />
-    <Content Include="..\..\..\wasm\builds\debug\mono.js" PackagePath="mono-wasm-runtime\debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\debug\mono.js" />
-    <Content Include="..\..\..\wasm\builds\debug\mono.wasm" PackagePath="mono-wasm-runtime\debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\debug\mono.wasm" />
-    <Content Include="..\..\..\wasm\builds\debug\mono.wasm.map" PackagePath="mono-wasm-runtime\debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\debug\mono.wasm.map" />
-    <Content Include="..\..\..\wasm\builds\threads-debug\mono.js" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\mono.js" Condition="Exists('..\..\..\wasm\builds\threads-debug\mono.js')" />
-    <Content Include="..\..\..\wasm\builds\threads-debug\mono.worker.js" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\mono.worker.js" Condition="Exists('..\..\..\wasm\builds\threads-debug\mono.worker.js')" />
-    <Content Include="..\..\..\wasm\builds\threads-debug\mono.wasm" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\mono.wasm" Condition="Exists('..\..\..\wasm\builds\threads-debug\mono.wasm')" />
-    <Content Include="..\..\..\wasm\builds\threads-debug\mono.wasm.map" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\mono.wasm.map" Condition="Exists('..\..\..\wasm\builds\threads-debug\mono.wasm.map')" />
-    <Content Include="..\..\..\wasm\builds\release\mono.js" PackagePath="mono-wasm-runtime\release\%(Filename)%(Extension)" Link="mono-wasm-runtime\release\mono.js" />
-    <Content Include="..\..\..\wasm\builds\release\mono.wasm" PackagePath="mono-wasm-runtime\release\%(Filename)%(Extension)" Link="mono-wasm-runtime\release\mono.wasm" />
-    <Content Include="..\..\..\wasm\builds\threads-release\mono.js" PackagePath="mono-wasm-runtime\threads-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-release\mono.js" Condition="Exists('..\..\..\wasm\builds\threads-release\mono.js')" />
-    <Content Include="..\..\..\wasm\builds\threads-release\mono.worker.js" PackagePath="mono-wasm-runtime\threads-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-release\mono.worker.js"  Condition="Exists('..\..\..\wasm\builds\threads-release\mono.worker.js')" />
-    <Content Include="..\..\..\wasm\builds\threads-release\mono.wasm" PackagePath="mono-wasm-runtime\threads-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-release\mono.wasm"  Condition="Exists('..\..\..\wasm\builds\threads-release\mono.wasm')" />
+    <Content Include="..\..\..\wasm\builds\debug\dotnet.js" PackagePath="mono-wasm-runtime\debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\debug\dotnet.js" />
+    <Content Include="..\..\..\wasm\builds\debug\dotnet.wasm" PackagePath="mono-wasm-runtime\debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\debug\dotnet.wasm" />
+    <Content Include="..\..\..\wasm\builds\debug\dotnet.wasm.map" PackagePath="mono-wasm-runtime\debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\debug\dotnet.wasm.map" />
+    <Content Include="..\..\..\wasm\builds\threads-debug\dotnet.js" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\dotnet.js" Condition="Exists('..\..\..\wasm\builds\threads-debug\dotnet.js')" />
+    <Content Include="..\..\..\wasm\builds\threads-debug\dotnet.worker.js" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\dotnet.worker.js" Condition="Exists('..\..\..\wasm\builds\threads-debug\dotnet.worker.js')" />
+    <Content Include="..\..\..\wasm\builds\threads-debug\dotnet.wasm" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\dotnet.wasm" Condition="Exists('..\..\..\wasm\builds\threads-debug\dotnet.wasm')" />
+    <Content Include="..\..\..\wasm\builds\threads-debug\dotnet.wasm.map" PackagePath="mono-wasm-runtime\threads-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-debug\dotnet.wasm.map" Condition="Exists('..\..\..\wasm\builds\threads-debug\dotnet.wasm.map')" />
+    <Content Include="..\..\..\wasm\builds\release\dotnet.js" PackagePath="mono-wasm-runtime\release\%(Filename)%(Extension)" Link="mono-wasm-runtime\release\dotnet.js" />
+    <Content Include="..\..\..\wasm\builds\release\dotnet.wasm" PackagePath="mono-wasm-runtime\release\%(Filename)%(Extension)" Link="mono-wasm-runtime\release\dotnet.wasm" />
+    <Content Include="..\..\..\wasm\builds\threads-release\dotnet.js" PackagePath="mono-wasm-runtime\threads-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-release\dotnet.js" Condition="Exists('..\..\..\wasm\builds\threads-release\dotnet.js')" />
+    <Content Include="..\..\..\wasm\builds\threads-release\dotnet.worker.js" PackagePath="mono-wasm-runtime\threads-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-release\dotnet.worker.js"  Condition="Exists('..\..\..\wasm\builds\threads-release\dotnet.worker.js')" />
+    <Content Include="..\..\..\wasm\builds\threads-release\dotnet.wasm" PackagePath="mono-wasm-runtime\threads-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\threads-release\dotnet.wasm"  Condition="Exists('..\..\..\wasm\builds\threads-release\dotnet.wasm')" />
 
-    <Content Include="..\..\..\wasm\builds\netcore-debug\mono.js" PackagePath="mono-wasm-runtime\netcore-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-debug\mono.js" Condition="Exists('..\..\..\wasm\builds\netcore-debug\mono.js')" />
-    <Content Include="..\..\..\wasm\builds\netcore-debug\mono.wasm" PackagePath="mono-wasm-runtime\netcore-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-debug\mono.wasm"  Condition="Exists('..\..\..\wasm\builds\netcore-debug\mono.wasm')" />
+    <Content Include="..\..\..\wasm\builds\netcore-debug\dotnet.js" PackagePath="mono-wasm-runtime\netcore-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-debug\dotnet.js" Condition="Exists('..\..\..\wasm\builds\netcore-debug\dotnet.js')" />
+    <Content Include="..\..\..\wasm\builds\netcore-debug\dotnet.wasm" PackagePath="mono-wasm-runtime\netcore-debug\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-debug\dotnet.wasm"  Condition="Exists('..\..\..\wasm\builds\netcore-debug\dotnet.wasm')" />
 
-    <Content Include="..\..\..\wasm\builds\netcore-release\mono.js" PackagePath="mono-wasm-runtime\netcore-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-release\mono.js" Condition="Exists('..\..\..\wasm\builds\netcore-release\mono.js')" />
-    <Content Include="..\..\..\wasm\builds\netcore-release\mono.wasm" PackagePath="mono-wasm-runtime\netcore-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-release\mono.wasm"  Condition="Exists('..\..\..\wasm\builds\netcore-release\mono.wasm')" />
+    <Content Include="..\..\..\wasm\builds\netcore-release\dotnet.js" PackagePath="mono-wasm-runtime\netcore-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-release\dotnet.js" Condition="Exists('..\..\..\wasm\builds\netcore-release\dotnet.js')" />
+    <Content Include="..\..\..\wasm\builds\netcore-release\dotnet.wasm" PackagePath="mono-wasm-runtime\netcore-release\%(Filename)%(Extension)" Link="mono-wasm-runtime\netcore-release\dotnet.wasm"  Condition="Exists('..\..\..\wasm\builds\netcore-release\dotnet.wasm')" />
 
     <None Update="build\netstandard2.0\Mono.WebAssembly.Runtime.props" PackagePath="build\netstandard2.0\Mono.WebAssembly.Runtime.props" Pack="True" />
   </ItemGroup>
diff --git a/sdks/wasm/sdk/Samples/MonoWasmSample/sample.html b/sdks/wasm/sdk/Samples/MonoWasmSample/sample.html
index ba049ccfe1e..674263a82c3 100644
--- a/sdks/wasm/sdk/Samples/MonoWasmSample/sample.html
+++ b/sdks/wasm/sdk/Samples/MonoWasmSample/sample.html
@@ -59,6 +59,6 @@
         }

     </script>

 	<script type="text/javascript" src="runtime.js"></script>

-	<script async type="text/javascript" src="mono.js"></script>

+	<script async type="text/javascript" src="dotnet.js"></script>

 </body>

 </html>
\ No newline at end of file
diff --git a/sdks/wasm/sdk/Templates/templates/DotNet/index.html b/sdks/wasm/sdk/Templates/templates/DotNet/index.html
index 9284b69bf39..64ff4c25074 100644
--- a/sdks/wasm/sdk/Templates/templates/DotNet/index.html
+++ b/sdks/wasm/sdk/Templates/templates/DotNet/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
     <script type="text/javascript" src="runtime.js"></script>
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
 </head>
     <body>
diff --git a/sdks/wasm/tests/browser/karma.conf.js b/sdks/wasm/tests/browser/karma.conf.js
index f951f6804ab..6d101fc3460 100644
--- a/sdks/wasm/tests/browser/karma.conf.js
+++ b/sdks/wasm/tests/browser/karma.conf.js
@@ -13,10 +13,10 @@ module.exports = function(config) {
             {pattern: './publish/netstandard2.0/core-bindings-spec.js',watched:true,served:true,included:true},
             {pattern: './publish/netstandard2.0/issues-spec.js',watched:true,served:true,included:true},
             {pattern: './publish/netstandard2.0/zip-spec.js',watched:true,served:true,included:true},
-            {pattern: './publish/netstandard2.0/mono.wasm', included: false, served: true, type: 'wasm'},
-            {pattern: './publish/netstandard2.0/mono.worker.js', included: false, served: true, type: 'wasm'},
-            {pattern: './publish/netstandard2.0/mono.js.mem', included: false, served: true, type: 'wasm'},
-            {pattern: './publish/netstandard2.0/mono.js', included: false, served: true},
+            {pattern: './publish/netstandard2.0/dotnet.wasm', included: false, served: true, type: 'wasm'},
+            {pattern: './publish/netstandard2.0/dotnet.worker.js', included: false, served: true, type: 'wasm'},
+            {pattern: './publish/netstandard2.0/dotnet.js.mem', included: false, served: true, type: 'wasm'},
+            {pattern: './publish/netstandard2.0/dotnet.js', included: false, served: true},
             {pattern: './publish/netstandard2.0/mono-config.js', included: false, served: true},
             {pattern: './publish/netstandard2.0/runtime.js', included: false, served: true},
             {pattern: './publish/netstandard2.0/managed/*.dll', included: false, served: true},
@@ -120,4 +120,4 @@ module.exports = function(config) {
             }
           }        
     });
-  };
\ No newline at end of file
+  };