Skip to content

[release/7.0] Fix running WebAssembly Browser App from VS #75508

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.

Sign up for GitHub

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

Merged
carlossanlop merged 11 commits into from
Sep 13, 2022
Merged

[release/7.0] Fix running WebAssembly Browser App from VS #75508

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ee2dbb8
trying to fix 75356
thaystg Sep 9, 2022
5388eba
Trying to fix for running from VS and from command line
thaystg Sep 10, 2022
d461e7a
Remove unused spaces
thaystg Sep 10, 2022
fa45fe5
Fix again
thaystg Sep 10, 2022
43d69ff
Addressing @radical comments
thaystg Sep 12, 2022
4caaa3f
OutputPath can be missing the rid during the evaluation
radical Sep 12, 2022
215474e
more cleanup
radical Sep 12, 2022
75947b2
Replacing NormalizeDirectory with [System.IO.Path]::Combine
thaystg Sep 12, 2022
04a2bdc
[wasm] Add tests for running templates outside project directory
radical Sep 12, 2022
479e009
Add tests for browser template
radical Sep 13, 2022
5ad3d55
fix
radical Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replacing NormalizeDirectory with [System.IO.Path]::Combine
  • Loading branch information
@thaystg
thaystg authored and github-actions committed Sep 13, 2022
commit 75947b2ee6d145d8d0c9d71004bcc5434aee5d41
4 changes: 2 additions & 2 deletions src/mono/wasm/build/WasmApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@

The path might not have been created yet, for example when creating a new project in VS, so don't use an Exists() check
-->
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == ''">$([MSBuild]::NormalizeDirectory($(OutputPath), 'browser-wasm', 'AppBundle'))</_AppBundleDirForRunCommand>
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == ''">$([System.IO.Path]::Combine($(OutputPath), 'browser-wasm', 'AppBundle'))</_AppBundleDirForRunCommand>

<!-- Ensure the path is absolute. In case of VS, the cwd might not be the correct one, so explicitly
use $(MSBuildProjectDirectory). -->
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' != '' and !$([System.IO.Path]::IsPathRooted($(_AppBundleDirForRunCommand)))">$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(_AppBundleDirForRunCommand)))</_AppBundleDirForRunCommand>
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' != '' and !$([System.IO.Path]::IsPathRooted($(_AppBundleDirForRunCommand)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_AppBundleDirForRunCommand)))</_AppBundleDirForRunCommand>
</PropertyGroup>

<PropertyGroup Condition="'$(WasmGenerateAppBundle)' == 'true'">
Expand Down