Support DotNetBuildPass property in Arcade's Build.proj

src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj

@@ -10,6 +10,8 @@
   Optional parameters:
     Configuration                   Build configuration: "Debug", "Release", etc.
 
+    DotNetBuildPass                 The build pass number. Set to a number other than '1' when performing a join build.
+                                    This is passed to the repository and should be used to filter the ProjectToBuild items in Build.props.
     DotNetBuildRepo                 Build the repo as part of the entire .NET stack.
     DotNetBuildInnerRepo            Build the repo as part of the entire .NET stack. This switch is used on the inner repo invocation and should not be passed by the user.
     DotNetBuildOrchestrator         Build the entire .NET stack.
@@ -52,33 +54,28 @@
   <Import Project="RepoDefaults.props"/>
   <Import Project="RepoLayout.props"/>
 
-  <Import Project="SourceBuild/SourceBuildArcadeBuild.targets" Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildRepo)' == 'true'" />
-
   <!-- Allow for repo specific Build properties such as the list of Projects to build -->
   <Import Project="$(RepositoryEngineeringDir)Build.props" Condition="Exists('$(RepositoryEngineeringDir)Build.props')" />
 
-  <PropertyGroup>
-    <_ProjectsPropertyWasUpdatedInBuildProps Condition="'$(_OriginalProjectsValue)' != '$(Projects)'">true</_ProjectsPropertyWasUpdatedInBuildProps>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(Projects)' != ''">
-    <!-- Copy the original list so we can log diagnostics later. -->
-    <_OriginalProjectToBuild Include="@(ProjectToBuild)" />
     <!-- Setting 'Projects' overrides the ProjectToBuild list. -->
     <ProjectToBuild Remove="@(ProjectToBuild)" />
     <ProjectToBuild Include="$(Projects)" />
   </ItemGroup>
 
-  <!--
-    Default values.
-  -->
   <!-- If Projects is unspecified and ProjectToBuild was not set via Build.props, fallback to building .sln files in the repo root. -->
   <ItemGroup Condition="'@(ProjectToBuild)' == ''">
-    <ProjectToBuild Include="$(RepoRoot)*.sln" />
+    <!-- Don't glob and build solution files from the repo root by default when DotNetBuildPass is set to a value other than 1. -->
+    <EnableDefaultSolutionItems Condition="'$(EnableDefaultSolutionItems)' == '' and
+                                           '$(DotNetBuildPass)' != '' and
+                                           '$(DotNetBuildPass)' != '1'">false</EnableDefaultSolutionItems>
+    <EnableDefaultSolutionItems Condition="'$(EnableDefaultSolutionItems)' == ''">true</EnableDefaultSolutionItems>
+    <ProjectToBuild Include="$(RepoRoot)*.sln" Condition="'$(EnableDefaultSolutionItems)' == 'true'" />
   </ItemGroup>
 
+  <Import Project="SourceBuild/SourceBuildArcadeBuild.targets" Condition="'$(DotNetBuildRepo)' == 'true'" />
+
   <Target Name="Execute">
-    <Error Text="No projects were found to build. Either the 'Projects' property or 'ProjectToBuild' item group must be specified." Condition="'@(ProjectToBuild)' == ''"/>
     <Error Text="Property 'RepoRoot' must be specified" Condition="'$(RepoRoot)' == ''"/>
     <Error Text="File 'global.json' must exist in directory specified by RepoRoot: '$(RepoRoot)'" Condition="'$(RepoRoot)' != '' and !Exists('$(RepoRoot)global.json')"/>
 
@@ -110,6 +107,9 @@
       <_SolutionBuildTargets Include="PerformanceTest" Condition="'$(PerformanceTest)' == 'true'" />
     </ItemGroup>
 
+    <Error Text="No projects were found to build. Either the 'Projects' property or 'ProjectToBuild' item group must be specified."
+           Condition="'@(ProjectToBuild)' == '' and '@(_SolutionBuildTargets)' != '' and '$(SkipProjectToBuildError)' != 'true'"/>
+
     <PropertyGroup>
       <_RemoveProps>Projects;Restore;Deploy;Sign;Publish;NETCORE_ENGINEERING_TELEMETRY;@(_SolutionBuildTargets)</_RemoveProps>
     </PropertyGroup>
@@ -177,9 +177,7 @@
       <_SolutionBuildProps Include="__ImportPackTargets=true" Condition="'$(Pack)' == 'true'" />
     </ItemGroup>
 
-    <!--
-      Restore built-in tools.
-    -->
+    <!-- Restore built-in tools -->
     <MSBuild Projects="Tools.proj"
              Targets="Restore"
              Properties="@(_RestoreToolsProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
@@ -226,7 +224,7 @@
              Targets="_IsProjectRestoreSupported"
              SkipNonexistentTargets="true"
              BuildInParallel="true"
-             Condition="'$(RestoreUsingNuGetTargets)' != 'false' and '%(ProjectToBuild.Extension)' != '.sln' and '%(ProjectToBuild.Extension)' != '.slnf' and '$(RestoreUseStaticGraphEvaluation)' != 'true' and '$(Restore)' == 'true'">
+             Condition="'$(RestoreUsingNuGetTargets)' != 'false' and '@(ProjectToBuild)' != '' and '%(ProjectToBuild.Extension)' != '.sln' and '%(ProjectToBuild.Extension)' != '.slnf' and '$(RestoreUseStaticGraphEvaluation)' != 'true' and '$(Restore)' == 'true'">
 
       <Output TaskParameter="TargetOutputs" ItemName="_ProjectToRestoreWithNuGet" />
     </MSBuild>
@@ -259,26 +257,22 @@
              Targets="Restore"
              SkipNonexistentTargets="true"
              BuildInParallel="%(_ProjectToRestore.RestoreInParallel)"
-             Condition="'$(Restore)' == 'true'"/>
+             Condition="'$(Restore)' == 'true' and '@(_ProjectToRestore)' != ''" />
 
-    <!--
-      Build solution.
-    -->
+    <!-- Build ProjectToBuild items -->
     <MSBuild Projects="@(ProjectToBuild)"
              Properties="@(_SolutionBuildProps);__BuildPhase=SolutionBuild;_NETCORE_ENGINEERING_TELEMETRY=Build"
              RemoveProperties="$(_RemoveProps)"
              Targets="@(_SolutionBuildTargets)"
              BuildInParallel="%(ProjectToBuild.BuildInParallel)"
-             Condition="'@(_SolutionBuildTargets)' != ''" />
+             Condition="'@(_SolutionBuildTargets)' != '' and '@(ProjectToBuild)' != ''" />
 
     <MSBuild Projects="AfterSolutionBuild.proj"
              Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=Build"
              Targets="@(_SolutionBuildTargets)"
              Condition="'@(_SolutionBuildTargets)' != ''" />
 
-    <!--
-      Sign artifacts.
-    -->
+    <!-- Sign artifacts -->
     <MSBuild Projects="Sign.proj"
              Properties="@(_CommonProps)"
              Targets="Sign"
@@ -297,30 +291,20 @@
              Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=AfterSourceBuild"
              Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildRepo)' == 'true'"/>
 
-    <!--
-      Publish artifacts. This should run in the following situations:
-      - Regular single repo builds
-        - When running in the outer build phase of a source-only repo build, to properly publish the source-build intermediate nupkg.
-      - VMR builds
-        - When running in the inner build phase
-
-      It shouldn't run:
-      - In an inner build if running from single repo build.
-      - In an outer build if running from the full product build.
-    -->
-
-    <PropertyGroup>
-      <_VmrBuild Condition="'$(DotNetBuildFromSourceFlavor)' == 'Product' or '$(DotNetBuildOrchestrator)' == 'true'">true</_VmrBuild>
-      <_InnerRepoBuild Condition="'$(ArcadeInnerBuildFromSource)' == 'true' or '$(DotNetBuildPhase)' == 'InnerRepo'">true</_InnerRepoBuild>
-      <_ShouldRunPublish Condition="'$(_InnerRepoBuild)' == 'true' and '$(_VmrBuild)' == 'true'">true</_ShouldRunPublish>
-      <_ShouldRunPublish Condition="'$(_InnerRepoBuild)' != 'true' and '$(_VmrBuild)' != 'true'">true</_ShouldRunPublish>
+    <!-- Publish artifacts -->
+    <PropertyGroup Condition="'$(Publish)' == 'true'">
+      <!-- Don't publish inside the VMR in the outer repo build. -->
+      <_ShouldRunPublish Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(DotNetBuildPhase)' == 'Repo'">false</_ShouldRunPublish>
+      <!-- Don't publish outside of the VRM in an inner build (source-only). -->
+      <_ShouldRunPublish Condition="'$(DotNetBuildOrchestrator)' != 'true' and '$(DotNetBuildPhase)' == 'InnerRepo'">false</_ShouldRunPublish>
+      <!-- Otherwise, publish -->
+      <_ShouldRunPublish Condition="'$(_ShouldRunPublish)' == ''">true</_ShouldRunPublish>
     </PropertyGroup>
 
-      <!-- Make sure we always publish in VMR build - working around runtime repo which sets Publish to false. -->
     <MSBuild Projects="Publish.proj"
              Properties="@(_PublishProps);_NETCORE_ENGINEERING_TELEMETRY=Publish"
              Targets="Publish"
-             Condition="'$(Publish)' == 'true' and '$(_ShouldRunPublish)' == 'true'"/>
+             Condition="'$(_ShouldRunPublish)' == 'true'"/>
   </Target>
 
 </Project>

src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj

@@ -65,11 +65,6 @@
        ('$(DotNetBuildSourceOnly)' != 'true' or
        ('$(ArcadeInnerBuildFromSource)' == 'true' and '$(DotNetBuildFromSourceFlavor)' != 'Product'))">true</AutoGenerateSymbolPackages>
 
-    <AssetManifestOS Condition="'$(AssetManifestOS)' == ''">$(OS)</AssetManifestOS>
-
-    <AssetManifestFileName>$(AssetManifestOS)-$(PlatformName).xml</AssetManifestFileName>
-    <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName)</AssetManifestFilePath>
-
     <SymbolPackagesDir>$(ArtifactsTmpDir)SymbolPackages\</SymbolPackagesDir>
 
     <PublishDependsOnTargets Condition="$(PublishToSymbolServer)">$(PublishDependsOnTargets);PublishSymbols</PublishDependsOnTargets>
@@ -78,6 +73,18 @@
     <PublishDependsOnTargets>BeforePublish;$(PublishDependsOnTargets)</PublishDependsOnTargets>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Prefer TargetOS when set over OS -->
+    <AssetManifestOS Condition="'$(AssetManifestOS)' == ''">$([MSBuild]::ValueOrDefault('$(TargetOS)', '$(OS)'))</AssetManifestOS>
+    <!-- Prefer TargetArchitecture when set over PlatformName -->
+    <AssetManifestArch Condition="'$(AssetManifestArch)' == ''">$([MSBuild]::ValueOrDefault('$(TargetArchitecture)', '$(PlatformName)'))</AssetManifestArch>
+    <!-- Add the build pass number when DotNetBuildPass is set to a value other than 1. -->
+    <AssetManifestPass Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">-Pass$(DotNetBuildPass)</AssetManifestPass>
+
+    <AssetManifestFileName>$(AssetManifestOS)-$(AssetManifestArch)$(AssetManifestPass).xml</AssetManifestFileName>
+    <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName)</AssetManifestFilePath>
+  </PropertyGroup>
+
   <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets"/>
   <Import Project="$(NuGetPackageRoot)microsoft.symboluploader.build.task\$(MicrosoftSymbolUploaderBuildTaskVersion)\build\PublishSymbols.targets" Condition="$(PublishToSymbolServer)"/>
 

src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/README.md

@@ -39,7 +39,6 @@ call an inner build after some setup. The targets work roughly like this:
       * Create intermediate nupkg that contains the inner source-build's artifacts.
         * MSBuild `Projects=SourceBuildIntermediate.proj Targets=Restore;Pack`
       * Empty out the list of `ProjectToBuild`, because we already built them from source.
-        * Put `Noop.proj` in the list as a sentinel value.
     * During **Outer Execute**:
       * MSBuild `Projects=Tools.proj Targets=Restore`
         * Does nothing interesting.

src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets

@@ -19,15 +19,19 @@
 
     <_DirSeparatorEscapedCharForExecArg Condition="'$(OS)' == 'Windows_NT'">\</_DirSeparatorEscapedCharForExecArg>
     <_DirSeparatorEscapedCharForExecArg Condition="'$(OS)' != 'Windows_NT'" />
+
+    <RunInnerSourceBuildCommand Condition="'$(DotNetBuildPhase)' == 'Repo'">true</RunInnerSourceBuildCommand>
+    <SkipProjectToBuildError Condition="'$(RunInnerSourceBuildCommand)' == 'true'">true</SkipProjectToBuildError>
   </PropertyGroup>
 
+  <!-- Prevent projects from building in the outer build: they would use prebuilts. -->
+  <ItemGroup Condition="'$(RunInnerSourceBuildCommand)' == 'true'">
+    <ProjectToBuild Remove="@(ProjectToBuild)" />
+  </ItemGroup>
+
   <Target Name="ExecuteWithSourceBuiltTooling"
-          DependsOnTargets="
-            GetSourceBuildCommandConfiguration;
-            RunInnerSourceBuildCommand"
-          Condition="
-            ('$(ArcadeBuildFromSource)' == 'true' and '$(ArcadeInnerBuildFromSource)' != 'true') or 
-            '$(DotNetBuildPhase)' == 'Repo'"
+          DependsOnTargets="GetSourceBuildCommandConfiguration;RunInnerSourceBuildCommand"
+          Condition="'$(RunInnerSourceBuildCommand)' == 'true'"
           BeforeTargets="Execute" />
 
   <!--
@@ -41,9 +45,7 @@
     even if the condition isn't met, so we need this indirection.
   -->
   <Target Name="HookExecuteInnerSourceBuild"
-          Condition="
-            ('$(ArcadeBuildFromSource)' == 'true' and '$(ArcadeInnerBuildFromSource)' == 'true') or
-            '$(DotNetBuildPhase)' == 'InnerRepo'"
+          Condition="'$(DotNetBuildPhase)' == 'InnerRepo'"
           DependsOnTargets="ExecuteInnerSourceBuild"
           BeforeTargets="Execute"/>
 
@@ -88,7 +90,7 @@
     <ItemGroup>
       <!-- Override package cache to separate source-built packages from upstream. -->
       <InnerBuildEnv Include="NUGET_PACKAGES=$(CurrentRepoSourceBuildPackageCache)" />
-      <InnerBuildEnv Include="DotNetTargetFrameworkFilter=$(SourceBuildTargetFrameworkFilter)" Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'" />
+      <InnerBuildEnv Include="DotNetTargetFrameworkFilter=$(SourceBuildTargetFrameworkFilter)" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     </ItemGroup>
   </Target>
 
@@ -114,9 +116,6 @@
   <Target Name="RunInnerSourceBuildCommand"
           DependsOnTargets="PrepareInnerSourceBuildRepoRoot">
     <PropertyGroup>
-      <!-- Prevent any projects from building in the outside build: they would use prebuilts. -->
-      <PreventPrebuiltBuild>true</PreventPrebuiltBuild>
-
       <!--
         Normally, the inner build should run using the original build command with some extra args
         appended. Allow the repo to override this default behavior if the repo is e.g. not onboarded
@@ -132,14 +131,4 @@
       EnvironmentVariables="@(InnerBuildEnv)" />
   </Target>
 
-  <Target Name="PreventPrebuiltBuild"
-          DependsOnTargets="ExecuteWithSourceBuiltTooling"
-          Condition="'$(PreventPrebuiltBuild)' == 'true'"
-          BeforeTargets="Execute">
-    <ItemGroup>
-      <ProjectToBuild Remove="@(ProjectToBuild)" />
-      <ProjectToBuild Include="$(MSBuildThisFileDirectory)Noop.proj" />
-    </ItemGroup>
-  </Target>
-
 </Project>