Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThays Grazia <thaystg@gmail.com>2020-08-06 01:34:41 +0300
committerGitHub <noreply@github.com>2020-08-06 01:34:41 +0300
commit03d2e48212d57f6ca9e44a127de965e528a1bf85 (patch)
treec0d16863abd03cc97810655af33497baab9aa44f /tools-local
parent8140826a72663ed8c2724d2099dd65d5ef689f18 (diff)
[wasm] Moving wasm debugger to dotnet/runtime (#40146)
* Moving Wasm debugger to dotnet/runtime The build is working. The tests are running. - make -C src/mono/wasm/ run-debugger-tests
Diffstat (limited to 'tools-local')
-rw-r--r--tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs25
1 files changed, 21 insertions, 4 deletions
diff --git a/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs b/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs
index a9a6ffc7e78..4ca72c5e61b 100644
--- a/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs
+++ b/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs
@@ -29,6 +29,7 @@ public class WasmAppBuilder : Task
public string? MainJS { get; set; }
[Required]
public ITaskItem[]? AssemblySearchPaths { get; set; }
+ public int DebugLevel { get; set; }
public ITaskItem[]? ExtraAssemblies { get; set; }
public ITaskItem[]? FilesToIncludeInFileSystem { get; set; }
public ITaskItem[]? RemoteSources { get; set; }
@@ -41,8 +42,8 @@ public class WasmAppBuilder : Task
{
[JsonPropertyName("assembly_root")]
public string AssemblyRoot { get; set; } = "managed";
- [JsonPropertyName("enable_debugging")]
- public int EnableDebugging { get; set; } = 0;
+ [JsonPropertyName("debug_level")]
+ public int DebugLevel { get; set; } = 0;
[JsonPropertyName("assets")]
public List<object> Assets { get; } = new List<object>();
[JsonPropertyName("remote_sources")]
@@ -116,8 +117,15 @@ public class WasmAppBuilder : Task
// Create app
Directory.CreateDirectory(AppDir!);
Directory.CreateDirectory(Path.Join(AppDir, config.AssemblyRoot));
- foreach (var assembly in _assemblies!.Values)
+ foreach (var assembly in _assemblies!.Values) {
File.Copy(assembly.Location, Path.Join(AppDir, config.AssemblyRoot, Path.GetFileName(assembly.Location)), true);
+ if (DebugLevel > 0) {
+ var pdb = assembly.Location;
+ pdb = Path.ChangeExtension(pdb, ".pdb");
+ if (File.Exists(pdb))
+ File.Copy(pdb, Path.Join(AppDir, config.AssemblyRoot, Path.GetFileName(pdb)), true);
+ }
+ }
List<string> nativeAssets = new List<string>() { "dotnet.wasm", "dotnet.js", "dotnet.timezones.blat" };
@@ -130,8 +138,17 @@ public class WasmAppBuilder : Task
File.Copy(Path.Join (MicrosoftNetCoreAppRuntimePackDir, "native", f), Path.Join(AppDir, f), true);
File.Copy(MainJS!, Path.Join(AppDir, "runtime.js"), true);
- foreach (var assembly in _assemblies.Values)
+ foreach (var assembly in _assemblies.Values) {
config.Assets.Add(new AssemblyEntry (Path.GetFileName(assembly.Location)));
+ if (DebugLevel > 0) {
+ var pdb = assembly.Location;
+ pdb = Path.ChangeExtension(pdb, ".pdb");
+ if (File.Exists(pdb))
+ config.Assets.Add(new AssemblyEntry (Path.GetFileName(pdb)));
+ }
+ }
+
+ config.DebugLevel = DebugLevel;
if (FilesToIncludeInFileSystem != null)
{