Skip to content

Commit 983b96d

Browse files
jeromelabanjeromelaban
authored
fix(assets): Adjust project transitive output path
1 parent bdf10e2 commit 983b96d

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

‎src/Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@
7575
<PackageReference Update="Uno.Core.Extensions.Disposables" Version="4.0.1" />
7676
<PackageReference Update="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
7777
<PackageReference Update="Uno.Diagnostics.Eventing" Version="2.0.1" />
78-
<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.0-dev.301" />
79-
<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.301" />
78+
<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.8" />
8079
<PackageReference Update="MSTest" Version="3.6.3" />
8180
<PackageReference Update="MSTest.TestFramework" Version="3.6.3" />
8281
<PackageReference Update="MSTest.TestAdapter" Version="3.6.3" />

‎src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
<PackageReference Include="Uno.BenchmarkDotNet.Annotations" Version="0.11.7-develop" />
9898
<PackageReference Include="Uno.Wasm.WebSockets" />
9999
<PackageReference Include="Uno.Wasm.Bootstrap" />
100-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
101100
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
102101
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
103102
<PackageReference Include="Uno.Fonts.Fluent" />

‎src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,27 +138,27 @@
138138

139139
<ItemGroup
140140
Condition="'$(TargetFramework)'=='net9.0-browserwasm'">
141-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\SharedAssets.md" />
142-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\json_file_asset.json" />
143-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.png" />
144-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-100.png" />
145-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-125.png" />
146-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-150.png" />
147-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-200.png" />
148-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-300.png" />
149-
<_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-400.png" />
141+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\SharedAssets.md" />
142+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\json_file_asset.json" />
143+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.png" />
144+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-100.png" />
145+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-125.png" />
146+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-150.png" />
147+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-200.png" />
148+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-300.png" />
149+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-400.png" />
150150

151151
<!-- wwwroot -->
152152
<_AssetsToValidate Include="$(PublishDir)wwwroot\staticwebapp.config.json" />
153153
<_AssetsToValidate Include="$(OutputPath)wwwroot\web.config" />
154154

155155
<!-- Validate json files handling -->
156-
<_AssetsToValidate Include="$(PublishDir)wwwroot\test_root_asset.json" />
157-
<_AssetsToValidate Include="$(PublishDir)wwwroot\test_root_asset_not_included.json" MustNotExist="true" />
156+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\test_root_asset.json" />
157+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\test_root_asset_not_included.json" MustNotExist="true" />
158158

159159
<!-- Transitive library asset -->
160-
<_AssetsToValidate Include="$(PublishDir)wwwroot\uno53lib\Assets\uno53lib-test.xml" />
161-
<_AssetsToValidate Include="$(PublishDir)wwwroot\uno53lib\Assets\uno53lib_icon_lib.png" />
160+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\uno53lib\Assets\uno53lib-test.xml" />
161+
<_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\uno53lib\Assets\uno53lib_icon_lib.png" />
162162
</ItemGroup>
163163

164164
<Error Text="Missing asset %(_AssetsToValidate.Identity)"

‎src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
<_UnoTransitiveItems Include="@(UnoAllCopyToOutputItems)">
294294
<!-- set the ContentRoot using GetDirectoryName -->
295295
<ContentRoot>$([System.IO.Path]::GetDirectoryName('%(FullPath)'))</ContentRoot>
296-
<Link>wwwroot/%(TargetPath)</Link>
296+
<Link>wwwroot/$(WasmShellOutputPackagePath)/%(TargetPath)</Link>
297297
<TargetPath></TargetPath>
298298
</_UnoTransitiveItems>
299299

0 commit comments

Comments
 (0)