Skip to content

[wasi] Fixes to enable more tests#82966

Merged
radical merged 5 commits intodotnet:mainfrom
radical:wasi-fixes
Mar 8, 2023
Merged

[wasi] Fixes to enable more tests#82966
radical merged 5 commits intodotnet:mainfrom
radical:wasi-fixes

Conversation

@radical
Copy link
Member

@radical radical commented Mar 3, 2023

[wasi] Copy WasmFilesToIncludeInFileSystem to the bundle too

This could be changed in the future to include in the single file bundle.

  • This fixes System.IO.Packaging, and System.Data.DataSetExtensions tests.

WasiAppBuilder: Create an empty /tmp

And enable System.Runtime.Serialization.Xml.Tests, and System.Runtime.Serialization.Xml.ReflectionOnly.Tests

TODO: single file case

@radical radical added arch-wasm WebAssembly architecture test-enhancement Improvements of test source code area-Build-mono os-wasi Related to WASI variant of arch-wasm labels Mar 3, 2023
@radical radical requested review from lewing and pavelsavara March 3, 2023 23:59
@radical radical requested a review from marek-safar as a code owner March 3, 2023 23:59
@ghost ghost assigned radical Mar 3, 2023
@ghost
Copy link

ghost commented Mar 3, 2023

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

Issue Details

This could be changed in the future to include in the single file bundle.

  • This fixes System.IO.Packaging, and System.Data.DataSetExtensions tests.
Author: radical
Assignees: -
Labels:

arch-wasm, test-enhancement, area-Build-mono, os-wasi

Milestone: -

@radical radical changed the title [wasi] Copy WasmFilesToIncludeInFileSystem to the bundle too [wasi] Fixes to enable more tests Mar 4, 2023
@radical radical requested review from ilonatommy and maraf March 4, 2023 00:26
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.

I would like to differentiate the WasmFilesToIncludeInFileSystem vs WasmExtraFilesToDeploy.
For browser WasmFilesToIncludeInFileSystem is to VFS and WasmExtraFilesToDeploy is to web server.
For wasi VFS doesn't exist and we don't plan it. And there is no web server.

Could we have other property which would do "copy to output" under different name in WASI ?

@ghost ghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label Mar 6, 2023
@pavelsavara
Copy link
Member

@maraf could you please chime in for the new Razor static assets ?

@maraf
Copy link
Member

maraf commented Mar 6, 2023

StaticWebAssets will replace WasmExtraFilesToDeploy. In the future we may use them new trait type to also replace files for VFS. I agree to have a different property WASI "files". StaticWebAssets won't touch WASI.

@radical
Copy link
Member Author

radical commented Mar 6, 2023

For wasi I don't plan to keep these two properties at all, and instead completely rely on the regular None/Content types. This will be happen once the publish related integration that I had mentioned earlier is in place.

@ghost ghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label Mar 6, 2023
@radical
Copy link
Member Author

radical commented Mar 6, 2023

So, this is temporary to get the tests working.

@radical radical requested a review from pavelsavara March 6, 2023 18:12
@pavelsavara
Copy link
Member

So, this is temporary to get the tests working.

Makes sense. Could you please open issue for that and put link into the code at right places. Thanks!

@radical
Copy link
Member Author

radical commented Mar 7, 2023

So, this is temporary to get the tests working.

Makes sense. Could you please open issue for that and put link into the code at right places. Thanks!

Opened #83108 . Reference at specific places in the code isn't needed.

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.

good as temporary solution to unblock testing

@radical radical merged commit 49553e8 into dotnet:main Mar 8, 2023
@radical radical deleted the wasi-fixes branch March 8, 2023 16:26
@ghost ghost locked as resolved and limited conversation to collaborators Apr 7, 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 os-wasi Related to WASI variant of arch-wasm test-enhancement Improvements of test source code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants