Skip to content

Commit 6c93e35

Browse files
committed
MSI change that was missed
1 parent 59e0a17 commit 6c93e35

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/Installer/redist-installer/targets/GenerateMSIs.targets

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,11 @@
461461
'$(SdkMSBuildExtensionsNupkgFile)'" />
462462
</Target>
463463

464-
<!--
465-
This project references assets from multiple architectures, so it can't be built until we have a join point job that can pull assets from multiple legs.
466-
https://github.com/dotnet/source-build/issues/4336
467-
-->
464+
<!-- For product build, this only builds in the second build pass as it depends on assets
465+
from other verticals that are built in the first build pass. -->
468466
<Target Name="GenerateVSTemplateLocatorNupkg"
469467
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
470-
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' And '$(DotNetBuild)' != 'true'"
468+
Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and ('$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2')"
471469
Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
472470
$(VSTemplateLocatorNuspecFile);
473471
$(GenerateNupkgPowershellScript)"

0 commit comments

Comments
 (0)