Correctly build VSTemplateLocator package

Author: ViktorHofer

Directory.Build.targets

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
+
   <ItemGroup>
     <SupportedPlatform Remove="Android" />
     <SupportedPlatform Remove="iOS" />
@@ -36,13 +37,18 @@
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+  <PropertyGroup>
+    <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
+    <FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
+    <FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
+  </PropertyGroup>
+
   <!-- Optionally override arcade's test target with one which will run the tests as tools.
        Conditionally overriding a target requires a conditional import of another (.targets)
        file. -->
   <Import Project="OverrideTest.targets"
           Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
 
-
   <!-- Update KnownFrameworkReferences to target the right version of the runtime -->
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
                           and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))

eng/Build.props

@@ -10,7 +10,7 @@
     <!-- For product build, build SdkResolver and VSTemplateLocator only in the second build pass as they depend on
          assets from other verticals that are built in the first build pass. -->
     <ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\SdkResolver.csproj" DotNetBuildPass="2" />
-    <ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSTemplateLocator.csproj" DotNetBuildPass="2" />
+    <ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj" DotNetBuildPass="2" />
   </ItemGroup>
 
 </Project>

sdk.sln

@@ -1,11 +1,13 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
+<Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
     <TargetFramework>$(SdkTargetFramework)</TargetFramework>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
+
+    <VSTemplateLocatorNuspecFile>$(MSBuildThisFileDirectory)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec</VSTemplateLocatorNuspecFile>
+    <VSTemplateLocatorNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg</VSTemplateLocatorNupkgFile>
+
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
     <!-- For product build, this project only builds in the second build pass as it depends on assets other
          verticals that are built in the first build pass. -->
@@ -23,11 +25,7 @@
     <ProjectReference Include="$(RepoRoot)src\Microsoft.DotNet.TemplateLocator\Microsoft.DotNet.TemplateLocator.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <Target Name="GenerateLayout"
-          Condition="'$(OS)' == 'Windows_NT' and '$(_SuppressAllTargets)' != 'true'"
-          BeforeTargets="AfterBuild">
-    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
-
+  <Target Name="GenerateLayout">
     <RemoveDir Directories="$(OutputPath)" />
     <MakeDir Directories="$(OutputPath)" />
 
@@ -43,6 +41,30 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(_VSTemplateLocatorSrc)" DestinationFiles="@(_VSTemplateLocatorDst)" />
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
+  </Target>
+
+  <!-- For product build, this only builds in the second build pass as it depends on assets
+       from other verticals that are built in the first build pass. -->
+  <Target Name="GenerateVSTemplateLocatorNupkg"
+          DependsOnTargets="GenerateLayout"
+          Condition="'$(OS)' == 'Windows_NT' and
+                     '$(Architecture)' == 'x64' and
+                     '$(PgoInstrument)' != 'true' and
+                     ('$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2') and
+                     '$(_SuppressAllTargets)' != 'true'"
+          Inputs="$(OutputPath)/**/*;
+                  $(VSTemplateLocatorNuspecFile);
+                  $(GenerateNupkgPowershellScript)"
+          Outputs="$(VSTemplateLocatorNupkgFile)"
+          AfterTargets="Build">
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ArtifactsDir)' ^
+                      '$(OutputPath.TrimEnd('\'))' ^
+                      '$(FullNugetVersion)' ^
+                      '$(VSTemplateLocatorNuspecFile)' ^
+                      '$(VSTemplateLocatorNupkgFile)'" />
   </Target>
 
 </Project>

src/Installer/redist-installer/packaging/windows/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec renamed to src/Installer/redist-installer/projects/VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec

@@ -25,7 +25,6 @@
        which need assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuild)' != 'true' or '$(ExcludeFromDotNetBuild)' != 'true'">
     <ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,7 +34,6 @@
   <Import Project="targets\BuildCoreSdkTasks.targets" />
   <Import Project="targets\GetRuntimeInformation.targets" />
   <Import Project="targets\SetBuildDefaults.targets" />
-  <Import Project="targets\Versions.targets" />
   <Import Project="targets\Branding.targets" />
   <Import Project="targets\BundledTemplates.targets" />
   <Import Project="targets\BundledManifests.targets" />

src/Installer/redist-installer/projects/VSTemplateLocator.csproj renamed to src/Installer/redist-installer/projects/VSTemplateLocator/VSTemplateLocator.csproj

@@ -511,7 +511,7 @@
   </Target>
 
   <Target Name="GenerateVersionFile"
-          DependsOnTargets="SetupBundledComponents;GenerateFullNuGetVersion">
+          DependsOnTargets="SetupBundledComponents">
     <WriteLinesToFile File="$(SdkOutputDirectory).version"
                       Lines="$(SourceRevisionId);$(Version);$(Rid);$(FullNugetVersion);$(SdkFeatureBand)"
                       Overwrite="true" />
@@ -611,7 +611,6 @@
           DependsOnTargets="DownloadBundledComponents;
                             CleanLayoutPath;
                             LayoutBundledComponents;
-                            GenerateFullNuGetVersion;
                             GenerateVersionFile;
                             CopyKnownWorkloadManifestFile;
                             GenerateBundledVersions;

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

@@ -33,10 +33,6 @@
       <SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
       <SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>
 
-      <VSTemplateLocatorLayoutPath>$(ArtifactsDir)bin/VSTemplateLocator/$(Configuration)</VSTemplateLocatorLayoutPath>
-      <VSTemplateLocatorNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec</VSTemplateLocatorNuspecFile>
-      <VSTemplateLocatorNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg</VSTemplateLocatorNupkgFile>
-
       <!-- Temp directory for light command layouts -->
       <LightCommandObjDir>$(ArtifactsObjDir)/LightCommandPackages</LightCommandObjDir>
       <!-- Directory for the zipped up light command package -->
@@ -440,12 +436,14 @@
     </ItemGroup>
   </Target>
 
+  <!-- For product build, this only builds in the second build pass as it depends on assets
+       from other verticals that are built in the first build pass. -->
   <Target Name="GenerateSdkMSBuildExtensionsNupkg"
           DependsOnTargets="GenerateLayout;GenerateMSBuildExtensions;MsiTargetsSetupInputOutputs"
-          Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
+          Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and ('$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2')"
           Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
-                    $(SdkMSBuildExtensionsNuspecFile);
-                    $(GenerateNupkgPowershellScript)"
+                  $(SdkMSBuildExtensionsNuspecFile);
+                  $(GenerateNupkgPowershellScript)"
           Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">
     <GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
                                   OutputFile="$(SdkMSBuildExtensionsSwrFile)" />
@@ -466,9 +464,9 @@
   <Target Name="GenerateVSTemplateLocatorNupkg"
           DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
           Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and ('$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2')"
-          Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
-                    $(VSTemplateLocatorNuspecFile);
-                    $(GenerateNupkgPowershellScript)"
+          Inputs="$(VSTemplateLocatorLayoutPath)/**/*;
+                  $(VSTemplateLocatorNuspecFile);
+                  $(GenerateNupkgPowershellScript)"
           Outputs="$(VSTemplateLocatorNupkgFile)">
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ArtifactsDir)' ^