Update patches to CoreCLR for rc2

Patches/CoreCLR/CMakeLists.txt

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80625f9..7d4642d 100644
+index ba328f4..23585c8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -573,7 +573,7 @@ add_definitions(-DFEATURE_ASYNC_IO)
+@@ -762,7 +762,7 @@ add_definitions(-DFEATURE_ASYNC_IO)
  add_definitions(-DFEATURE_BCL_FORMATTING)
  add_definitions(-DFEATURE_COLLECTIBLE_TYPES)
-
+ 
 -if(WIN32)
 +if(FALSE)
      add_definitions(-DFEATURE_CLASSIC_COMINTEROP)
-     add_definitions(-DFEATURE_APPX)
      add_definitions(-DFEATURE_COMINTEROP)
+     add_definitions(-DFEATURE_COMINTEROP_APARTMENT_SUPPORT)

Patches/CoreCLR/DiffCoreCLR.bat

@@ -0,0 +1,14 @@
+@echo off
+REM ########################################################
+echo Gathering changes to disable COM interop support in CoreCLR...
+pushd ..\..\CoreCLR
+git diff v1.0.0-rc2 src\inc\utilcode.h > ..\Patches\CoreCLR\src\inc\utilcode.h
+git diff v1.0.0-rc2 src\utilcode\CMakeLists.txt > ..\Patches\CoreCLR\src\utilcode\CMakeLists.txt
+git diff v1.0.0-rc2 src\utilcode\util.cpp > ..\Patches\CoreCLR\src\utilcode\util.cpp
+git diff v1.0.0-rc2 src\CMakeLists.txt > ..\Patches\CoreCLR\src\CMakeLists.txt
+git diff v1.0.0-rc2 build.cmd > ..\Patches\CoreCLR\build.cmd
+git diff v1.0.0-rc2 clr.coreclr.props > ..\Patches\CoreCLR\clr.coreclr.props
+git diff v1.0.0-rc2 clr.defines.targets > ..\Patches\CoreCLR\clr.defines.targets
+git diff v1.0.0-rc2 clr.desktop.props > ..\Patches\CoreCLR\clr.desktop.props
+git diff v1.0.0-rc2 CMakeLists.txt > ..\Patches\CoreCLR\CMakeLists.txt
+popd

Patches/CoreCLR/build.cmd

@@ -1,24 +1,13 @@
 diff --git a/build.cmd b/build.cmd
-index 046970e..960cfb7 100644
+index 82fa0a5..2f4f0d8 100644
 --- a/build.cmd
 +++ b/build.cmd
-@@ -123,7 +123,7 @@ exit /b 1
- :: Note: We've disabled node reuse because it causes file locking issues.
- ::       The issue is that we extend the build with our own targets which
- ::       means that that rebuilding cannot successfully delete the task
--::       assembly. 
-+::       assembly.
- if /i "%__VSVersion%" =="vs2015" goto MSBuild14
- set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
- if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
-@@ -174,8 +174,8 @@ exit /b 1
- REM Build CoreCLR
- :BuildCoreCLR
- set "__CoreCLRBuildLog=%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
--%_msbuildexe% "%__IntermediatesDir%\install.vcxproj" %__MSBCleanBuildArgs% /nologo /maxcpucount /nodeReuse:false /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% /fileloggerparameters:Verbosity=normal;LogFile="%__CoreCLRBuildLog%"
--IF NOT ERRORLEVEL 1 goto PerformMScorlibBuild
-+%_msbuildexe% "%__IntermediatesDir%\install.vcxproj" %__MSBCleanBuildArgs% /nologo /maxcpucount /nodeReuse:false /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% /fileloggerparameters:Verbosity=normal;LogFile="%__CoreCLRBuildLog%" /p:FeatureCominterop=false
-+IF NOT ERRORLEVEL 1 goto SuccessfulBuild
- echo Native component build failed. Refer !__CoreCLRBuildLog! for details.
- exit /b 1
+@@ -338,7 +338,7 @@ set __msbuildLogArgs=^
+ /consoleloggerparameters:Summary ^
+ /verbosity:minimal
  
+-set __msbuildArgs="%__IntermediatesDir%\install.vcxproj" %__msbuildCommonArgs% %__msbuildLogArgs% /p:Configuration=%__BuildType%
++set __msbuildArgs="%__IntermediatesDir%\install.vcxproj" %__msbuildCommonArgs% %__msbuildLogArgs% /p:Configuration=%__BuildType% /p:FeatureCominterop=false
+ 
+ if /i "%__BuildArch%" == "arm64" (  
+     REM TODO, remove once we have msbuild support for this platform.

Patches/CoreCLR/clr.coreclr.props

@@ -1,5 +1,5 @@
 diff --git a/clr.coreclr.props b/clr.coreclr.props
-index 2373b7b..2c0aa4e 100644
+index a335486..4568d24 100644
 --- a/clr.coreclr.props
 +++ b/clr.coreclr.props
 @@ -10,7 +10,7 @@
@@ -11,20 +11,19 @@ index 2373b7b..2c0aa4e 100644
      <FeatureCoreclr>true</FeatureCoreclr>
      <FeatureCorruptingExceptions>true</FeatureCorruptingExceptions>
      <FeatureDbiDebugging>true</FeatureDbiDebugging>
-@@ -57,12 +57,12 @@
+@@ -53,11 +53,11 @@
      <FeatureReadyToRun Condition="'$(TargetArch)'!='arm64'">true</FeatureReadyToRun>
-
+ 
      <FeatureCoreSystem>true</FeatureCoreSystem>
 -    <FeatureClassicCominterop>true</FeatureClassicCominterop>
-+    <FeatureClassicCominterop>false</FeatureClassicCominterop>
-     <FeatureLegacySurface>true</FeatureLegacySurface>
 -    <FeatureCominterop>true</FeatureCominterop>
++    <FeatureClassicCominterop>false</FeatureClassicCominterop>
 +    <FeatureCominterop>false</FeatureCominterop>
      <FeatureICastable>true</FeatureICastable>
 -    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
 -    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
 +    <FeatureCominteropUnmanagedActivation>false</FeatureCominteropUnmanagedActivation>
 +    <FeatureCominteropWinRTManagedActivation>false</FeatureCominteropWinRTManagedActivation>
-     <FeatureCrypto>true</FeatureCrypto>
      <FeatureHostAssemblyResolver>true</FeatureHostAssemblyResolver>
      <FeatureLazyCOWPages Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm')">true</FeatureLazyCOWPages>
+     <FeatureLatin1>true</FeatureLatin1>

Patches/CoreCLR/clr.defines.targets

@@ -1,5 +1,5 @@
 diff --git a/clr.defines.targets b/clr.defines.targets
-index 879de92..fe2b3b6 100644
+index 078f572..6e04c7c 100644
 --- a/clr.defines.targets
 +++ b/clr.defines.targets
 @@ -18,7 +18,7 @@

Patches/CoreCLR/clr.desktop.props

@@ -1,5 +1,5 @@
 diff --git a/clr.desktop.props b/clr.desktop.props
-index 84dd6cf..14e6a09 100644
+index 88a4d9f..8c23f32 100644
 --- a/clr.desktop.props
 +++ b/clr.desktop.props
 @@ -19,7 +19,7 @@

Patches/CoreCLR/src/CMakeLists.txt

@@ -1,9 +1,9 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 31c37e5..c56a892 100644
+index 4ae4a7c..076a241 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -38,22 +38,10 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
-
+@@ -125,11 +125,7 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
+ 
  add_subdirectory(utilcode)
  add_subdirectory(gcinfo)
 -add_subdirectory(coreclr)
@@ -12,18 +12,14 @@ index 31c37e5..c56a892 100644
 -add_subdirectory(md)
 -add_subdirectory(debug)
  add_subdirectory(inc)
--add_subdirectory(strongname)
--add_subdirectory(binder)
--add_subdirectory(classlibnative)
--add_subdirectory(dlls)
--add_subdirectory(ToolBox)
--add_subdirectory(tools)
--add_subdirectory(unwinder)
--add_subdirectory(ildasm)
--
+ add_subdirectory(strongname)
+ add_subdirectory(binder)
+@@ -141,7 +137,7 @@ add_subdirectory(unwinder)
+ add_subdirectory(ildasm)
+ add_subdirectory(ilasm)
+ 
 -if(WIN32)
-+
 +if(FALSE)
    add_subdirectory(ipcman)
  endif(WIN32)
-
+ 

Patches/CoreCLR/src/inc/utilcode.h

@@ -1,8 +1,8 @@
 diff --git a/src/inc/utilcode.h b/src/inc/utilcode.h
-index fa0e1b1..9722315 100644
+index b9985a8..cade9e5 100644
 --- a/src/inc/utilcode.h
 +++ b/src/inc/utilcode.h
-@@ -9,6 +9,8 @@
+@@ -8,6 +8,8 @@
  //
  //*****************************************************************************
  

Patches/CoreCLR/src/utilcode/CMakeLists.txt

@@ -1,14 +0,0 @@
-diff --git a/src/utilcode/CMakeLists.txt b/src/utilcode/CMakeLists.txt
-index 52a017f..5a37a4b 100644
---- a/src/utilcode/CMakeLists.txt
-+++ b/src/utilcode/CMakeLists.txt
-@@ -71,8 +71,7 @@ set(UTILCODE_SOURCES
- # They should be moved out from here into the declaration
- # of UTILCODE_SOURCES above after fixing compiler errors.
- if(WIN32)
--  list(APPEND UTILCODE_SOURCES 
--    appxutil.cpp
-+  list(APPEND UTILCODE_SOURCES
-     dlwrap.cpp
-     downlevel.cpp
-     loadrc.cpp

Patches/CoreCLR/src/utilcode/util.cpp

@@ -1,5 +1,5 @@
 diff --git a/src/utilcode/util.cpp b/src/utilcode/util.cpp
-index d7d3a9f..972edd7 100644
+index f801f94..98e5e5d 100644
 --- a/src/utilcode/util.cpp
 +++ b/src/utilcode/util.cpp
 @@ -212,6 +212,7 @@ typedef HRESULT __stdcall DLLGETCLASSOBJECT(REFCLSID rclsid,