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 @@ + + + + + + + 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"); } }