I found out that in two places my fix for crossgenning the framework
incorrectly merged with Jeremy's live-live change. In particular,
as I was moving around the steps for patching CORE_ROOT with explicit
CoreFX while Jeremy was deleting them, my changes inadvertently
resurrected two such deleted sections.
Thanks
Tomas
REM =========================================================================================
REM ===
-REM === Copy CoreFX assemblies if needed.
-REM ===
-REM =========================================================================================
-
-if NOT "%__LocalCoreFXPath%"=="" (
- echo Patch CoreFX from %__LocalCoreFXPath% ^(%__LocalCoreFXConfig%^)
- set NEXTCMD=python "%__ProjectDir%\tests\scripts\patch-corefx.py" -clr_core_root "%CORE_ROOT%"^
- -fx_root "%__LocalCoreFXPath%" -arch %__BuildArch% -build_type %__LocalCoreFXConfig%
- echo !NEXTCMD!
- !NEXTCMD!
-)
-
-
-REM =========================================================================================
-REM ===
REM === Crossgen assemblies if needed.
REM ===
REM =========================================================================================
fi
if [ $__SkipGenerateLayout != 1 ]; then
- if [ ! -z "$__LocalCoreFXPath" ]; then
- patch_corefx_libraries
- fi
-
generate_layout
fi
}