Commit2a8bb92

authored

Merge pull request #3986 from brettfo/tools-semaphore

ensure the expected dotnet CLI is actually present

2 parents0a8adb6 +37d02af commit2a8bb92Copy full SHA for 2a8bb92

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,12 @@ if [%1]==[force] (`
`26`	`26`	`ifexist"%PACKAGES_DIR%microsoft.dotnet.buildtools"rmdir /S /Q"%PACKAGES_DIR%microsoft.dotnet.buildtools"`
`27`	`27`	`)`
`28`	`28`
	`29`	`+set /pDOTNET_TOOLS_VERSION=<"%~dp0DotnetCLIToolsVersion.txt"`
	`30`	`+ifnotexist"%DOTNET_TOOLS_PATH%\sdk\%DOTNET_TOOLS_VERSION%" (`
	`31`	`+:: dotnet cli doesn't yet exist, delete the semaphore`
	`32`	`+del"%BUILD_TOOLS_SEMAPHORE%">NUL2>&1`
	`33`	`+)`
	`34`	`+`
`29`	`35`	`:: If sempahore exists do nothing`
`30`	`36`	`ifexist"%BUILD_TOOLS_SEMAPHORE%" (`
`31`	`37`	`echo Tools are already initialized.`
`@@ -44,7 +50,6 @@ if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%"`
`44`	`50`	`echo%PROJECT_JSON_CONTENTS%>"%PROJECT_JSON_FILE%"`
`45`	`51`	`echo Running%0>"%INIT_TOOLS_LOG%"`
`46`	`52`
`47`		`-set /pDOTNET_TOOLS_VERSION=<"%~dp0DotnetCLIToolsVersion.txt"`
`48`	`53`	`ifexist"%DOTNET_TOOLS_PATH%"goto :afterdotnettoolsrestore`
`49`	`54`
`50`	`55`	`echo Installing dotnet OLD VERSION OF THE cli...`

Comments

(0)