Commitf21648e

authored

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

Only check assembly versions when appropriate tools are built.

2 parents9e7a610 +a044057 commitf21648eCopy full SHA for f21648e

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -742,9 +742,11 @@ if "%BUILD_PHASE%" == "1" (`
`742`	`742`	`echo ---------------- Done with build, starting assembly version checks ---------------`
`743`	`743`	`setasmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck`
`744`	`744`
`745`		`-echo"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"`
`746`		`-"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"`
`747`		`-ifERRORLEVEL1echo Error verifying assembly versions and commit hashes.&&goto :failure`
	`745`	`+if"%BUILD_NET40%"=="1" (`
	`746`	`+echo"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"`
	`747`	`+"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"`
	`748`	`+ifERRORLEVEL1echo Error verifying assembly versions and commit hashes.&&goto :failure`
	`749`	`+)`
`748`	`750`
`749`	`751`	`echo ---------------- Done with assembly version checks, starting assembly signing ---------------`
`750`	`752`

Comments

(0)