From 040e30e1db7fafba9d5b4b99710903fb416dde39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Sat, 14 Dec 2019 23:38:17 +0100 Subject: [PATCH] Fix incorrect merge of my framework crossgenning fix with Jeremy's local live-live change (#879) 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 --- src/coreclr/build-test.cmd | 15 --------------- src/coreclr/build-test.sh | 4 ---- 2 files changed, 19 deletions(-) diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 07c9fae..1f86b71 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -508,21 +508,6 @@ echo { "build_os": "%__BuildOS%", "build_arch": "%__BuildArch%", "build_type": " 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 ========================================================================================= diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 9e13cd2..bda7435 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -344,10 +344,6 @@ build_Tests() fi if [ $__SkipGenerateLayout != 1 ]; then - if [ ! -z "$__LocalCoreFXPath" ]; then - patch_corefx_libraries - fi - generate_layout fi } -- 2.7.4