From: Fadi Hanna <fadim@microsoft.com>
Date: Fri, 6 Dec 2019 17:39:04 +0000 (-0800)
Subject: Revert --resilient from being the default on crossgen2 for now (#619)
X-Git-Tag: submit/tizen/20210909.063632~10769
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=592eb49225d7c47d0e99b8fdbd392b4e36a7a567;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Revert --resilient from being the default on crossgen2 for now (#619)
---

diff --git a/src/coreclr/tests/src/CLRTest.CrossGen.targets b/src/coreclr/tests/src/CLRTest.CrossGen.targets
index 226a0e7..97d4745 100644
--- a/src/coreclr/tests/src/CLRTest.CrossGen.targets
+++ b/src/coreclr/tests/src/CLRTest.CrossGen.targets
@@ -71,7 +71,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
           mkdir IL
           cp $(MSBuildProjectName).dll IL/$(MSBuildProjectName).dll
           mv $(MSBuildProjectName).dll $(MSBuildProjectName).org
-          __Command=$_DebuggerFullPath "$CORE_ROOT/crossgen2/crossgen2" -r:$CORE_ROOT/*.dll -r:$PWD/*.dll --resilient --targetarch=x64 -O --inputbubble -o:$(scriptPath)$(MSBuildProjectName).dll $(scriptPath)$(MSBuildProjectName).org
+          __Command=$_DebuggerFullPath "$CORE_ROOT/crossgen2/crossgen2" -r:$CORE_ROOT/*.dll -r:$PWD/*.dll --targetarch=x64 -O --inputbubble -o:$(scriptPath)$(MSBuildProjectName).dll $(scriptPath)$(MSBuildProjectName).org
           echo $__Command
           $__Command
           __cg2ExitCode=$?
@@ -132,7 +132,7 @@ if defined RunCrossGen2 (
             mkdir IL
             copy $(MSBuildProjectName).dll IL\$(MSBuildProjectName).dll
             ren $(MSBuildProjectName).dll $(MSBuildProjectName).org
-            set __Command=!_DebuggerFullPath! "!CORE_ROOT!\crossgen2\crossgen2" %21scriptPath%21$(MSBuildProjectName).org -o:%21scriptPath%21$(MSBuildProjectName).dll --resilient --targetarch:x64 -O --inputbubble -r:!CORE_ROOT!\*.dll -r:%25cd%25\*.dll
+            set __Command=!_DebuggerFullPath! "!CORE_ROOT!\crossgen2\crossgen2" %21scriptPath%21$(MSBuildProjectName).org -o:%21scriptPath%21$(MSBuildProjectName).dll --targetarch:x64 -O --inputbubble -r:!CORE_ROOT!\*.dll -r:%25cd%25\*.dll
             echo "!__Command!"
             call !__Command!
             set CrossGen2Status=!ERRORLEVEL!
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_25027/GitHub_25027.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_25027/GitHub_25027.ilproj
index e7c67cc..ab2a4d3 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_25027/GitHub_25027.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_25027/GitHub_25027.ilproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <CrossGenTest>false</CrossGenTest>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>