|
41 | 41 | </ItemGroup> |
42 | 42 | </Target> |
43 | 43 |
|
44 | | - <!-- For local builds, only one of the 3 required runtime packs might be available. In that case, |
| 44 | + <!-- For local builds, only one of the 2 required runtime packs might be available. In that case, |
45 | 45 | build the other nugets with the *same runtime* but different names. |
46 | 46 | --> |
47 | 47 | <Target Name="_GetRuntimePackNuGetsToBuild" Condition="'$(WasmSkipMissingRuntimePackBuild)' != 'true'" Returns="@(_NuGetsToBuild)"> |
48 | 48 | <Error Condition="'$(RIDForWorkload)' == ''" Text="$(RIDForWorkload) is unset" /> |
49 | 49 | <PropertyGroup> |
50 | | - <_BuildVariant Condition="'$(WasmEnableThreads)' == 'true'">multithread</_BuildVariant> |
51 | | - <_Descriptor Condition="'$(WasmEnableThreads)' == 'true'">runtime pack for $(_BuildVariant)</_Descriptor> |
52 | | - <_Descriptor Condition="'$(WasmEnableThreads)' != 'true'">single threaded runtime pack</_Descriptor> |
| 50 | + <_IsMTNugetMissing Condition="'$(WasmEnableThreads)' != 'true'">true</_IsMTNugetMissing> |
| 51 | + <_BuildVariant Condition="'$(_IsMTNugetMissing)' == 'true'">multithread</_BuildVariant> |
| 52 | + <_Descriptor Condition="'$(_IsMTNugetMissing)' == 'true'">runtime pack for $(_BuildVariant)</_Descriptor> |
| 53 | + <_Descriptor Condition="'$(_IsMTNugetMissing)' != 'true'">single threaded runtime pack</_Descriptor> |
53 | 54 | <_DefaultRuntimePackNuGetPath>$([System.String]::Join('.', |
54 | 55 | $(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono, |
55 | 56 | $(_BuildVariant), |
|
67 | 68 | Text="Expected to find either one or two in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" /> |
68 | 69 |
|
69 | 70 | <ItemGroup> |
| 71 | + <!-- We need nugets for all wasm runtime flavors. The one corresponding the current |
| 72 | + property values is already built, the others need to be added to _NuGetsToBuild --> |
70 | 73 | <_NuGetsToBuild Include="$(_DefaultRuntimePackNuGetPath)" |
71 | 74 | Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" |
72 | 75 | Dependencies="$(_DefaultRuntimePackNuGetPath)" |
73 | | - Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(WasmEnableThreads)" |
| 76 | + Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(_IsMTNugetMissing)" |
74 | 77 | Descriptor="$(_Descriptor)"/> |
75 | 78 | </ItemGroup> |
76 | 79 |
|
|
0 commit comments