From e7c5ce6bb987833367724af6873e5b54b5d88552 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 29 Sep 2017 14:14:57 -0700
Subject: [PATCH] Push lineup packages and put symbols in a separate directory

---
 build/push.targets                          |  2 +-
 build/repo.targets                          |  2 +-
 build/tasks/CopyPackagesToSplitFolders.cs   | 19 ++++++++++++++++---
 build/tasks/ProjectModel/PackageCategory.cs |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/build/push.targets b/build/push.targets
index a766f7d43c..2b3ee0d92b 100644
--- a/build/push.targets
+++ b/build/push.targets
@@ -5,7 +5,7 @@
     <ItemGroup>
       <_PackagesToPush Include="$(BuildDir)*.nupkg" />
       <_PackagesToPush Include="$(ArtifactsDir)mirror\*.nupkg" />
-      <_LineupPackagesToPush Include="$(BuildDir)*.nupkg" />
+      <_LineupPackagesToPush Include="$(LineupBuildDir)*.nupkg" />
     </ItemGroup>
 
     <PushNuGetPackages
diff --git a/build/repo.targets b/build/repo.targets
index 53b5702743..d6b76bcd9a 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -253,7 +253,7 @@
 
   <Target Name="CopyPackagesByCategory">
     <ItemGroup>
-      <PackageArtifactFile Include="$(BuildDir)*.nupkg" Exclude="$(BuildDir)*.symbols.nupkg" />
+      <PackageArtifactFile Include="$(BuildDir)*.nupkg" />
       <ExternalDependencyPackage Include="@(ExternalDependency->WithMetadataValue('Mirror', 'true'))" Category="mirror" />
       <_MirroredPackageFiles Include="$(IntermediateMirrorPackageDir)*.nupkg" />
     </ItemGroup>
diff --git a/build/tasks/CopyPackagesToSplitFolders.cs b/build/tasks/CopyPackagesToSplitFolders.cs
index 682e50806c..ca5ebf3544 100644
--- a/build/tasks/CopyPackagesToSplitFolders.cs
+++ b/build/tasks/CopyPackagesToSplitFolders.cs
@@ -44,16 +44,26 @@ namespace RepoTasks
 
             foreach (var file in Files)
             {
+                var isSymbolsPackage = file.ItemSpec.EndsWith(".symbols.nupkg", StringComparison.OrdinalIgnoreCase);
+
                 PackageIdentity identity;
                 using (var reader = new PackageArchiveReader(file.ItemSpec))
                 {
                     identity = reader.GetIdentity();
                 }
 
-                if (!expectedPackages.TryGetCategory(identity.Id, out var category))
+                PackageCategory category;
+                if (isSymbolsPackage)
                 {
-                    Log.LogError($"Unexpected package artifact with id: {identity.Id}");
-                    continue;
+                    category = PackageCategory.Symbols;
+                }
+                else
+                {
+                    if (!expectedPackages.TryGetCategory(identity.Id, out category))
+                    {
+                        Log.LogError($"Unexpected package artifact with id: {identity.Id}");
+                        continue;
+                    }
                 }
 
                 string destDir;
@@ -73,6 +83,9 @@ namespace RepoTasks
                     case PackageCategory.Mirror:
                         destDir = Path.Combine(DestinationFolder, "mirror");
                         break;
+                    case PackageCategory.Symbols:
+                        destDir = Path.Combine(DestinationFolder, "symbols");
+                        break;
                     default:
                         throw new NotImplementedException();
                 }
diff --git a/build/tasks/ProjectModel/PackageCategory.cs b/build/tasks/ProjectModel/PackageCategory.cs
index e3869319f0..0baa60e7a4 100644
--- a/build/tasks/ProjectModel/PackageCategory.cs
+++ b/build/tasks/ProjectModel/PackageCategory.cs
@@ -11,5 +11,6 @@ namespace RepoTasks.ProjectModel
         NoShip,
         ShipOob,
         Mirror,
+        Symbols,
     }
 }