Updating config to create release NuGet.config and phantom merge as part of update-release

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>

makefile.shade

@@ -142,18 +142,16 @@ var buildTarget = "compile"
         foreach (var repo in GetAllRepos())
         {
             CloneOrUpdate(repo);
-            try
+            
-            {
+            GitCommand(repo, "checkout origin/dev -B release");
-                GitCommand(repo, "checkout release");
+            File.Copy(Path.Combine("build-template", "NuGet.release.config"),
-            }
+                      Path.Combine(repo, "NuGet.config"),
-            catch
+                      overwrite: true);
-            {
+            GitCommand(repo, "commit -am \"Updating to release NuGet.config\"");
-                // 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, "push origin release");
+            GitCommand(repo, "checkout origin/dev -B dev");
+            GitCommand(repo, "merge release -s ours");
+            GitCommand(repo, "push origin dev");
         }
     }