Up- and download the repo asset manifests

Author: ViktorHofer

eng/pipelines/templates/jobs/vmr-build.yml

@@ -218,12 +218,11 @@ jobs:
 
       - ${{ else }}:
         - task: CopyFiles@2
-          displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - NuGet Packages)
+          displayName: Copy Previous Build (${{ reuseBuildArtifacts }})
           inputs:
-            SourceFolder: $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/packages
-            Contents: '**/*.nupkg'
+            SourceFolder: $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/
             OverWrite: false
-            TargetFolder: $(sourcesPath)/artifacts/packages/
+            TargetFolder: $(sourcesPath)/artifacts/
 
   - ${{ if eq(parameters.withPreviousSDK, 'true') }}:
     - script: |
@@ -585,8 +584,8 @@ jobs:
     inputs:
       SourceFolder: $(sourcesPath)/artifacts
       Contents: |
-        VerticalManifest.xml
         assets/**
+        manifests/**
       TargetFolder: $(Build.ArtifactStagingDirectory)/publishing
     displayName: Copy artifacts to Artifact Staging Directory
 

src/SourceBuild/content/Directory.Build.props

@@ -162,7 +162,7 @@
 
     <VSMSBuildSdkResolversDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'toolset', 'VSSdkResolvers'))</VSMSBuildSdkResolversDir>
     <IntermediateSymbolsRootDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Symbols'))</IntermediateSymbolsRootDir>
-    <AssetManifestsIntermediateDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'AssetManifests'))</AssetManifestsIntermediateDir>
+    <AssetManifestsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'manifests'))</AssetManifestsDir>
     <ArtifactsAssetsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'assets', '$(Configuration)'))</ArtifactsAssetsDir>
     <DotNetSdkExtractDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'extracted-dotnet-sdk'))</DotNetSdkExtractDir>
 
@@ -197,7 +197,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MergedAssetManifestOutputPath>$(ArtifactsDir)VerticalManifest.xml</MergedAssetManifestOutputPath>
+    <MergedAssetManifestOutputPath>$(AssetManifestsDir)VerticalManifest.xml</MergedAssetManifestOutputPath>
   </PropertyGroup>
 
 </Project>

src/SourceBuild/content/eng/merge-asset-manifests.proj

@@ -12,7 +12,7 @@
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.MergeAssetManifests" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="MergeAssetManifests" AfterTargets="Build">
     <ItemGroup>
-      <RepoAssetManifest Include="$(AssetManifestsIntermediateDir)\**\*.xml" />
+      <RepoAssetManifest Include="$(AssetManifestsDir)\**\*.xml" />
     </ItemGroup>
 
     <Error Text="Couldn't find any repository asset manifest file. Make sure to build the repositories before invoking this target." Condition="'@(RepoAssetManifest)' == ''" />

src/SourceBuild/content/repo-projects/Directory.Build.props

@@ -38,7 +38,7 @@
     <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
     <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
 
-    <RepoAssetManifestsDir>$([MSBuild]::NormalizeDirectory('$(AssetManifestsIntermediateDir)', '$(RepositoryName)'))</RepoAssetManifestsDir>
+    <RepoAssetManifestsDir>$([MSBuild]::NormalizeDirectory('$(AssetManifestsDir)', '$(RepositoryName)'))</RepoAssetManifestsDir>
     <IntermediateSymbolsRepoDir>$([MSBuild]::NormalizeDirectory('$(IntermediateSymbolsRootDir)', '$(RepositoryName)'))</IntermediateSymbolsRepoDir>
 
     <SourceBuiltSdksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'source-built-sdks'))</SourceBuiltSdksDir>

src/SourceBuild/content/repo-projects/Directory.Build.targets

@@ -355,20 +355,21 @@
   <Target Name="BuildRepoReferences"
           DependsOnTargets="GetTransitiveRepositoryReferences"
           Condition="'@(RepositoryReference)' != '' and '$(SkipRepoReferences)' != 'true'">
-    <Message Importance="High" Text="Building dependencies [@(TransitiveRepositoryReference)] needed by '$(RepositoryName)'." />
-
     <ItemGroup>
-      <_DependentProject Include="@(TransitiveRepositoryReference -> '%(Identity).proj')" />
+      <_DependentProject Include="@(TransitiveRepositoryReference)"
+                         Project="%(Identity).proj" />
     </ItemGroup>
 
-    <!-- Filter out projects that are part of a different build pass. -->
+    <!-- Filter out projects that aren't part of the current build pass. -->
     <ItemGroup Condition="'$(_DotNetBuildPassNormalized)' != '1'">
       <_DependentProjectCurrentBuildPass Include="@(_DependentProject->WithMetadataValue('DotNetBuildPass', '$(_DotNetBuildPassNormalized)'))" />
       <_DependentProject Remove="@(_DependentProject)" />
       <_DependentProject Include="@(_DependentProjectCurrentBuildPass)" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_DependentProject)"
+    <Message Importance="High" Text="Building dependencies [@(_DependentProject)] needed by '$(RepositoryName)'." />
+
+    <MSBuild Projects="@(_DependentProject->Metadata('Project'))"
              Targets="Build"
              BuildInParallel="$(BuildInParallel)"
              StopOnFirstFailure="true"

src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj

@@ -40,7 +40,7 @@
         <Value>$(UBTestsWarnOnContentDiffs)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).AssetManifestPath">
-        <Value>$(ArtifactsDir)VerticalManifest.xml</Value>
+        <Value>$(MergedAssetManifestOutputPath)</Value>
       </RuntimeHostConfigurationOption>
 
       <!-- SDK archive test configs -->