From 71b380b1104d2b42a5fa157c34d1c5cf88e5cb44 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 11 Feb 2015 16:12:17 -0800
Subject: [PATCH] Fix rebuild issue with development package

If the development package is deleted and then a rebuild is attempted we fail because mscorlib is not where we think it should be.  We should be looking for mscorlib.pdb in the PDBs dir and also building the packages after the PDBs are moved.
---
 build.proj                                             | 2 +-
 src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.proj b/build.proj
index e582c07..7199109 100644
--- a/build.proj
+++ b/build.proj
@@ -55,7 +55,7 @@
   </ItemGroup>
 
   <!-- Generate Microsoft.Dotnet.CoreCLR nuget package and associated development package -->
-  <Target Name="BuildNuGetPackages" AfterTargets="Build" Condition="'$(BuildNugetPackage)' != 'false'">
+  <Target Name="BuildNuGetPackages" AfterTargets="MovePDB" Condition="'$(BuildNugetPackage)' != 'false'">
     <MakeDir Directories="$(PackagesBinDir)" Condition="!Exists('$(PackagesBinDir)')" />
     <Copy SourceFiles="@(NuSpecSrcs)" DestinationFolder="$(PackagesBinDir)" />
     <Exec Command="$(NuGetToolPath) pack &quot;%(NuSpecs.Identity)&quot; -NoPackageAnalysis -NoDefaultExcludes -OutputDirectory &quot;$(PackagesBinDir)&quot;" />
diff --git a/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec b/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec
index 07940a7..faf2c8e 100644
--- a/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec
+++ b/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec
@@ -33,7 +33,7 @@
     <file src="..\PDB\mscorrc.debug.pdb" target="bin\mscorrc.debug.pdb" />
     <file src="..\PDB\corerun.pdb" target="bin\corerun.pdb" />
     <file src="..\PDB\sos.pdb" target="bin\sos.pdb" />
-    <file src="..\mscorlib.pdb" target="bin\mscorlib.pdb" />
+    <file src="..\PDB\mscorlib.pdb" target="bin\mscorlib.pdb" />
     <file src="..\inc\cor.h" target="inc\cor.h" />
     <file src="..\inc\corerror.h" target="inc\corerror.h" />
     <file src="..\inc\corhdr.h" target="inc\corhdr.h" />
-- 
2.7.4