Use VisualCppTools nuget package for link.exe

Author: KevinRansom

.nuget/NuGet.Config

@@ -11,6 +11,6 @@
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-
+    <add key="vctools" value="https://vcppdogfooding.azurewebsites.net/nuget/" />
   </packageSources>  
 </configuration>

build.cmd

@@ -363,16 +363,15 @@ if '%RestorePackages%' == 'true' (
     .\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
     @if ERRORLEVEL 1 echo Error: Nuget restore failed  && goto :failure
 )
-if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
 
+if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
     :: Restore the Tools directory
     call %~dp0init-tools.cmd
 )
 
 set _dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
 
 if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
-
     :: Restore the Tools directory
     call %~dp0init-tools.cmd
 

packages.config

@@ -20,4 +20,5 @@
   <package id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
   <package id="BenchmarkDotNet" version="0.9.8"/>
   <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
+  <package id="VisualCppTools" version="14.0.24516-Pre"/>
 </packages>

tests/RunTests.cmd

@@ -18,6 +18,13 @@ if not exist "%~dp0..\packages\NUnit.Console.3.0.0\tools\" (
 SET NUNIT3_CONSOLE=%~dp0..\packages\NUnit.Console.3.0.0\tools\nunit3-console.exe
 SET FSI_TOOL=%~dp0..\%FLAVOR%\net40\bin\Fsi.exe
 
+set link_exe=%~dp0..\packages\VisualCppTools.14.0.24516-Pre\lib\native\bin\link.exe
+if not exist "%link_exe%" (
+    set saved_errorlevel=1
+    echo Error: failed to find '%link_exe%' use nuget to restore the VisualCppTools package
+    goto :FINISHED
+)
+
 rem "ttags" indicates what test areas will be run, based on the tags in the test.lst files
 set TTAGS_ARG=
 SET TTAGS=
@@ -382,7 +389,8 @@ echo powershell -File Upload-Results.ps1 "%~1"
      powershell -File Upload-Results.ps1 "%~1"
 
 :SKIP_APPVEYOR_UPLOAD
-	 
+:FINISHED
+
 if NOT %saved_errorlevel% == 0 exit /b 1
 goto :EOF
 

tests/fsharpqa/Source/CompilerOptions/fsc/highentropyva/CheckHighEntropyASLR.bat

@@ -1,14 +1,6 @@
 @echo off
 
-REM Search for the Linker
-REM Use VS2015 or fall back to VS2014
-SET LINK_EXE="%VS150COMNTOOLS%\..\IDE\VC\bin\link.exe"
-IF NOT EXIST %LINK_EXE% ( SET LINK_EXE="%VS150COMNTOOLS%..\..\VC\bin\link.exe" )
-IF NOT EXIST %LINK_EXE% ( SET LINK_EXE="%VS140COMNTOOLS%..\..\VC\bin\link.exe" )
-IF NOT EXIST %LINK_EXE% ( 
-    @echo "Test Requires LINK.EXE" --- Not found 
-    @echo "When installing VS please select "Select Visual C++ / Common Tools For Visual C++"
-)
+REM Use Link.exe from the nuget package
 
 REM %LINK_EXE% -- Path to link.exe
 REM %1 -- assembly to check

tests/fsharpqa/Source/CompilerOptions/fsc/subsystemversion/CheckSubsystemVersion.bat

@@ -1,15 +1,5 @@
 @echo off
 
-REM Search for the Linker
-REM Use VS2015 or fall back to VS2014
-SET LINK_EXE="%VS150COMNTOOLS%\..\IDE\VC\bin\link.exe"
-IF NOT EXIST %LINK_EXE% ( SET LINK_EXE="%VS150COMNTOOLS%..\..\VC\bin\link.exe" )
-IF NOT EXIST %LINK_EXE% ( SET LINK_EXE="%VS140COMNTOOLS%..\..\VC\bin\link.exe" )
-IF NOT EXIST %LINK_EXE% ( 
-    @echo "Test Requires LINK.EXE" --- Not found 
-    @echo "When installing VS please select "Select Visual C++ / Common Tools For Visual C++"
-)
-
 REM %LINK_EXE% -- Path to link.exe
 REM %1 -- assembly to check
 REM %2 -- expected value ("4.00" etc...)