Skip to content

Commit 3bd18c3

Browse files
authored
Forgot changes
1 parent 412adb3 commit 3bd18c3

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

src/Installer/redist-installer/redist-installer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" />
2222
</ItemGroup>
2323

24-
<!-- For product build, this only builds in the second build pass as it depends on SdkResolver and VSTemplateLocator
24+
<!-- For product build, this only builds in the second build pass as it depends on SdkResolver
2525
which need assets from other verticals that are built in the first build pass. -->
2626
<ItemGroup Condition="'$(DotNetBuild)' != 'true' or '$(ExcludeFromDotNetBuild)' != 'true'">
2727
<ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" />

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -459,23 +459,6 @@
459459
'$(SdkMSBuildExtensionsNupkgFile)'" />
460460
</Target>
461461

462-
<!-- For product build, this only builds in the second build pass as it depends on assets
463-
from other verticals that are built in the first build pass. -->
464-
<Target Name="GenerateVSTemplateLocatorNupkg"
465-
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
466-
Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and ('$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2')"
467-
Inputs="$(VSTemplateLocatorLayoutPath)/**/*;
468-
$(VSTemplateLocatorNuspecFile);
469-
$(GenerateNupkgPowershellScript)"
470-
Outputs="$(VSTemplateLocatorNupkgFile)">
471-
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
472-
'$(ArtifactsDir)' ^
473-
'$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^
474-
'$(FullNugetVersion)' ^
475-
'$(VSTemplateLocatorNuspecFile)' ^
476-
'$(VSTemplateLocatorNupkgFile)'" />
477-
</Target>
478-
479462
<Target Name="GenerateMsis"
480463
DependsOnTargets="GenerateLayout;
481464
MsiTargetsSetupInputOutputs;
@@ -487,8 +470,7 @@
487470
GenerateToolsetNupkg;
488471
GenerateTemplatesNupkgs;
489472
GenerateSdkPlaceholderNupkg;
490-
GenerateSdkMSBuildExtensionsNupkg;
491-
GenerateVSTemplateLocatorNupkg"
473+
GenerateSdkMSBuildExtensionsNupkg"
492474
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " />
493475

494476
</Project>

0 commit comments

Comments
 (0)