Skip to content

Commit af04fc7

Browse files
authored
minor WBT fixups for local testing (#87817)
Now that there's no perftrace variant, the _BuildVariants item group could be empty. Also replace "three" by "two" and 3 by 2 in a few places
1 parent 4198ed7 commit af04fc7

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

eng/testing/tests.browser.targets

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@
303303
<_RuntimePackNugetAvailable Remove="@(_RuntimePackNugetAvailable)" Condition="$([System.String]::new('%(_RuntimePackNugetAvailable.FileName)').EndsWith('.symbols'))" />
304304
</ItemGroup>
305305

306-
<Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 3 and @(_RuntimePackNugetAvailable -> Count()) != 1"
307-
Text="Expected to find either one or three in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
306+
<Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 2 and @(_RuntimePackNugetAvailable -> Count()) != 1"
307+
Text="Expected to find either one or two in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
308308

309309
<ItemGroup>
310310
<_BuildVariants Include="multithread" Condition="'$(_DefaultBuildVariant)' != '.multithread.'" />
@@ -313,7 +313,8 @@
313313
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj"
314314
Dependencies="$(_DefaultRuntimePackNuGetPath)"
315315
Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=%(_BuildVariants.Identity)"
316-
Descriptor="runtime pack for %(_BuildVariants.Identity)" />
316+
Descriptor="runtime pack for %(_BuildVariants.Identity)"
317+
Condition="'%(_BuildVariants.Identity)' != ''"/>
317318

318319
<!-- add for non-threaded runtime also -->
319320
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.$(RuntimeIdentifier).$(PackageVersionForWorkloadManifests).nupkg"
@@ -330,7 +331,7 @@
330331
Text="
331332
********************
332333
333-
Note: Could not find the expected three runtime packs in $(LibrariesShippingPackagesDir). Found @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)', ', ') .
334+
Note: Could not find the expected two runtime packs in $(LibrariesShippingPackagesDir). Found @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)', ', ') .
334335
To support local builds, the same runtime pack will be built with the other variant names.
335336
To disable this behavior, pass `-p:WasmSkipMissingRuntimePackBuild=true` .
336337

0 commit comments

Comments
 (0)