diff --git a/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj b/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj index 100d034baca6..076633aa5eb1 100644 --- a/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj +++ b/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj @@ -37,6 +37,8 @@ --> + + $(NoWarn);NU1605;IL2026;IL2008;IL2104 @@ -49,7 +51,7 @@ + BeforeTargets="AfterBuild" Condition=" $(_IsPublishing) != 'true' "> @@ -75,27 +77,88 @@ - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\SharedAssets.md" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\json_file_asset.json" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-100.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-125.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-150.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-200.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-300.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-400.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\SharedAssets.md" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\json_file_asset.json" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-100.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-125.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-150.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-200.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-300.png" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-400.png" /> + + + <_AssetsToValidate Include="$(OutputPath)wwwroot\..\staticwebapp.config.json" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\..\web.config" /> + + + <_AssetsToValidate Include="$(OutputPath)wwwroot\test_root_asset.json" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\test_root_asset_not_included.json" MustNotExist="true" /> + + + + + + + + + + + + <_StaticAssetsToValidate Include="uno53lib-test.xml" /> + <_StaticAssetsToValidate Include="uno53lib_icon_lib.png" /> + + + + + + + + @(StaticWebAssetsRuntimeLines) + + + + + + + + + + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\SharedAssets.md" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\json_file_asset.json" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-100.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-125.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-150.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-200.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-300.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-400.png" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\..\staticwebapp.config.json" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\..\web.config" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\staticwebapp.config.json" /> + <_AssetsToValidate Include="$(OutputPath)wwwroot\web.config" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\test_root_asset.json" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\test_root_asset_not_included.json" MustNotExist="true" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\test_root_asset.json" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\test_root_asset_not_included.json" MustNotExist="true" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\uno53lib\Assets\test.xml" /> - <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\uno53lib\Assets\icon_lib.png" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\uno53lib\Assets\uno53lib-test.xml" /> + <_AssetsToValidate Include="$(PublishDir)wwwroot\uno53lib\Assets\uno53lib_icon_lib.png" /> - + $(TargetsForTfmSpecificContentInPackage);_UnoIncludeLibraryAssets - + $(AssemblyName) $(UnoPriInitialPath).uprimarker $(TargetDir)$(ProjectUnoPriFileName) @@ -35,7 +35,7 @@ AfterTargets="_UnoGeneratePriMarker" DependsOnTargets="_DefineUnoPriProperties" BeforeTargets="GetCopyToOutputDirectoryItems"> - + <_AllChildProjectItemsWithTargetPath Include="$(ProjectUnoPriFullPath)"> $(ProjectUnoPriFileName) @@ -45,7 +45,7 @@ - + + + + + + <_UnoBootstrapServerReference Include="@(PackageReference)" Condition="'%(Identity)'=='Uno.Wasm.Bootstrap.Server'" /> + + + + <_AllChildProjectPublishItemsWithTargetPath Include="@(ContentWithTargetPath)"> + + $(UnoPriInitialPath)$(_UnoDirectorySeparator)%(ContentWithTargetPath.Link) + $(UnoPriInitialPath)$(_UnoDirectorySeparator)%(ContentWithTargetPath.TargetPath) + PreserveNewest + PreserveNewest + + + + + +