Merge pull request #7293 from MonoGame/develop

Update master
MonoGame · Aug 10, 2020 · 15a6079 · 15a6079
2 parents b2a8062 + 8b18152
commit 15a6079
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -71,7 +71,7 @@ object DevelopMac : BuildType({
     buildNumberPattern = "${Version.depParamRefs.buildNumber}"
 
     params {
-        param("env.GIT_BRANCH", "%vcsroot.branch%")
+        param("env.GIT_BRANCH", "%teamcity.build.branch%")
         param("env.BUILD_NUMBER", "%build.number%")
     }
 
@@ -145,7 +145,7 @@ object DevelopWin : BuildType({
     buildNumberPattern = "${Version.depParamRefs.buildNumber}"
 
     params {
-        param("env.GIT_BRANCH", "%vcsroot.branch%")
+        param("env.GIT_BRANCH", "%teamcity.build.branch%")
         param("env.BUILD_NUMBER", "%build.number%")
     }
 
@@ -456,7 +456,7 @@ object TestMac : BuildType({
     buildNumberPattern = "${Version.depParamRefs.buildNumber}"
 
     params {
-        param("env.GIT_BRANCH", "%vcsroot.branch%")
+        param("env.GIT_BRANCH", "%teamcity.build.branch%")
         param("env.BUILD_NUMBER", "%build.number%")
     }
 
@@ -558,7 +558,7 @@ object TestWindows : BuildType({
     buildNumberPattern = "${Version.depParamRefs.buildNumber}"
 
     params {
-        param("env.GIT_BRANCH", "%vcsroot.branch%")
+        param("env.GIT_BRANCH", "%teamcity.build.branch%")
         param("env.BUILD_NUMBER", "%build.number%")
     }
 

diff --git a/build.cake b/build.cake
@@ -60,10 +60,11 @@ Task("Prep")
 
     // We tag the version with the build branch to make it
     // easier to spot special builds in NuGet feeds.
-    var branch = EnvironmentVariable("GIT_BRANCH") ?? string.Empty;
-    if (branch == "develop")
+    var branch = EnvironmentVariable("GIT_BRANCH") ?? string.Empty;    
+    if (!branch.Contains("master"))
 	version += "-develop";
-
+
+    Console.WriteLine("Build Branch: {0}", branch);
     Console.WriteLine("Build Version: {0}", version);
 
     msPackSettings = new MSBuildSettings();