Trim some unused infrastructure code (#1575)

Author: dagood

.gitmodules

@@ -20,9 +20,6 @@
     <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
 
-    <!-- true if we have bootstrapped buildtools (usually on an unsupported platform -->
-    <_IsBootstrapping Condition="'$(BootstrapBuildToolsDir)' != ''">true</_IsBootstrapping>
-
     <PortableBuild Condition="'$(OS)' == 'Windows_NT'">true</PortableBuild>
     <PortableBuild Condition="'$(PortableBuild)' == ''">false</PortableBuild>
     <UseSystemLibraries Condition="'$(UseSystemLibraries)' == '' AND '$(PortableBuild)' != 'true'">true</UseSystemLibraries>
@@ -116,7 +113,6 @@
     <GeneratedSourcePathOnline>$(IntermediatePath)generatedSrc</GeneratedSourcePathOnline>
     <GeneratedSourcePathOffline>$(SubmoduleDirectory)generatedSrc</GeneratedSourcePathOffline>
     <LocalBlobStorageRoot>$(IntermediatePath)blobs/</LocalBlobStorageRoot>
-    <LocalBuildInfoRoot>$(IntermediatePath)build-info/</LocalBuildInfoRoot>
     <LocalNuGetPackagesRoot>$(IntermediatePath)nuget-packages/</LocalNuGetPackagesRoot>
     <SourceBuiltBlobFeedDir>$(IntermediatePath)blob-feed/</SourceBuiltBlobFeedDir>
     <SourceBuiltPackagesPath>$(SourceBuiltBlobFeedDir)packages/</SourceBuiltPackagesPath>

Directory.Build.props

@@ -32,16 +32,6 @@
     <GitCommitDateNoDashes>$(GitCommitDate.Replace('-', ''))</GitCommitDateNoDashes>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <VersionFilename>Latest_Packages.txt</VersionFilename>
-    <VersionFileDirectory>$(LocalBuildInfoRoot)</VersionFileDirectory>
-    <VersionFileLocation Condition="'$(VersionFileLocation)' == ''">$(VersionFileDirectory)$(RepositoryOrganization)/$(RepositoryName)/$(RepositoryBranch)/$(VersionFilename)</VersionFileLocation>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <OrchestratedManifestBuildName Condition="'$(OrchestratedManifestBuildName)' == ''">$(RepositoryName)</OrchestratedManifestBuildName>
-  </PropertyGroup>
-
   <!-- A human-readable description of what's building and why. -->
   <PropertyGroup>
     <ProjectBuildReason>'$(RepositoryName)'</ProjectBuildReason>
@@ -50,61 +40,67 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EnvironmentVariables Include="DOTNET_TOOL_DIR=$(DotNetCliToolDir)" />
-    <EnvironmentVariables Include="DotNetToolPath=$(DotNetCliToolDir)" />
-    <EnvironmentVariables Include="DotNetTool=$(DotNetCliToolDir)dotnet" />
-    <EnvironmentVariables Include="BUILD_TOOLS_TOOL_DIR=$(ProjectDir)Tools/" Condition="'$(RepositoryName)' != 'arcade'" />
-    <EnvironmentVariables Include="BUILD_TOOLS_TOOL_DIR=$(ProjectDir)Tools/source-build/" Condition="'$(RepositoryName)' == 'arcade'" />
-    <EnvironmentVariables Include="BUILDTOOLS_SKIP_CROSSGEN=1" />
-    <!-- New env-var names to replace the ones above over time -->
     <EnvironmentVariables Include="DotNetBuildFromSource=true" />
     <EnvironmentVariables Include="DotNetRestorePackagesPath=$(PackagesDir)" />
     <EnvironmentVariables Include="DotNetBuildOffline=true" Condition="'$(OfflineBuild)' == 'true'" />
+
+    <!-- Ensure the SDK (Core-SDK/Installer) doesn't add an online source. -->
     <EnvironmentVariables Include="AddDotnetfeedProjectSource=false" Condition="'$(OfflineBuild)' == 'true'" />
-    <EnvironmentVariables Include="DotNetCoreSdkDir=$(DotNetCliToolDir)" />
-    <EnvironmentVariables Include="DotNetBuildToolsDir=$(ProjectDir)Tools/" Condition="'$(RepositoryName)' == 'arcade'" />
-    <EnvironmentVariables Include="DotNetBuildToolsDir=$(ProjectDir)Tools/source-built" Condition="'$(RepositoryName)' != 'arcade'" />
-    <!-- DotNetRoot is used by Arcade vs DotNetCoreSdkDir for BuildTools -->
-    <EnvironmentVariables Include="DotNetRoot=$(DotNetCliToolDir)" />
+
+    <!-- Arcade tools.sh picks up DotNetCoreSdkDir, but we can pass DOTNET_INSTALL_DIR directly. -->
+    <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="DOTNET_PATH=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="DOTNET_HOST_PATH=$(DotNetCliToolDir)dotnet" />
+
     <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
     <EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="_DotNetInstallDir=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="_InitializeToolset=$(ProjectDir)Tools/source-built/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj" Condition="'$(UseBootstrapArcade)' != 'true'" />
-    <EnvironmentVariables Include="BuildToolsPackageDir=$(ToolsDir)" Condition="'$(RepositoryName)' == 'arcade'" />
-    <EnvironmentVariables Include="BuildToolsPackageDir=$(ToolsDir)source-built" Condition="'$(RepositoryName)' != 'arcade'" />
 
+    <!--
+      With ProdCon v2, stabilization options are checked in, unlike ProdCon v1. These should be
+      deprecated but are left in to avoid potentially regressing edge-case versioning.
+    -->
     <EnvironmentVariables Include="StabilizePackageVersion=$(IsStable)" Condition="'$(IsStable)' != '' and '$(IsToolingProject)' != 'true'" />
     <EnvironmentVariables Include="PB_IsStable=$(IsStable)" Condition="'$(IsStable)' != '' and '$(IsToolingProject)' != 'true'" />
     <EnvironmentVariables Include="IsStableBuild=$(IsStable)" Condition="'$(IsStable)' != '' and '$(IsToolingProject)' != 'true'" />
     <EnvironmentVariables Include="DotNetFinalVersionKind=release" Condition="'$(IsStable)' == 'true' and '$(IsToolingProject)' != 'true'" />
     <EnvironmentVariables Include="DropSuffix=true" Condition="'$(IsStable)' == 'true' and '$(IsToolingProject)' != 'true'" />
 
     <EnvironmentVariables Include="DotNetUseShippingVersions=true" />
+
+    <EnvironmentVariables Include="PreReleaseVersionLabel=$(PreReleaseVersionLabel)" />
+    <EnvironmentVariables Include="PackageVersionStamp=$(PreReleaseVersionLabel)" />
+    <EnvironmentVariables Include="PB_VersionStamp=$(PreReleaseVersionLabel)" />
+
+    <!-- We pass '-ci', but also apply ci mode via env var for edge cases. (E.g. misbehaving inner builds.) -->
     <EnvironmentVariables Include="ContinuousIntegrationBuild=true" />
 
     <!-- Turn off node reuse for source build because repos use conflicting versions 
          of compilers which cause assembly load errors.  
          See https://github.com/dotnet/source-build/issues/541 -->
     <EnvironmentVariables Include="MSBUILDDISABLENODEREUSE=1" />
 
-    <!-- some repos do this in a separate process -->
+    <!--
+      Apply official build versioning to match Microsoft build. These are based on build date, so
+      need to be parsed from Maestro++ auto-update and passed through.
+    -->
     <EnvironmentVariables Include="OfficialBuildId=$(OfficialBuildId)" />
     <EnvironmentVariables Include="BUILD_BUILDNUMBER=$(OfficialBuildId)" />
+
+    <!-- Give build access to commit info without necessarily requiring git queries. -->
     <EnvironmentVariables Include="GitCommitCount=$(GitCommitCount)" />
     <EnvironmentVariables Include="GitCommitHash=$(GitCommitHash)" Condition="'$(GitCommitHash)' != ''" />
     <EnvironmentVariables Include="GitInfoCommitHash=$(GitCommitHash)" Condition="'$(GitCommitHash)' != ''" />
     <EnvironmentVariables Include="SourceRevisionId=$(GitCommitHash)" Condition="'$(GitCommitHash)' != ''" />
     <EnvironmentVariables Include="RepositoryCommit=$(GitCommitHash)" Condition="'$(GitCommitHash)' != ''" />
     <EnvironmentVariables Include="COMMIT_SHA=$(GitCommitHash)" Condition="'$(GitCommitHash)' != ''" />
     <EnvironmentVariables Include="GIT_COMMIT=$(GitCommitHash)" Condition="'$(GitCommitHash)' != ''" />
-    <EnvironmentVariables Include="PreReleaseVersionLabel=$(PreReleaseVersionLabel)" />
-    <EnvironmentVariables Include="PackageVersionStamp=$(PreReleaseVersionLabel)" />
-    <EnvironmentVariables Include="PB_VersionStamp=$(PreReleaseVersionLabel)" />
     <EnvironmentVariables Include="RepositoryType=Git" />
+
     <EnvironmentVariables Include="DeterministicSourcePaths=true" Condition="'$(DeterministicBuildOptOut)' != 'true'" />
     <EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />
+
     <EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
   </ItemGroup>
 

fetch-vsts-commits.ps1

@@ -309,14 +309,6 @@
     <Delete Files="@(_FilesToDelete)" />
   </Target>
 
-  <Target Name="WriteVersions"
-          AfterTargets="CopyPackage"
-          DependsOnTargets="GatherBuiltPackages">
-    <WriteVersionsFile NugetPackages="@(_BuiltPackages)"
-                       OutputPath="$(VersionFileLocation)"
-                       Condition="'@(_BuiltPackages)'!=''" />
-  </Target>
-
   <Target Name="ExtractToolPackage"
           DependsOnTargets="GatherBuiltPackages"
           AfterTargets="Build"
@@ -392,25 +384,6 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="BootstrapBuildTools" BeforeTargets="Build"
-         Condition="'$(SkipBootstrapBuildTools)' != 'true' and '$(_IsBootstrapping)' == 'true'">
-   <PropertyGroup>
-     <ProjectToolsDir>$(ProjectDirectory)Tools/</ProjectToolsDir>
-   </PropertyGroup>
-   <RemoveDir Directories="$(ProjectToolsDir)" />
-   <MakeDir Directories="$(ProjectToolsDir)" />
-   <ItemGroup>
-     <BuildToolsFile Include="$(BootstrapBuildToolsDir)/**" />
-     <BuildToolsFile Include="$(ProjectDirectory)Tools-Override/**" />
-   </ItemGroup>
-
-   <Copy SourceFiles="@(BuildToolsFile)"
-         DestinationFiles="@(BuildToolsFile->'$(ProjectToolsDir)%(RecursiveDir)%(Filename)%(Extension)')" />
-
-   <Copy SourceFiles="$(BootstrapBuildToolsDir)/BuildToolsVersion.txt"
-         DestinationFolder="$(ProjectDirectory)" />
-  </Target>
-
   <Target Name="SetSourceBuiltSdkOverrides"
           BeforeTargets="Build"
           Condition="'@(UseSourceBuiltSdkOverride)' != ''">
@@ -514,7 +487,6 @@
   </Target>
 
   <Target Name="GetProjectDirectory" Outputs="$(ProjectDirectory)" />
-  <Target Name="GetOrchestratedManifestBuildName" Outputs="$(OrchestratedManifestBuildName)" />
   <Target Name="GetOfficialBuildId" Outputs="$(OfficialBuildId)" />
   <Target Name="GetRepositoryReferences" Outputs="@(RepositoryReference)" />
 

fetch-vsts-commits.sh

@@ -9,7 +9,6 @@
   <PropertyGroup>
     <PackagesOutput>$(ProjectDirectory)/bin/$(Configuration)</PackagesOutput>
     <RepoApiImplemented>false</RepoApiImplemented>
-    <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
     <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
   </PropertyGroup>
 

repos/Directory.Build.props

@@ -24,7 +24,6 @@
     <DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
     <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
 
-    <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
     <PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
 
     <!-- we need to use a prebuilt Arcade to build Arcade -->

repos/Directory.Build.targets

@@ -23,11 +23,6 @@
     <BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
     <DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
     <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
-    <!--
-      This repo is not currently built in ProdCon
-    <OrchestratedManifestBuildName>dotnet/CliCommandLineParser</OrchestratedManifestBuildName>
-    -->
-    <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
 
     <PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
     <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>

repos/application-insights.proj

@@ -9,10 +9,13 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -NoTest $(BuildArguments)</BuildCommand>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension) $(BuildArguments)</CleanCommand>
     <RepoApiImplemented>false</RepoApiImplemented>
-    <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
     <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
   </PropertyGroup>
 
+  <ItemGroup>
+    <EnvironmentVariables Include="DOTNET_TOOL_DIR=$(DotNetCliToolDir)" />
+  </ItemGroup>
+
   <ItemGroup>
     <RepositoryReference Include="newtonsoft-json" />
   </ItemGroup>