From 466a710a16f14cdf79307af24a3ac42bfda00d35 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Wed, 21 Jan 2015 01:36:22 -0800
Subject: [PATCH 1/3] Make build install go directly to packages cache

---
 build/_k-standard-goals.shade  |  4 ++--
 build/_kpm-local-publish.shade | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 build/_kpm-local-publish.shade

diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade
index d33db6def5..ea242cd6ad 100644
--- a/build/_k-standard-goals.shade
+++ b/build/_k-standard-goals.shade
@@ -72,8 +72,8 @@ default Configuration='${E("Configuration")}'
   copy sourceDir='${Path.GetDirectoryName(project)}' include='bin/**/' outputDir='${Path.Combine(BUILD_DIR, Path.GetFileNameWithoutExtension(project))}' overwrite='${true}' each='var project in nativeProjects'
 
 
-#nuget-install target='install' description='Copy NuGet packages to local repo'
-  nuget-local-publish sourcePackagesDir='${BUILD_DIR}'
+#nuget-install target='install' description='Install NuGet packages to local repo'
+  kpm-local-publish sourcePackagesDir='${BUILD_DIR}'
 
 #xunit-test target='test' if='Directory.Exists("test")'
   k-test each='var projectFile in Files.Include("test/**/project.json")'
diff --git a/build/_kpm-local-publish.shade b/build/_kpm-local-publish.shade
new file mode 100644
index 0000000000..ce976ba4e7
--- /dev/null
+++ b/build/_kpm-local-publish.shade
@@ -0,0 +1,16 @@
+@{/*
+
+k-local-publish
+    Builds project. Downloads and executes k sdk tools.
+
+sourcePackagesDir=''
+    Required. Path to packages to install (skips symbol packages)
+*/}
+
+@{
+   var packages = Directory.EnumerateFiles(sourcePackagesDir, "*.nupkg")
+                           .Where(p => !p.EndsWith(".symbols.nupkg"));
+}
+
+exec program='cmd' commandline='/C kpm packages add ${package}' if='!IsMono' each='var package in packages'
+exec program='kpm' commandline='packages add ${package}' if='IsMono' each='var package in packages'

From 99a22149a91dda965f55b5a753e885348026a559 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sun, 25 Jan 2015 10:23:55 -0800
Subject: [PATCH 2/3] Changes to allow using kpm add to publish artifacts to CI
 volatile directory

---
 build/_k-standard-goals.shade  | 2 +-
 build/_kpm-local-publish.shade | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade
index ea242cd6ad..991aed12c1 100644
--- a/build/_k-standard-goals.shade
+++ b/build/_k-standard-goals.shade
@@ -73,7 +73,7 @@ default Configuration='${E("Configuration")}'
 
 
 #nuget-install target='install' description='Install NuGet packages to local repo'
-  kpm-local-publish sourcePackagesDir='${BUILD_DIR}'
+  kpm-local-publish sourcePackagesDir='${BUILD_DIR}' targetPackagesDir='${E("PACKAGES_PUBLISH_DIR")}'
 
 #xunit-test target='test' if='Directory.Exists("test")'
   k-test each='var projectFile in Files.Include("test/**/project.json")'
diff --git a/build/_kpm-local-publish.shade b/build/_kpm-local-publish.shade
index ce976ba4e7..313a6196c8 100644
--- a/build/_kpm-local-publish.shade
+++ b/build/_kpm-local-publish.shade
@@ -5,12 +5,17 @@ k-local-publish
 
 sourcePackagesDir=''
     Required. Path to packages to install (skips symbol packages)
+
+targetPackagesDir=''
+    Optional. Path to publish packages.
 */}
 
+default targetPackagesDir=''
+
 @{
    var packages = Directory.EnumerateFiles(sourcePackagesDir, "*.nupkg")
                            .Where(p => !p.EndsWith(".symbols.nupkg"));
 }
 
-exec program='cmd' commandline='/C kpm packages add ${package}' if='!IsMono' each='var package in packages'
-exec program='kpm' commandline='packages add ${package}' if='IsMono' each='var package in packages'
+exec program='cmd' commandline='/C kpm packages add ${package} ${targetPackagesDir}' if='!IsMono' each='var package in packages'
+exec program='kpm' commandline='packages add ${package} ${targetPackagesDir}' if='IsMono' each='var package in packages'

From eb192a36a6e0d335580f41ddc1bc729e4b7746bf Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sun, 25 Jan 2015 10:56:40 -0800
Subject: [PATCH 3/3] Renaming kpm-local-publish to kpm-publish

---
 build/_k-standard-goals.shade                          | 2 +-
 build/{_kpm-local-publish.shade => _kpm-publish.shade} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename build/{_kpm-local-publish.shade => _kpm-publish.shade} (97%)

diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade
index 991aed12c1..b04bbe3353 100644
--- a/build/_k-standard-goals.shade
+++ b/build/_k-standard-goals.shade
@@ -73,7 +73,7 @@ default Configuration='${E("Configuration")}'
 
 
 #nuget-install target='install' description='Install NuGet packages to local repo'
-  kpm-local-publish sourcePackagesDir='${BUILD_DIR}' targetPackagesDir='${E("PACKAGES_PUBLISH_DIR")}'
+  kpm-publish sourcePackagesDir='${BUILD_DIR}' targetPackagesDir='${E("PACKAGES_PUBLISH_DIR")}'
 
 #xunit-test target='test' if='Directory.Exists("test")'
   k-test each='var projectFile in Files.Include("test/**/project.json")'
diff --git a/build/_kpm-local-publish.shade b/build/_kpm-publish.shade
similarity index 97%
rename from build/_kpm-local-publish.shade
rename to build/_kpm-publish.shade
index 313a6196c8..099a0648ae 100644
--- a/build/_kpm-local-publish.shade
+++ b/build/_kpm-publish.shade
@@ -1,6 +1,6 @@
 @{/*
 
-k-local-publish
+kpm-publish
     Builds project. Downloads and executes k sdk tools.
 
 sourcePackagesDir=''