Check for VS2022

Author: akoeplinger

build.cmd

@@ -6,7 +6,7 @@ mkdir bin
 
 :Build
 
-REM Require VS2019 (v16.0) on the system. Use `vswhere` for the search because it can find all VS installations.
+REM Require VS2022 (v17.0) on the system. Use `vswhere` for the search because it can find all VS installations.
 set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if not exist %vswhere% (
   set vswhere="%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"
@@ -23,7 +23,7 @@ if not exist %vswhere% (
 )
 
 set InstallDir=
-for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -products * ^
+for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17 -latest -prerelease -products * ^
     -requires Microsoft.Net.Component.4.5.TargetingPack ^
     -requires Microsoft.Net.Component.4.5.2.TargetingPack ^
     -requires Microsoft.Net.Component.4.6.2.TargetingPack ^
@@ -32,41 +32,11 @@ for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -p
 )
 
 if not DEFINED InstallDir (
-  echo "Could not find a VS2019 installation with the necessary components (targeting packs for v4.5, v4.5.2, and v4.6.2)."
-  echo Please install VS2019 or the missing components.
+  echo "Could not find a VS2022 installation with the necessary components (targeting packs for v4.5, v4.5.2, and v4.6.2)."
+  echo Please install VS2022 or the missing components.
   goto BuildFail
 )
 
-REM Find a 64bit MSBuild and add it to path. Require v17.4 or later due to our .NET SDK choice.
-REM Check for VS2022 first.
-set InstallDir=
-for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17.4 -latest -prerelease -products * ^
-    -requires Microsoft.Component.MSBuild ^
-    -property installationPath`) do (
-  set "InstallDir=%%i"
-)
-
-if DEFINED InstallDir (
-  REM Add MSBuild to the path.
-  set "PATH=%InstallDir%\MSBuild\Current\Bin;%PATH%"
-  goto FoundMSBuild
-)
-
-REM Otherwise find or install an xcopy-able MSBuild.
-echo "Could not find a VS2022 installation with the necessary components (MSBuild). Falling back..."
-
-set "MSBuildVersion=17.4.1"
-set "Command=[System.Threading.Thread]::CurrentThread.CurrentCulture = ''"
-set "Command=%Command%; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''"
-set "Command=%Command%; try { & '%~dp0eng\GetXCopyMSBuild.ps1' %MSBuildVersion%; exit $LASTEXITCODE }"
-set "Command=%Command%  catch { write-host $_; exit 1 }"
-PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass -Command "%Command%"
-if %ERRORLEVEL% neq 0 goto BuildFail
-
-REM Add MSBuild to the path.
-set "PATH=%~dp0.msbuild\%MSBuildVersion%\tools\MSBuild\Current\Bin;%PATH%"
-
-:FoundMSBuild
 REM Configure NuGet operations to work w/in this repo i.e. do not pollute system packages folder.
 REM Note this causes two copies of packages restored using packages.config to land in this folder e.g.
 REM StyleCpy.5.0.0/ and stylecop/5.0.0/.