Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wasm] Make WasmMainJSPath optional #81484

Merged
merged 28 commits into from
Feb 27, 2023
Merged

[wasm] Make WasmMainJSPath optional #81484

merged 28 commits into from
Feb 27, 2023

Conversation

maraf
Copy link
Member

@maraf maraf commented Feb 1, 2023

  • Make WasmMainJSPath required only for console targets (v8/node).
  • Drop WasmMainJSPath from browser projects.
  • Generate index.html only for browser tests.

Closes #63465

@maraf maraf added arch-wasm WebAssembly architecture area-Build-mono labels Feb 1, 2023
@maraf maraf added this to the 8.0.0 milestone Feb 1, 2023
@maraf maraf self-assigned this Feb 1, 2023
@ghost
Copy link

ghost commented Feb 1, 2023

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

Issue Details
  • Make required only for console targets (v8/node).
  • Drop it from browser projects.
Author: maraf
Assignees: maraf
Labels:

arch-wasm, area-Build-mono

Milestone: 8.0.0

@maraf

This comment was marked as resolved.

@azure-pipelines

This comment was marked as resolved.

# Conflicts:
#	src/mono/sample/wasi/Directory.Build.targets
#	src/mono/sample/wasm/Directory.Build.targets
#	src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj
#	src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj
@maraf
Copy link
Member Author

maraf commented Feb 1, 2023

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@maraf
Copy link
Member Author

maraf commented Feb 3, 2023

/azp run runtime-wasm-libtests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@maraf
Copy link
Member Author

maraf commented Feb 6, 2023

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@maraf
Copy link
Member Author

maraf commented Feb 7, 2023

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@maraf
Copy link
Member Author

maraf commented Feb 7, 2023

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@maraf
Copy link
Member Author

maraf commented Feb 16, 2023

Failure is unrelated

Copy link
Member

@pavelsavara pavelsavara left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comments but LGTM. It would be good to hear from @radical

src/mono/sample/wasm/Directory.Build.targets Outdated Show resolved Hide resolved
src/mono/wasm/build/WasmApp.targets Outdated Show resolved Hide resolved
src/mono/wasm/build/WasmApp.targets Outdated Show resolved Hide resolved
src/mono/wasm/build/WasmApp.targets Show resolved Hide resolved
@ghost ghost added needs-author-action An issue or pull request that requires more info or actions from the author. and removed needs-author-action An issue or pull request that requires more info or actions from the author. labels Feb 22, 2023
@maraf maraf requested a review from kg as a code owner February 22, 2023 10:41
@maraf
Copy link
Member Author

maraf commented Feb 23, 2023

/azp run runtime

@azure-pipelines
Copy link

Pull request contains merge conflicts.

# Conflicts:
#	src/tasks/WasmAppBuilder/WasmAppBuilder.cs
@@ -13,6 +12,7 @@

<ItemGroup>
<WasmExtraFilesToDeploy Include="index.html" />
<WasmExtraFilesToDeploy Include="main.js" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding these in the various places outside the wasm targets can be dropped now.

Copy link
Member

@radical radical left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the one comment, LGTM! Good job 👍

@radical
Copy link
Member

radical commented Feb 24, 2023

@maraf I resolved the merge conflicts. Hopefully, I didn't break anything!

@maraf
Copy link
Member Author

maraf commented Feb 27, 2023

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@maraf maraf merged commit 2bdc3cb into dotnet:main Feb 27, 2023
@maraf maraf deleted the WasmMainJsPath branch February 27, 2023 15:43
@ghost ghost locked as resolved and limited conversation to collaborators Mar 29, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
arch-wasm WebAssembly architecture area-Build-mono
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[wasm] Make WasmMainJSPath optional
3 participants