From 0cfecf4cb27a85b92c19b37a156c2fcbf1a8d4c8 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Mon, 5 Jun 2017 15:10:31 -0700
Subject: [PATCH] Copy msbuild artifacts from individual repos to universe
 artifacts folder

---
 build/RepositoryBuild.targets | 17 ++++++++++++-----
 build/repo.targets            |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 85626464b4..7b256b0e34 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -49,7 +49,9 @@
   <Target Name="_BuildRepository" DependsOnTargets="_PinVersions">
     <PropertyGroup>
       <BuildArguments>$(_RepositoryBuildTargets) /p:BuildNumber=$(BuildNumber) /p:Configuration=$(Configuration)</BuildArguments>
-      <RepositoryArtifactsDirectory>$(BuildRepositoryRoot)artifacts\build\</RepositoryArtifactsDirectory>
+      <RepositoryArtifactsRoot>$(BuildRepositoryRoot)artifacts</RepositoryArtifactsRoot>
+      <RepositoryArtifactsBuildDirectory>$(RepositoryArtifactsRoot)\build\</RepositoryArtifactsBuildDirectory>
+      <RepositoryArtifactsMSBuildDirectory>$(RepositoryArtifactsRoot)\msbuild\</RepositoryArtifactsMSBuildDirectory>
 
       <_BuildScriptToExecute Condition="'$(OS)'!='Windows_NT'">build.sh</_BuildScriptToExecute>
       <_BuildScriptToExecute Condition="'$(OS)'=='Windows_NT'">build.cmd</_BuildScriptToExecute>
@@ -73,20 +75,25 @@
       WorkingDirectory="$(BuildRepositoryRoot)" />
 
     <ItemGroup>
-      <RepositoryArtifacts Include="$(RepositoryArtifactsDirectory)*" />
-      <RepositorySymbolNupkgs Include="$(RepositoryArtifactsDirectory)*.symbols.nupkg" />
-      <RepositoryNupkgs Include="$(RepositoryArtifactsDirectory)*.nupkg" Exclude="@(RepositorySymbolNupkgs)" />
+      <RepositoryArtifacts Include="$(RepositoryArtifactsBuildDirectory)*" />
+      <RepositorySymbolNupkgs Include="$(RepositoryArtifactsBuildDirectory)*.symbols.nupkg" />
+      <RepositoryNupkgs Include="$(RepositoryArtifactsBuildDirectory)*.nupkg" Exclude="@(RepositorySymbolNupkgs)" />
+      <RepositoryMSBuildArtifacts Include="$(RepositoryArtifactsMSBuildDirectory)**\*.*" />
     </ItemGroup>
 
     <Copy
        SourceFiles="@(RepositoryArtifacts)"
        DestinationFolder="$(UniverseBuildDir)" />
 
+    <Move
+       SourceFiles="@(RepositoryMSBuildArtifacts)"
+       DestinationFolder="$(UniverseMSBuildDir)\$(RepositoryToBuild)\%(RecursiveDir)" />
+
     <Message Text="Publishing the following packages to the volatile feed: @(RepositoryNupkgs -> '%(Filename)%(Extension)', ', ')"
       Condition="'$(PublishPackages)'=='true' AND '@(RepositoryNupkgs)' != ''" />
 
     <Exec
-      Command="$(DotNetPath) $(PackagePublisherPath) -d $(RepositoryArtifactsDirectory) -f $(NuGetPublishVolatileFeed)"
+      Command="$(DotNetPath) $(PackagePublisherPath) -d $(RepositoryArtifactsBuildDirectory) -f $(NuGetPublishVolatileFeed)"
       Condition="'$(PublishPackages)'=='true' AND '@(RepositoryNupkgs)' != ''" />
 
     <Message Text="============ Done building $(RepositoryToBuild) ============" Importance="High" />
diff --git a/build/repo.targets b/build/repo.targets
index 4a719e0f32..e45b2cdb3e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -112,6 +112,7 @@
     <PropertyGroup>
       <_BuildRepositoryProperties>
         UniverseBuildDir=$(BuildDir);
+        UniverseMSBuildDir=$(ArtifactsDir)msbuild;
         BuildInParallel=$(BuildInParallel);
         BuildNumber=$(BuildNumber);
         Configuration=$(Configuration);