From 98525da02bc7d28ebb2e90f1995fbb96de1c0add Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 11 Jul 2017 19:20:15 -0700
Subject: [PATCH] Use the right set of env variables for determining commit
 hash

---
 build/repo.targets | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 2aa28e05ab..b639fdc03b 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -183,11 +183,12 @@
     <PropertyGroup>
       <!--
         Attempt to read environment variables set up by the CI's VCS Root if available.
-        * vcsroot.<RepositoryName>.url gives us the clone URL for a repository
-        * build.vcs.number.<RepositoryName> gives us the commit hash for a repository.
+        * BUILD_VCS_URL_<RepositoryName> gives us the clone URL for a repository
+        * BUILD_VCS_NUMBER_<RepositoryName> gives us the commit hash for a repository.
       -->
-      <_CloneUrl>$([System.Environment]::GetEnvironmentVariable("vcsroot.%(Repository.Identity).url"))</_CloneUrl>
-      <_CommitHash>$([System.Environment]::GetEnvironmentVariable("build.vcs.number.%(Repository.Identity)"))</_CommitHash>
+      <_RepositoryName>$([System.String]::new('%(Repository.Identity)').Replace('.', '_'))</_RepositoryName>
+      <_CloneUrl>$([System.Environment]::GetEnvironmentVariable("BUILD_VCS_URL_$(_RepositoryName)"))</_CloneUrl>
+      <_CommitHash>$([System.Environment]::GetEnvironmentVariable("BUILD_VCS_NUMBER_$(_RepositoryName)"))</_CommitHash>
     </PropertyGroup>
 
     <Warning Text="%(Repository.Identity) has not been cloned."