From 38afedb0800914abff3b6b607ef9e87e7c77ccfe Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 6 Nov 2014 10:08:09 -0800
Subject: [PATCH] Updating config to create release NuGet.config and phantom
 merge as part of update-release

---
 build-template/NuGet.release.config |  7 +++++++
 makefile.shade                      | 20 +++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 build-template/NuGet.release.config

diff --git a/build-template/NuGet.release.config b/build-template/NuGet.release.config
new file mode 100644
index 0000000000..2d3b0cb857
--- /dev/null
+++ b/build-template/NuGet.release.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetrelease/api/v2" />
+    <add key="NuGet.org" value="https://nuget.org/api/v2/" />
+  </packageSources>
+</configuration>
diff --git a/makefile.shade b/makefile.shade
index 01e62bc3b0..7db3a11775 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -142,18 +142,16 @@ var buildTarget = "compile"
         foreach (var repo in GetAllRepos())
         {
             CloneOrUpdate(repo);
-            try
-            {
-                GitCommand(repo, "checkout release");
-            }
-            catch
-            {
-                // If the release branch does not exist, create a new branch and reset origin/dev to it.
-                GitCommand(repo, "checkout origin/dev -b release");
-            }
-
-            GitCommand(repo, "merge origin/dev");
+            
+            GitCommand(repo, "checkout origin/dev -B release");
+            File.Copy(Path.Combine("build-template", "NuGet.release.config"),
+                      Path.Combine(repo, "NuGet.config"),
+                      overwrite: true);
+            GitCommand(repo, "commit -am \"Updating to release NuGet.config\"");
             GitCommand(repo, "push origin release");
+            GitCommand(repo, "checkout origin/dev -B dev");
+            GitCommand(repo, "merge release -s ours");
+            GitCommand(repo, "push origin dev");
         }
     }