diff options
| author | jashook <jashoo@microsoft.com> | 2019-06-13 04:29:29 +0000 |
|---|---|---|
| committer | jashook <jashoo@microsoft.com> | 2019-06-13 04:29:29 +0000 |
| commit | 680ee73998a516a1b90d82ed5a932fa0f6836399 (patch) | |
| tree | ca67b37c10763378195b3e5bf8f853ebb5c40e91 /build.cmd | |
| parent | 5ca07f5369c881b0b2fde1518675d0a120c00b7e (diff) | |
| download | coreclr-680ee73998a516a1b90d82ed5a932fa0f6836399.tar.gz coreclr-680ee73998a516a1b90d82ed5a932fa0f6836399.tar.bz2 coreclr-680ee73998a516a1b90d82ed5a932fa0f6836399.zip | |
Also use WriteLinesToFile for IBC merge and read in the file in build.cmd
Diffstat (limited to 'build.cmd')
| -rw-r--r-- | build.cmd | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -645,9 +645,14 @@ if %__BuildCoreLib% EQU 1 ( if %__IbcOptimize% EQU 1 ( echo %__MsgPrefix%Commencing IBCMerge of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% set IbcMergeProjectFilePath=%__ProjectDir%\src\.nuget\optdata\ibcmerge.csproj - for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo') do @( - set __IbcMergeVersion=%%s + call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo %__CommonMSBuildArgs% + + if not exist "%__IntermediatesDir%\ibcmergeversion.txt" ( + echo "Failed to determine IBC Merge version." + exit /b 1 ) + + set /p __IbcMergeVersion<"%__IntermediatesDir%\ibcmergeversion.txt" set IbcMergePath=%__PackagesDir%\microsoft.dotnet.ibcmerge\!__IbcMergeVersion!\tools\netcoreapp2.0\ibcmerge.dll if exist !IbcMergePath! ( |