Reenable UpdateVersionsRepo

Now that https://github.com/dotnet/buildtools/issues/1547 is fixed.

build/DependencyVersions.props

@@ -41,7 +41,7 @@
 
   <!-- infrastructure and test only dependencies -->
   <PropertyGroup>
-    <VersionToolsVersion>1.0.27-prerelease-01611-04</VersionToolsVersion>
+    <VersionToolsVersion>1.0.27-prerelease-01723-01</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
   </PropertyGroup>
 </Project>

build/publish/FinishBuild.targets

@@ -54,9 +54,8 @@
                        CommitHash="$(CommitHash)"
                        Coherent="$(Coherent)" />
 
-    <!-- Uncomment the line below when https://github.com/dotnet/buildtools/issues/1547 gets fixed. -->
-    <!-- <UpdateVersionsRepo BranchName="$(BranchName)"
+    <UpdateVersionsRepo BranchName="$(BranchName)"
                         PackagesDirectory="$(PackagesDirectory)"
-                        GitHubPassword="$(GITHUB_PASSWORD)" /> -->
+                        GitHubPassword="$(GITHUB_PASSWORD)" /> 
   </Target>
 </Project>

build_projects/update-dependencies/Config.cs

@@ -82,7 +82,8 @@ namespace Microsoft.DotNet.Scripts
 
         private static string GetDefaultCoreSetupVersionFragment()
         {
-            string coreSetupChannel = GetRepoMSBuildPropValue("BundledRuntimes.props", "CoreSetupChannel") ?? "master";
+            // by default, the current core-setup branch should match the current cli branch name
+            string coreSetupChannel = Instance.GitHubUpstreamBranch;
 
             return $"dotnet/core-setup/{coreSetupChannel}";
         }