From f66ec9a789d992cde040930d7433ee47c81de9f2 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 1 Jul 2016 20:46:54 -0700
Subject: [PATCH] Adding trailing slash back to OutputDirectory that I
 accidently removed when merging and improving the inputs for
 GenerateNuGetPackagesArchiveInputs to take into account the c# template and
 the dotnet-archive and Microsoft.Dotnet.Archive codes.

---
 build/Microsoft.DotNet.Cli.Prepare.targets           |  2 +-
 .../compile/Microsoft.DotNet.Cli.LzmaArchive.targets | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 46aae457b..b5d76503d 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -36,7 +36,7 @@
       <Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory>
       <Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory>
       <DotnetStage2>$(Stage2Directory)/dotnet.exe</DotnetStage2>
-      <OutputDirectory>$(Stage2Directory)</OutputDirectory>
+      <OutputDirectory>$(Stage2Directory)/</OutputDirectory>
       <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>      
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index 670ad4478..47873c488 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <Target Name="GenerateNuGetPackagesArchive"
             DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs"
-            Inputs="$(_DotNetNewFolder)/CSharp_Console/**/*"
+            Inputs="@(GenerateNuGetPackagesArchiveInputs)"
             Outputs="$(FinalArchive)">
       <ItemGroup>
         <FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" />
@@ -37,5 +37,15 @@
         <IntermediateArchive>$(IntermediateDirectory)/nuGetPackagesArchive.lzma</IntermediateArchive>
         <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
       </PropertyGroup>
+
+      <ItemGroup>
+        <GenerateNuGetPackagesArchiveInputs Include="$(_DotNetNewFolder)/CSharp_Console/**/*" />
+        <GenerateNuGetPackagesArchiveInputs Include="$(SrcDirectory)/dotnet-archive/**/*"
+                                            Exclude="$(SrcDirectory)/dotnet-archive/**/bin/**/*;
+                                                     $(SrcDirectory)/dotnet-archive/**/obj/**/*" />
+        <GenerateNuGetPackagesArchiveInputs Include="$(SrcDirectory)/Microsoft.DotNet.Archive/**/*"
+                                            Exclude="$(SrcDirectory)/Microsoft.DotNet.Archive/**/bin/**/*;
+                                                     $(SrcDirectory)/Microsoft.DotNet.Archive/**/obj/**/*" />
+      </ItemGroup>
     </Target>
 </Project>
\ No newline at end of file