windows build: remove toolset option and update VSNASM and VSYASM

Change-Id: I23faac23c0a520283caaaea73b30313b551ab54a

build.py

@@ -22,8 +22,7 @@ ANDROID_DISTRIBUTION_NAME = "android"
 WIN32_DISTRIBUTION_NAME = "win32"
 
 # vs vars
-win_sdk_default = '10.0.16299.0'
-win_toolset_default = '142'
+win_sdk_default = '10.0.18362.0'
 
 APT_BASED_DISTROS = [
     'debian',
@@ -373,7 +372,6 @@ def run_install(args):
         return subprocess.run([
             sys.executable, os.path.join(
                 os.getcwd(), "scripts/build-windows.py"),
-            "--toolset", args.toolset,
             "--sdk", args.sdk
         ], check=True)
 
@@ -638,8 +636,6 @@ def parse_args():
     dist = choose_distribution()
 
     if dist == WIN32_DISTRIBUTION_NAME:
-        ap.add_argument('--toolset', default=win_toolset_default, type=str,
-                        help='Windows use only, specify Visual Studio toolset version')
         ap.add_argument('--sdk', default=win_sdk_default, type=str,
                         help='Windows use only, specify Windows SDK version')
 

scripts/build-windows.py

@@ -17,8 +17,7 @@ def execute_cmd(cmd, with_shell=False):
 def build_daemon(parsed_args):
     make_cmd = os.path.dirname(this_dir) + '\\daemon\\compat\\msvc\\winmake.py'
     os.chdir(os.path.dirname(this_dir) + '\\daemon\\compat\\msvc')
-    execute_cmd('python ' + make_cmd + ' -iv -t ' +
-                parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon')
+    execute_cmd('python ' + make_cmd + ' -iv -s ' + parsed_args.sdk + ' -b daemon')
     os.chdir(os.path.dirname(this_dir))
 
 
@@ -31,8 +30,6 @@ def build_client(parsed_args):
 def parse_args():
     ap = argparse.ArgumentParser(description="Qt Client build tool")
 
-    ap.add_argument('--toolset', default='', type=str,
-                    help='Windows use only, specify Visual Studio toolset version')
     ap.add_argument('--sdk', default='', type=str,
                     help='Windows use only, specify Windows SDK version')
 

scripts/install-deps-windows.ps1

@@ -198,13 +198,13 @@ install_choco_packages $choco_packages
 install_msys2_packages $msys_packages
 
 # Install VSNASM
-download_file_to_temp 'VSNASM' "https://github.com/ShiftMediaProject/VSNASM/releases/download/0.5/VSNASM.zip" 'VSNASM.zip'
+download_file_to_temp 'VSNASM' "https://github.com/ShiftMediaProject/VSNASM/releases/download/0.8/VSNASM.zip" 'VSNASM.zip'
 unzip_file_from_temp 'VSNASM' 'VSNASM.zip' 'VSNASM_UNZIP'
 $batch_path = "/c set ISINSTANCE=1 &&" + $env:TEMP + "\VSNASM_UNZIP\install_script.bat"
 run_batch $batch_path "Install VSNASM"
 
 # Install VSYASM
-download_file_to_temp 'VSYASM' "https://github.com/ShiftMediaProject/VSYASM/releases/download/0.4/VSYASM.zip" 'VSYASM.zip'
+download_file_to_temp 'VSYASM' "https://github.com/ShiftMediaProject/VSYASM/releases/download/0.7/VSYASM.zip" 'VSYASM.zip'
 unzip_file_from_temp 'VSYASM' 'VSYASM.zip' 'VSYASM_UNZIP'
 $batch_path = "/c set ISINSTANCE=1 &&" + $env:TEMP + "\VSYASM_UNZIP\install_script.bat"
 run_batch $batch_path "Install VSYASM"