Merge pull request #4451 from brettfo/assembly-version-check

Only check assembly versions when appropriate tools are built.
dotnet · Mar 6, 2018 · f21648e · f21648e
2 parents 9e7a610 + a044057
commit f21648e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/build.cmd b/build.cmd
@@ -742,9 +742,11 @@ if "%BUILD_PHASE%" == "1" (
 echo ---------------- Done with build, starting assembly version checks ---------------
 set asmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck
 
-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
+if "%BUILD_NET40%" == "1" (
+  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 ---------------