Merge changes from TFS

CMakeLists.txt

@@ -692,9 +692,6 @@ if (CLR_CMAKE_PLATFORM_UNIX)
 endif(CLR_CMAKE_PLATFORM_UNIX)
 add_definitions(-DFEATURE_CORESYSTEM)
 add_definitions(-DFEATURE_CORRUPTING_EXCEPTIONS)
-if(WIN32)
-    add_definitions(-DFEATURE_CRYPTO)
-endif(WIN32)
 if(CLR_CMAKE_PLATFORM_UNIX)
     add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
     add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
@@ -718,20 +715,10 @@ if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64)
   add_definitions(-DFEATURE_IMPLICIT_TLS)
   set(FEATURE_IMPLICIT_TLS 1)
 endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64)
-if(WIN32)
-    add_definitions(-DFEATURE_ISOSTORE)
-    add_definitions(-DFEATURE_ISOSTORE_LIGHT)
-endif(WIN32)
 add_definitions(-DFEATURE_ISYM_READER)
 add_definitions(-DFEATURE_LEGACYNETCF)
-if(WIN32)
-    add_definitions(-DFEATURE_LEGACYNETCFCRYPTO)
-endif(WIN32)
 add_definitions(-DFEATURE_LEGACYNETCF_DBG_HOST_CONTROL)
 add_definitions(-DFEATURE_LEGACYNETCFFAS)
-if(WIN32)
-add_definitions(-DFEATURE_LEGACYSURFACE)
-endif(WIN32)
 add_definitions(-DFEATURE_LOADER_OPTIMIZATION)
 add_definitions(-DFEATURE_MANAGED_ETW)
 add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS)
@@ -781,10 +768,6 @@ endif(WIN32)
 add_definitions(-DFEATURE_WIN32_REGISTRY)
 add_definitions(-DFEATURE_WINDOWSPHONE)
 add_definitions(-DFEATURE_WINMD_RESILIENT)
-if(WIN32)
-    add_definitions(-DFEATURE_X509)
-    add_definitions(-DFEATURE_X509_SECURESTRINGS)
-endif(WIN32)
 
 if(CLR_CMAKE_BUILD_TESTS)
   add_subdirectory(tests)

clr.coreclr.props

@@ -24,8 +24,6 @@
     <FeatureFrameworkInternal>true</FeatureFrameworkInternal>
     <FeatureHijack>true</FeatureHijack>
     <FeatureInteropDebugging Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureInteropDebugging>
-    <FeatureIsostore>true</FeatureIsostore>
-    <FeatureIsostoreLight>true</FeatureIsostoreLight>
     <FeatureIsymReader>true</FeatureIsymReader>
     <!-- This is here for testing purposes only, and only on checked builds for x86/ARM -->
     <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages>
@@ -44,8 +42,6 @@
     <FeatureVersioning>true</FeatureVersioning>
     <FeatureVersioningLog>true</FeatureVersioningLog>
     <FeatureWin32Registry>true</FeatureWin32Registry>
-    <FeatureX509>true</FeatureX509>
-    <FeatureX509Securestrings>true</FeatureX509Securestrings>
     <FeatureXPlatDacDebugging_HostWindowsx86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureXPlatDacDebugging_HostWindowsx86>
     <FeatureXPlatDacDebugging_HostWindowsAMD64 Condition="'$(TargetArch)' == 'amd64' or '$(TargetArch)' == 'arm64'">true</FeatureXPlatDacDebugging_HostWindowsAMD64>
     <FeatureXPlatDacDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureXPlatDacDebugging_HostOneCorex86>
@@ -58,15 +54,12 @@
 
     <FeatureCoreSystem>true</FeatureCoreSystem>
     <FeatureClassicCominterop>true</FeatureClassicCominterop>
-    <FeatureLegacySurface>true</FeatureLegacySurface>
     <FeatureCominterop>true</FeatureCominterop>
     <FeatureICastable>true</FeatureICastable>
     <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
     <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
-    <FeatureCrypto>true</FeatureCrypto>
     <FeatureHostAssemblyResolver>true</FeatureHostAssemblyResolver>
     <FeatureLazyCOWPages Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm')">true</FeatureLazyCOWPages>
-    <FeatureLegacyNetCFCrypto>true</FeatureLegacyNetCFCrypto>
     <FeatureLatin1>true</FeatureLatin1>
     <FeatureEncodingNls>true</FeatureEncodingNls>
     <FeatureAscii>true</FeatureAscii>
@@ -113,15 +106,6 @@
     <FeatureCominteropWinRTManagedActivation>false</FeatureCominteropWinRTManagedActivation>
     <FeatureManagedEtw>false</FeatureManagedEtw>
 
-    <!-- Features implemented by fxcore -->
-    <FeatureLegacySurface>false</FeatureLegacySurface>
-    <FeatureCrypto>false</FeatureCrypto>
-    <FeatureLegacyNetCFCrypto>false</FeatureLegacyNetCFCrypto>
-    <FeatureX509>false</FeatureX509>
-    <FeatureX509Securestrings>false</FeatureX509Securestrings>
-    <FeatureIsostore>false</FeatureIsostore>
-    <FeatureIsostoreLight>false</FeatureIsostoreLight>
-
     <FeatureCoreFxGlobalization>true</FeatureCoreFxGlobalization>
   </PropertyGroup>
 </Project>

src/ToolBox/dirs.proj

@@ -91,7 +91,6 @@
 
   <!--The following projects will build during PHASE 1 of the CoreSys build-->
   <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(BuildProjectName)' == 'CoreSys'">
-    <ProjectFile Include="mdbg\dirs.proj" />
     <ProjectFile Include="ibcmerge\ibcmerge_msbuild.csproj" />
   </ItemGroup>
 

src/coreclr/dirs.proj

@@ -13,7 +13,6 @@
     <ProjectFile Include="batchsetup\batchsetup.proj" />
     <ProjectFile Include="hosts\dirs.proj" />
     <ProjectFile Include="snskipverf\snskipverf.nativeproj" />
-    <ProjectFile Include="sandboxhelper\dirs.proj" />
     <ProjectFile Include="release\release.proj" />
     <ProjectFile Include="uwp\dirs.proj" />
   </ItemGroup>