[READY] Support MSVC 16

azure-pipelines.yml

@@ -100,18 +100,15 @@ jobs:
   variables:
     MSVC: 14
     MSBUILD_PATH: 'C:\Program Files (x86)\MSBuild\14.0\Bin'
-    COVERAGE: true
   steps:
   - checkout: self
     submodules: recursive
   - script: azure\windows\install_dependencies.bat
     displayName: Install dependencies
   - script: azure\windows\run_tests.bat
     displayName: Run tests
-    condition: and(succeeded(), ne(variables['YCM_BENCHMARK'], 'true'))
   - script: azure\windows\send_coverage.bat
     displayName: Send coverage
-    condition: and(succeeded(), eq(variables['COVERAGE'], 'true'))
     env:
       CODECOV_TOKEN: $(CODECOV_TOKEN)
       CODECOV_JOB_NAME: '$(Agent.JobName)'
@@ -121,6 +118,31 @@ jobs:
     # List of available software on this image:
     # https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/win/Vs2017-Server2016-Readme.md
     vmImage: 'vs2017-win2016'
+  strategy:
+    matrix:
+      'Python 3.7 64-bit':
+        YCM_PYTHON_INSTALLER_URL: 'https://www.python.org/ftp/python/3.7.3/python-3.7.3-amd64.exe'
+  variables:
+    MSVC: 15
+    MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin'
+  steps:
+  - checkout: self
+    submodules: recursive
+  - script: azure\windows\install_dependencies.bat
+    displayName: Install dependencies
+  - script: azure\windows\run_tests.bat
+    displayName: Run tests
+  - script: azure\windows\send_coverage.bat
+    displayName: Send coverage
+    env:
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+      CODECOV_JOB_NAME: '$(Agent.JobName)'
+- job: windows_msvc17
+  displayName: 'Windows Visual Studio 2019'
+  pool:
+    # List of available software on this image:
+    # https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/win/Vs2019-Server2019-Readme.md
+    vmImage: 'windows-2019'
   strategy:
     matrix:
       'Python 2.7 64-bit':
@@ -135,8 +157,8 @@ jobs:
         COVERAGE: false
     maxParallel: 4
   variables:
-    MSVC: 15
-    MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin'
+    MSVC: 16
+    MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin'
     COVERAGE: true
   steps:
   - checkout: self

azure/windows/install_dependencies.bat

@@ -12,7 +12,7 @@ if "%python_installer_extension%" == "exe" (
   msiexec /i C:\python-installer.msi TARGETDIR=C:\Python /qn
 )
 
-C:\Python\Scripts\pip install -r test_requirements.txt
+C:\Python\Scripts\pip install -r test_requirements.txt --disable-pip-version-check --no-warn-script-location
 
 :: Enable coverage for Python subprocesses. See:
 :: http://coverage.readthedocs.io/en/latest/subprocess.html

benchmark.py

@@ -16,8 +16,8 @@
 
 def ParseArguments():
   parser = argparse.ArgumentParser()
-  parser.add_argument( '--msvc', type = int, choices = [ 12, 14, 15 ],
-                       default = 15, help = 'Choose the Microsoft Visual '
+  parser.add_argument( '--msvc', type = int, choices = [ 14, 15, 16 ],
+                       default = 16, help = 'Choose the Microsoft Visual '
                        'Studio version (default: %(default)s).' )
 
   return parser.parse_known_args()

build.py

@@ -371,6 +371,10 @@ def GetGenerator( args ):
   if args.ninja:
     return 'Ninja'
   if OnWindows():
+    # The architecture must be specified through the -A option for the Visual
+    # Studio 16 generator.
+    if args.msvc == 16:
+      return 'Visual Studio 16'
     return 'Visual Studio {version}{arch}'.format(
         version = args.msvc, arch = ' Win64' if IS_64BIT else '' )
   return 'Unix Makefiles'
@@ -401,8 +405,8 @@ def ParseArguments():
   parser.add_argument( '--system-libclang', action = 'store_true',
                        help = 'Use system libclang instead of downloading one '
                        'from llvm.org. NOT RECOMMENDED OR SUPPORTED!' )
-  parser.add_argument( '--msvc', type = int, choices = [ 14, 15 ],
-                       default = 15, help = 'Choose the Microsoft Visual '
+  parser.add_argument( '--msvc', type = int, choices = [ 14, 15, 16 ],
+                       default = 16, help = 'Choose the Microsoft Visual '
                        'Studio version (default: %(default)s).' )
   parser.add_argument( '--ninja', action = 'store_true',
                        help = 'Use Ninja build system.' )
@@ -481,7 +485,14 @@ def FindCmake():
 
 def GetCmakeCommonArgs( args ):
   cmake_args = [ '-G', GetGenerator( args ) ]
+
+  # Set the architecture for the Visual Studio 16 generator.
+  if OnWindows() and args.msvc == 16:
+    arch = 'x64' if IS_64BIT else 'Win32'
+    cmake_args.extend( [ '-A', arch ] )
+
   cmake_args.extend( CustomPythonCmakeArgs( args ) )
+
   return cmake_args
 
 

run_tests.py

@@ -156,8 +156,8 @@ def ParseArguments():
                         COMPLETERS.keys() ) )
   parser.add_argument( '--skip-build', action = 'store_true',
                        help = 'Do not build ycmd before testing.' )
-  parser.add_argument( '--msvc', type = int, choices = [ 14, 15 ],
-                       default = 15, help = 'Choose the Microsoft Visual '
+  parser.add_argument( '--msvc', type = int, choices = [ 14, 15, 16 ],
+                       default = 16, help = 'Choose the Microsoft Visual '
                        'Studio version (default: %(default)s).' )
   parser.add_argument( '--coverage', action = 'store_true',
                        help = 'Enable coverage report (requires coverage pkg)' )