[browser] Unify boot config schema and output layout by maraf · Pull Request #86255 · dotnet/runtime

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf · 2023-05-15T16:08:04Z

Update WasmAppBuilder to produce the same boot config schema as GenerateWasmBootJson
Update AppBundle layout to match blazor layout.
- All the runtime files (js, wasm, icu) are deployed to _framework folder.
- This behavior can be overriden by setting <WasmRuntimeAssetsLocation> property. The empty value is overriden to default _framework, but ./ can be used to flatten the output structure.
- WBT test with flat output
- The only remaining difference is AppBundle vs wwwrooot folder name.
JSHost.ImportAsync now requires the same relative paths as in blazor (./module.js => ../module.js)

Contributes to #70762

ghost · 2023-05-15T16:08:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Unify scheme between GenerateWasmBootJson and WasmAppBuilder

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

radical · 2023-06-23T08:07:14Z

@ilonatommy can you please check the icu bits in WasmAppBuilder?

maraf · 2023-06-23T12:17:26Z

/azp run runtime-wasm

azure-pipelines · 2023-06-23T12:17:38Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-24T03:38:55Z

I tried to verify this with a dotnet-runtime-perf run, but that timed out because of resource issues. Try running some benchmarks (even one will do) using instructions from https://github.com/dotnet/performance/blob/main/docs/benchmarking-workflow-dotnet-runtime.md#dotnet-runtime-testing-for-wasm .

ilonatommy

ICU related part looks good

maraf · 2023-06-27T11:28:00Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.

Do you have more feedback?

radical · 2023-06-27T16:04:26Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?

This is handled for CI, and the docs for manual running need to be updated.
But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

maraf · 2023-06-27T18:47:41Z

/azp run runtime-wasm

azure-pipelines · 2023-06-27T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

radical · 2023-06-27T21:57:38Z

@radical dotnet/performance is missing --module when running V8. If I hacked around with --wasmArgs I was able to convince it to run with test-main.js from this PR.
Do you have more feedback?
This is handled for CI, and the docs for manual running need to be updated. But I just realized that it will be problematic with the file (test-main.mjs) being renamed only in the scripts. I will try a simple fix in perf repo, and open a PR for it, and then you can update this PR.

The fixes will take a little longer. They are blocked by other things, for example dotnet/BenchmarkDotNet#2346 .

…hema

radical · 2023-06-27T22:45:56Z

@maraf I've pushed a commit to add --module for v8.

The reason the break shows up in this PR, and not on main is:

- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );

In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.

In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

radical

LGTM! Great job 👍

maraf · 2023-06-28T06:03:05Z

@maraf I've pushed a commit to add --module for v8.
The reason the break shows up in this PR, and not on main is:
- File.Copy(Path.Combine(AppContext.BaseDirectory,- options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),- Path.Combine(_projectDir, "test-main.js"));+ File.Copy(+ Path.Combine(+ AppContext.BaseDirectory,+ string.IsNullOrEmpty(options.TargetFramework) || options.TargetFramework == "net8.0"+ ? "test-main.js"+ : "data/test-main-7.0.js"+ ),+ Path.Combine(_projectDir, "test-main.js")+ );
In the options.TargetFramework case it was using the older test-main-7.0.js. Testing wise it is not a big issue since this is essentially testing for library tests, but your changes fixes it to use the current file.
In my upcoming PRs I will be moving most of the WBT tests away from test-main*, to use templates instead.

Thank you for tracking it down!

Regression from #86255.

maraf added 7 commits May 15, 2023 15:01

WIP
3ab43ea

Assets hash
9d4ddc5

VFS
1c44c21

Drop RemoteSources
c74bb29

Disable nullable in BootJsonData
c1903bb

Load VFS in JS
0928652

Add dotnetwasm to runtimeAssets
b8fe6e5

maraf added arch-wasm WebAssembly architecture area-Build-mono labels May 15, 2023

maraf added this to the 8.0.0 milestone May 15, 2023

maraf self-assigned this May 15, 2023

maraf added 2 commits May 15, 2023 18:37

Fix null config.resources.pdb
eaca5a6

Fix null config.resources.satelliteResources
784a09a

build-analysisBot mentioned this pull request May 15, 2023
[wasm][debugger] DebuggerTests.AssignmentTests.InspectVariableBeforeAndAfterAssignment failing #64188
Closed

maraf added 11 commits May 16, 2023 10:25

Fix dotnetwasm hash
859c46f

Handle symbols in blazor path
8ebcce8

Move everything in _framework folder
c709ba3

Update path to dotnet.js in imports
b32d5a3

Fix configSrc path in advanced sample
1581b76

Merge remote-tracking branch 'upstream/main' into WasmUnifyBootConfig…
105b35c
…Schema # Conflicts: # src/mono/wasm/runtime/loader/blazor/_Integration.ts

Fix merge
d1abc9a

Merge branch 'main' into WasmUnifyBootConfigSchema
3e67550
# Conflicts: # src/mono/sample/wasm/browser-threads-minimal/main.js # src/tasks/WasmAppBuilder/WasmAppBuilder.cs

Drop logging
dca3ae7

Console friendly
7c2b383

TMP TO REVERT
cfddfd6

This was referenced May 29, 2023
Tracking issue for CI build timeouts #76454
Closed
Failed USB connection via port 54050, error 61, in tvOS arm64 Release AllSubsets_Mono #82637
Closed

maraf added 2 commits May 30, 2023 09:22

Fix build
280fe69

Console friendly
bbde368

maraf added 4 commits June 23, 2023 11:04

Feedback WBT templates
023387f

Feedback symbols
e690d6e

DebugLevel
6c7eb28

Feedback WasmRuntimeAssetsLocation message
ccf8234

ilonatommy approved these changes Jun 26, 2023
View reviewed changes

build-analysisBot mentioned this pull request Jun 27, 2023
JIT/jit64/opt/rngchk/RngchkStress2.cs failing to build with error CS8078: An expression is too long or complex to compile#87879
Closed

Revert "Rename test-main.js to test-main.mjs"
2e119ce

build-analysisBot mentioned this pull request Jun 27, 2023
[browser][MT] The WebSocket is not connected. #88084
Closed

radical added 3 commits June 27, 2023 22:26

Merge remote-tracking branch 'origin/main' into WasmUnifyBootConfigSc…
9c0ce98
…hema

[wasm] WBT: Add --module for enabling use of es6 modules
e027248

Add --module only for v8
d059cec

radical approved these changes Jun 28, 2023
View reviewed changes

radical merged commit f623089 into dotnet:mainJun 28, 2023

maraf deleted the WasmUnifyBootConfigSchema branch June 28, 2023 06:03

ilonatommy mentioned this pull request Jun 30, 2023
[Webassembly] dotnet/runtime update broke the aspnetcore build #88250
Closed

maraf mentioned this pull request Jun 30, 2023
[browser] Fix missing braces #88264
Merged

maraf pushed a commit that referenced this pull request Jun 30, 2023
[browser] Fix missing braces when resolving application culture (#88264)
7ce55cb
Regression from #86255.

radekdoulik mentioned this pull request Jul 11, 2023
[Perf] Linux/x64: 9 Regressions on 6/28/2023 3:57:02 AM dotnet/perf-autofiling-issues#19515
Open

ghost locked as resolved and limited conversation to collaborators Jul 28, 2023