From ac129c71acbcf9a13efb73b88b0a0de3d023b92a Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 12 Nov 2014 07:41:24 -0800
Subject: [PATCH] Updating update-master to reset to release and copy
 NuGet.master.config to repos

---
 build-template/NuGet.master.config |  6 ++++++
 makefile.shade                     | 23 ++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 build-template/NuGet.master.config

diff --git a/build-template/NuGet.master.config b/build-template/NuGet.master.config
new file mode 100644
index 0000000000..53454b2000
--- /dev/null
+++ b/build-template/NuGet.master.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="NuGet.org" value="https://nuget.org/api/v2/" />
+  </packageSources>
+</configuration>
diff --git a/makefile.shade b/makefile.shade
index 7db3a11775..9c9d444dbb 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -155,16 +155,25 @@ var buildTarget = "compile"
         }
     }
 
-#update-master
-    -// Merge release branch to master
+#pull-all
     for each='var repo in GetAllRepos()'
         -CloneOrUpdate(repo);
 
-        var gitFolder = '${repo}'
-        git gitCommand='fetch origin'
-        git gitCommand='checkout origin/master -B master'
-        git gitCommand='merge origin/release --ff-only'
-        git gitCommand='push origin master:master'
+#update-master
+    -// Merge release branch to master
+    @{
+        foreach (var repo in GetAllRepos())
+        {
+            CloneOrUpdate(repo);
+
+            GitCommand(repo, "checkout origin/release -B master");
+            File.Copy(Path.Combine("build-template", "NuGet.master.config"),
+                      Path.Combine(repo, "NuGet.config"),
+                      overwrite: true);
+            GitCommand(repo, "commit -am \"Updating NuGet.config\"");
+            GitCommand(repo, "push origin master");
+        }
+    }
 
 #only-compile target='compile'
     @{