diff --git a/setup.py b/setup.py
index 4f3ba6e535..e0dfb4e729 100644
--- a/setup.py
+++ b/setup.py
@@ -183,7 +183,13 @@ version_number = ''
 with open('VERSION_NUMBER') as f:
     version_number = f.readline().strip()
 if nightly_build:
-    date_suffix = str(datetime.datetime.now().date().strftime("%m%d"))
+    #https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables
+    date_suffix = environ.get('BUILD_BUILDNUMBER')
+    if date_suffix is None:
+      #The following line is only for local testing
+      date_suffix = str(datetime.datetime.now().date().strftime("%Y%m%d"))
+    else:
+      date_suffix = date_suffix.replace('.','')
     version_number = version_number + ".dev" + date_suffix
 
 cmd_classes = {}