Merge pull request #4321 from brettfo/version-check

use fsi for assembly version check

Author: brettfo

build.cmd

@@ -603,7 +603,10 @@ if "%RestorePackages%" == "true" (
     )
 )
 
-call %~dp0init-tools.cmd
+if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
+    :: Restore the Tools directory
+    call %~dp0init-tools.cmd
+)
 
 echo ----------- Done with package restore, starting dependency uptake check -------------
 
@@ -696,7 +699,9 @@ if "%BUILD_PHASE%" == "1" (
 
 echo ---------------- Done with build, starting assembly version checks ---------------
 set asmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck
-%_dotnet20exe% run -p "%asmvercheckpath%\AssemblyVersionCheck.fsproj" "%~dp0build\config\AssemblySignToolData.json" "%~dp0%BUILD_CONFIG%"
+
+echo "%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe" %asmvercheckpath%\AssemblyVersionCheck.fsx -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0%BUILD_CONFIG%"
+     "%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe" %asmvercheckpath%\AssemblyVersionCheck.fsx -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0%BUILD_CONFIG%"
 if ERRORLEVEL 1 echo Error verifying assembly versions and commit hashes. && goto :failure
 
 echo ---------------- Done with assembly version checks, starting assembly signing ---------------

tests/fsharpqa/testenv/src/AssemblyVersionCheck/AssemblyVersionCheck.fsproj

@@ -1,4 +1,7 @@
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+// this was restored by packages.config in the root
+#r @"..\..\..\..\..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll"
 
 open System
 open System.Diagnostics
@@ -78,10 +81,15 @@ module AssemblyVersionCheck =
         // return code is the number of failures
         failedVersionCheck.Length + failedCommitHash.Length
 
-[<EntryPoint>]
-let main argv =
+let main (argv:string array) =
     if argv.Length <> 2 then
-        printfn "Usage: AssemblyVersionCheck.exe SignToolData.json path/to/binaries"
+        printfn "Usage: fsi.exe AssemblyVersionCheck.fsx -- SignToolData.json path/to/binaries"
         1
     else
         AssemblyVersionCheck.verifyAssemblyVersions argv.[0] argv.[1]
+
+Environment.GetCommandLineArgs()
+|> Seq.skipWhile ((<>) "--")
+|> Seq.skip 1
+|> Array.ofSeq
+|> main