Skip to content

Commit

Permalink
fix(net6): Ensure wwwroot folder is included in the dist output
Browse files Browse the repository at this point in the history
net6.0 removes content from the `Content` item group, and moves them to `StaticWebAsset`, which is now added in the Asset parameter of ShellTask.
  • Loading branch information
jeromelaban committed Dec 17, 2021
1 parent e0b5f23 commit 94de037
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
Expand Up @@ -217,7 +217,7 @@
EmccLinkOptimization="$(WasmShellEmccLinkOptimization)"
EmccLinkOptimizationLevel="$(WasmShellEmccLinkOptimizationLevel)"
NinjaAdditionalParameters="$(WasmShellNinjaAdditionalParameters)"
Assets="@(Content)"
Assets="@(Content);@(StaticWebAsset)"
ContentExtensionsToExclude="$(WasmShellContentExtensionsToExclude)"
ReferencePath="@(_UnoWasmBootstrapAssembliesForReferenceCopyLocalPaths)"
RuntimeHostConfigurationOption="@(RuntimeHostConfigurationOption)"
Expand Down
1 change: 1 addition & 0 deletions src/Uno.Wasm.Sample/sample.common.props
Expand Up @@ -30,6 +30,7 @@

<Error Condition="!exists('$(WasmShellOutputPackagePath)\AdditionalContent\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) does not exist in $(WasmShellOutputPackagePath)" />
<Error Condition="exists('$(WasmShellOutputPackagePath)\AdditionalContent\SomeContent04.txt')" Text="AdditionalContent/SomeContent04.tx should not exist in $(WasmShellOutputPackagePath)" />
<Error Condition="!exists('$(WasmShellOutputPackagePath)\..\web.config')" Text="web.config should exist in $(WasmShellOutputPackagePath)\.." />

<Error Condition="exists('$(WasmShellOutputDistPath)\AdditionalContent\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) should not exist in $(WasmShellOutputDistPath)" />
<Error Condition="!exists('$(WasmShellOutputDistPath)\AdditionalContent\SomeContent03.txt')" Text="AdditionalContent/SomeContent03.txt does not exist in $(WasmShellOutputDistPath)" />
Expand Down

0 comments on commit 94de037

Please sign in to comment.