From 85f0084e9c49311010db88143177858aa6e71ff6 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Fri, 12 Feb 2021 13:41:30 -0800
Subject: [PATCH] set options and change VS for nightly

---
 scripts/mk_win_dist.py | 4 ++--
 scripts/nightly.yaml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/mk_win_dist.py b/scripts/mk_win_dist.py
index 3d30d8723..bd3de3087 100644
--- a/scripts/mk_win_dist.py
+++ b/scripts/mk_win_dist.py
@@ -216,8 +216,8 @@ def mk_dist_dir(x64):
     mk_dir(dist_path)
     mk_win_dist(build_path, dist_path)
     if is_verbose():
-        print("Generated %s distribution folder at '%s'" % (platform, dist_path))
-
+        print(f"Generated {platform} distribution folder at '{dist_path}'")
+        
 def mk_dist_dirs():
     mk_dist_dir(False)
     mk_dist_dir(True)
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index cb6f951f4..10325276c 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -93,7 +93,7 @@ stages:
     - task: CmdLine@2
       inputs:
         script:
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat" &&
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 &&
           python scripts\mk_win_dist.py
             --x86-only
             --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk
@@ -116,7 +116,7 @@ stages:
     - task: CmdLine@2
       inputs:
         script:
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" &&
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 &&
           python scripts\mk_win_dist.py
             --x64-only
             --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk