Skip to content

Fix running WebAssembly Browser App from VS #75384

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
lewing merged 13 commits into from
Sep 14, 2022
Merged

Fix running WebAssembly Browser App from VS #75384

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fbaa143
trying to fix 75356
thaystg Sep 9, 2022
eb7c4e7
Trying to fix for running from VS and from command line
thaystg Sep 10, 2022
5ff1f25
Remove unused spaces
thaystg Sep 10, 2022
e3586f9
Fix again
thaystg Sep 10, 2022
2298799
Addressing @radical comments
thaystg Sep 12, 2022
dc69941
Merge remote-tracking branch 'origin/main' into thays_fix_75356
radical Sep 12, 2022
df43272
OutputPath can be missing the rid during the evaluation
radical Sep 12, 2022
a37a23d
more cleanup
radical Sep 12, 2022
5df539f
Replacing NormalizeDirectory with [System.IO.Path]::Combine
thaystg Sep 12, 2022
1412175
[wasm] Add tests for running templates outside project directory
radical Sep 12, 2022
de789c3
Merge remote-tracking branch 'origin/main' into thays_fix_75356
radical Sep 13, 2022
bc6809f
Add tests for browser template
radical Sep 13, 2022
ee680f5
Disable failing test
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
OutputPath can be missing the rid during the evaluation
  • Loading branch information
@radical
radical committed Sep 12, 2022
commit df4327280a6640c52eaf57a0a3e0c44a73fd333f
18 changes: 15 additions & 3 deletions src/mono/wasm/build/WasmApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,29 @@
<!-- if DebuggerSupport==true, then ensure that WasmDebugLevel isn't disabling debugging -->
<WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>

<_FullOutputPath Condition="!$([System.IO.Path]::IsPathRooted($(OutputPath)))">$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(OutputPath)))</_FullOutputPath>
<_FullOutputPath Condition=" $([System.IO.Path]::IsPathRooted($(OutputPath)))">$(OutputPath)</_FullOutputPath>

<!-- workaround: RuntimeIdentifierInference.targets is imported after this file, and updates OutputPath to include
the RID. So, we don't have the correct final OutputPath here. But we need it for `dotnet run` to work,
as it just reads the RunCommand after evaluation. -->
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == '' and !$([System.IO.Path]::IsPathRooted($(OutputPath)))">$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(OutputPath), 'browser-wasm', 'AppBundle'))</_AppBundleDirForRunCommand>
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == ''">$([MSBuild]::NormalizeDirectory($(OutputPath), 'browser-wasm', 'AppBundle'))</_AppBundleDirForRunCommand>
<_AppBundleDirForRunCommand Condition="Exists('$(WasmAppDir)/$(AssemblyName).runtimeconfig.json')">$(WasmAppDir)</_AppBundleDirForRunCommand>

<_AppBundleCandidatePath>$([MSBuild]::NormalizeDirectory($(_FullOutputPath), 'AppBundle'))</_AppBundleCandidatePath>
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == '' and Exists($(_AppBundleCandidatePath))">$(_AppBundleCandidatePath)</_AppBundleDirForRunCommand>

<_AppBundleCandidatePath>$([MSBuild]::NormalizeDirectory($(_FullOutputPath), 'browser-wasm', 'AppBundle'))</_AppBundleCandidatePath>
<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == '' and Exists($(_AppBundleCandidatePath))">$(_AppBundleCandidatePath)</_AppBundleDirForRunCommand>

<_AppBundleDirForRunCommand Condition="'$(_AppBundleDirForRunCommand)' == ''">Could not determine the AppBundle path. _FullOutputPath=$(_FullOutputPath), OutDir=$(OutDir)</_AppBundleDirForRunCommand>
</PropertyGroup>

<PropertyGroup Condition="'$(WasmGenerateAppBundle)' == 'true'">
<RunCommand Condition="'$(DOTNET_HOST_PATH)' != '' and Exists($(DOTNET_HOST_PATH))">$(DOTNET_HOST_PATH)</RunCommand>
<RunCommand Condition="'$(RunCommand)' == ''">dotnet</RunCommand>
<RunArguments Condition="'$(RunArguments)' == ''">exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --runtime-config &quot;$(_AppBundleDirForRunCommand)/$(AssemblyName).runtimeconfig.json&quot; $(WasmHostArguments)</RunArguments>

<_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_AppBundleDirForRunCommand), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>
<RunArguments Condition="'$(RunArguments)' == ''">exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
<RunWorkingDirectory Condition="'$(RunWorkingDirectory)' == ''">$(_AppBundleDirForRunCommand)</RunWorkingDirectory>
</PropertyGroup>

Expand Down