From 4d6bdba5546ff8bf886d7db65a36e3b2ffa4abee Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Thu, 13 Apr 2017 17:32:23 -0700
Subject: [PATCH] Add nuspec and version.txt to artifacts

---
 .../Microsoft.Internal.AspNetCore.PackageCache.nuspec | 11 +++++++++++
 build/repo.targets                                    | 11 ++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 build/Microsoft.Internal.AspNetCore.PackageCache.nuspec

diff --git a/build/Microsoft.Internal.AspNetCore.PackageCache.nuspec b/build/Microsoft.Internal.AspNetCore.PackageCache.nuspec
new file mode 100644
index 0000000000..75da6498d7
--- /dev/null
+++ b/build/Microsoft.Internal.AspNetCore.PackageCache.nuspec
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Microsoft.Internal.AspNetCore.PackageCache</id>
+    <authors>Microsoft</authors>
+    <description>Runtime Package Store for ASP.NET Core</description>
+  </metadata>
+  <files>
+    <file src="*.zip" target="" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/build/repo.targets b/build/repo.targets
index c378f8928d..3692ed2cd5 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -32,9 +32,10 @@
       <MetaPackageFile>$(MetaPackagePath)Microsoft.AspNetCore.All.csproj</MetaPackageFile>
       <WorkingDirectory>$(MetaPackagePath)bin\work</WorkingDirectory>
       <OutputPath>$(MetaPackagePath)bin\packageCache\</OutputPath>
-      <OutputZip Condition="'$(OSPlatform)' == 'Windows'">$(RepositoryRoot)artifacts\Microsoft.Internal.AspNetCorePackageCache.win-$(VersionSuffix).zip</OutputZip>
-      <OutputZip Condition="'$(OSPlatform)' == 'Linux'">$(RepositoryRoot)artifacts\Microsoft.Internal.AspNetCorePackageCache.linux-$(VersionSuffix).zip</OutputZip>
-      <OutputZip Condition="'$(OSPlatform)' == 'macOS'">$(RepositoryRoot)artifacts\Microsoft.Internal.AspNetCorePackageCache.osx-$(VersionSuffix).zip</OutputZip>
+      <ArtifactsDir>$(RepositoryRoot)artifacts\</ArtifactsDir>
+      <OutputZip Condition="'$(OSPlatform)' == 'Windows'">$(ArtifactsDir)Microsoft.Internal.AspNetCorePackageCache.win-$(VersionSuffix).zip</OutputZip>
+      <OutputZip Condition="'$(OSPlatform)' == 'Linux'">$(ArtifactsDir)Microsoft.Internal.AspNetCorePackageCache.linux-$(VersionSuffix).zip</OutputZip>
+      <OutputZip Condition="'$(OSPlatform)' == 'macOS'">$(ArtifactsDir)Microsoft.Internal.AspNetCorePackageCache.osx-$(VersionSuffix).zip</OutputZip>
     </PropertyGroup>
 
     <ItemGroup>
@@ -53,5 +54,9 @@
     </ItemGroup>
 
     <ZipArchive File="$(OutputZip)" SourceFiles="@(PackageCacheFiles)" WorkingDirectory="$(OutputPath)" />
+
+    <!--Drop a nuspec file in artifacts for packing zip files into a nupkg-->
+    <Copy SourceFiles="$(RepositoryRoot)build\Microsoft.Internal.AspNetCore.PackageCache.nuspec" DestinationFolder="ArtifactsDir" Condition="'$(OSPlatform)' == 'Windows'" />
+    <WriteLinesToFile File="$(ArtifactsDir)version.txt" Lines="$(VersionSuffix)" Overwrite="true" Condition="'$(OSPlatform)' == 'Windows'" />
   </Target>
 </Project>
\ No newline at end of file