Delete FEATURE_READYTORUN define for CoreLib build (#10840)

This define does not have much value for the CoreLib build, and it was missing on arm64.
Also deleted dead props and targets files left over from the legacy build

6 files changed, 0 insertions, 518 deletions

diff --git a/clr.coreclr.props b/clr.coreclr.props
index c72428699b..53c66e2675 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -37,7 +37,6 @@
     <FeatureUseAsmGCWriteBarriers>true</FeatureUseAsmGCWriteBarriers>
     <!-- Setting this to "false" works only for workstation GC, not server. -->
     <FeatureSymDiff>true</FeatureSymDiff>
-    <FeatureReadyToRun Condition="'$(TargetArch)'!='arm64'">true</FeatureReadyToRun>
     <FeatureClassicCominterop>true</FeatureClassicCominterop>
     <FeatureCominterop>true</FeatureCominterop>
     <FeatureICastable>true</FeatureICastable>
diff --git a/clr.defines.targets b/clr.defines.targets
index 8958c304bd..6edd968968 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -1,78 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <CDefines Condition="'$(ClrBuildLeanAndMean)' == 'true'">$(CDefines);WIN32_LEAN_AND_MEAN=1</CDefines>
-        <CDefines Condition="'$(DebuggingSupported)' == 'true'">$(CDefines);DEBUGGING_SUPPORTED</CDefines>
-        <CDefines Condition="'$(EnCSupported)' == 'true'">$(CDefines);EnC_SUPPORTED</CDefines>
-        <CDefines Condition="'$(EnableDownlevelForNls)' == 'true'">$(CDefines);ENABLE_DOWNLEVEL_FOR_NLS</CDefines>
-        <CDefines Condition="'$(FeatureAppX)' == 'true'">$(CDefines);FEATURE_APPX</CDefines>
-        <CDefines Condition="'$(FeatureArrayStubAsIL)' == 'true'">$(CDefines);FEATURE_ARRAYSTUB_AS_IL</CDefines>
-        <CDefines Condition="'$(FeatureStubsAsIL)' == 'true'">$(CDefines);FEATURE_STUBS_AS_IL</CDefines>
-        <CDefines Condition="'$(FeatureClassicCominterop)' == 'true'">$(CDefines);FEATURE_CLASSIC_COMINTEROP</CDefines>
-        <CDefines Condition="'$(FeatureCollectibleTypes)' == 'true'">$(CDefines);FEATURE_COLLECTIBLE_TYPES</CDefines>
-        <CDefines Condition="'$(FeatureCominterop)' == 'true'">$(CDefines);FEATURE_COMINTEROP</CDefines>
-        <CDefines Condition="'$(FeatureICastable)' == 'true'">$(CDefines);FEATURE_ICASTABLE</CDefines>
-        <CDefines Condition="'$(FeatureCominteropApartmentSupport)' == 'true'">$(CDefines);FEATURE_COMINTEROP_APARTMENT_SUPPORT</CDefines>
-        <CDefines Condition="'$(FeatureCominteropUnmanagedActivation)' == 'true'">$(CDefines);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION</CDefines>
-        <CDefines Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'">$(CDefines);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION</CDefines>  <!-- Enables code required to activate managed winrt from native-->
-        <CDefines Condition="'$(FeatureCoreFxGlobalization)' == 'true'">$(CDefines);FEATURE_COREFX_GLOBALIZATION</CDefines>
-        <CDefines Condition="'$(FeatureDbgipcTransportDI)' == 'true'">$(CDefines);FEATURE_DBGIPC_TRANSPORT_DI</CDefines>
-        <CDefines Condition="'$(FeatureDbgipcTransportVM)' == 'true'">$(CDefines);FEATURE_DBGIPC_TRANSPORT_VM</CDefines>
-        <CDefines Condition="'$(FeatureDbgPublish)' == 'true'">$(CDefines);FEATURE_DBG_PUBLISH</CDefines>
-        <CDefines Condition="'$(FeatureEventTrace)' == 'true'">$(CDefines);FEATURE_EVENT_TRACE</CDefines>
-        <CDefines Condition="'$(FeatureXplatEventSource)' == 'true'">$(CDefines);FEATURE_EVENTSOURCE_XPLAT</CDefines>
-        <CDefines Condition="'$(FeatureTieredCompilation)' == 'true'">$(CDefines);FEATURE_TIERED_COMPILATION</CDefines>
-        <CDefines Condition="'$(FeatureFullNGen)' == 'true'">$(CDefines);FEATURE_FULL_NGEN</CDefines>
-        <CDefines Condition="'$(FeatureHijack)' == 'true'">$(CDefines);FEATURE_HIJACK</CDefines>
-        <CDefines Condition="'$(FeatureInteropDebugging)' == 'true'">$(CDefines);FEATURE_INTEROP_DEBUGGING</CDefines>
-        <CDefines Condition="'$(FeatureIpcman)' == 'true'">$(CDefines);FEATURE_IPCMAN</CDefines>
-        <CDefines Condition="'$(FeatureIsolatedStorageQuotaEnforcement)' == 'true'">$(CDefines);FEATURE_ISOLATED_STORAGE_QUOTA_ENFORCEMENT</CDefines>
-        <CDefines Condition="'$(FeatureIsymReader)' == 'true'">$(CDefines);FEATURE_ISYM_READER</CDefines>
-        <CDefines Condition="'$(FeatureLazyCOWPages)' == 'true'">$(CDefines);FEATURE_LAZY_COW_PAGES</CDefines>
-        <CDefines Condition="'$(FeatureLegacyNetCFDbgHostControl)' == 'true'">$(CDefines);FEATURE_LEGACYNETCF_DBG_HOST_CONTROL</CDefines> 
-        <CDefines Condition="'$(FeatureMacl)' == 'true'">$(CDefines);FEATURE_MACL</CDefines>
-        <CDefines Condition="'$(FeatureManagedEtw)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW</CDefines>
-        <CDefines Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW_CHANNELS</CDefines>
-        <CDefines Condition="'$(FeatureMdaSupported)' == 'true'">$(CDefines);MDA_SUPPORTED</CDefines>
-        <CDefines Condition="'$(FeatureMergeJitAndEngine)' == 'true'">$(CDefines);FEATURE_MERGE_JIT_AND_ENGINE</CDefines>
-        <CDefines Condition="'$(FeatureMetadataEmit)' == 'true'">$(CDefines);FEATURE_METADATA_EMIT</CDefines>
-        <CDefines Condition="'$(FeatureMetadataEmitAll)' == 'true'">$(CDefines);FEATURE_METADATA_EMIT_ALL</CDefines>
-        <CDefines Condition="'$(FeatureMetadataEmitInDebugger)' == 'true'">$(CDefines);FEATURE_METADATA_EMIT_IN_DEBUGGER</CDefines>
-        <CDefines Condition="'$(FeatureMetadataInternalAPIs)' == 'true'">$(CDefines);FEATURE_METADATA_INTERNAL_APIS</CDefines>
-        <CDefines Condition="'$(FeatureMetadataInVM)' == 'true'">$(CDefines);FEATURE_METADATA_IN_VM</CDefines>
-        <CDefines Condition="'$(FeatureMetadataValidator)' == 'true'">$(CDefines);FEATURE_METADATA_VALIDATOR</CDefines>
-        <CDefines Condition="'$(FeatureMetadataCustomDataSource)' == 'true'">$(CDefines);FEATURE_METADATA_CUSTOM_DATA_SOURCE</CDefines>
-        <CDefines Condition="'$(FeatureMetadataDebuggeeDataSource)' == 'true'">$(CDefines);FEATURE_METADATA_DEBUGGEE_DATA_SOURCE</CDefines>
-        <CDefines Condition="'$(FeatureMetadataVerifyLayouts)' == 'true'">$(CDefines);FEATURE_METADATA_VERIFY_LAYOUTS</CDefines>
-        <CDefines Condition="'$(FeatureNativeImageGeneration)' == 'true'">$(CDefines);FEATURE_NATIVE_IMAGE_GENERATION</CDefines>
-        <CDefines Condition="'$(FeatureNongenericCollections)' == 'true'">$(CDefines);FEATURE_NONGENERIC_COLLECTIONS</CDefines>
-        <CDefines Condition="'$(FeaturePal)' == 'true'">$(CDefines);FEATURE_PAL</CDefines>
-        <CDefines Condition="'$(FeaturePrejit)' == 'true'">$(CDefines);FEATURE_PREJIT</CDefines>
-        <CDefines Condition="'$(FeatureRandomizedStringHashing)' == 'true'">$(CDefines);FEATURE_RANDOMIZED_STRING_HASHING</CDefines>
-        <CDefines Condition="'$(FeatureReJIT)' == 'true'">$(CDefines);FEATURE_REJIT</CDefines>
-        <CDefines Condition="'$(FeatureSortTables)' == 'true'">$(CDefines);FEATURE_SORT_TABLES</CDefines>
-        <CDefines Condition="'$(FeatureStackProbe)' == 'true'">$(CDefines);FEATURE_STACK_PROBE</CDefines>
-        <CDefines Condition="'$(FeatureStandaloneSn)' == 'true'">$(CDefines);FEATURE_STANDALONE_SN</CDefines>
-        <CDefines Condition="'$(FeatureStrongnameDelaySigningAllowed)' == 'true'">$(CDefines);FEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED</CDefines>
-        <CDefines Condition="'$(FeatureSvrGc)' == 'true'">$(CDefines);FEATURE_SVR_GC</CDefines>
-        <CDefines Condition="'$(FeaturePerfMap)' == 'true'">$(CDefines);FEATURE_PERFMAP</CDefines>
-        <CDefines Condition="'$(FeatureTypeEquivalence)' == 'true'">$(CDefines);FEATURE_TYPEEQUIVALENCE</CDefines>
-        <CDefines Condition="'$(FeatureUseLcid)' == 'true'">$(CDefines);FEATURE_USE_LCID</CDefines>
-        <CDefines Condition="'$(FeatureUtilcodeNoDependencies)' == 'true'">$(CDefines);FEATURE_UTILCODE_NO_DEPENDENCIES</CDefines>
-        <CDefines Condition="'$(FeatureValidator)' == 'true'">$(CDefines);FEATURE_VALIDATOR</CDefines>
-        <CDefines Condition="'$(FeatureVersioningLog)' == 'true'">$(CDefines);FEATURE_VERSIONING_LOG</CDefines>
-        <CDefines Condition="'$(FeatureWatson)' == 'true'">$(CDefines);FEATURE_WATSON</CDefines>
-        <CDefines Condition="'$(FeatureWin32Registry)' == 'true'">$(CDefines);FEATURE_WIN32_REGISTRY</CDefines>
-        <CDefines Condition="'$(FeatureWinMDResilient)' == 'true'">$(CDefines);FEATURE_WINMD_RESILIENT</CDefines>
-        <CDefines Condition="'$(ProfilingSupportedBuild)' == 'true'">$(CDefines);PROFILING_SUPPORTED</CDefines>
-        <CDefines Condition="'$(UefChainingSupported)' == 'true'">$(CDefines);UEF_CHAINING_SUPPORTED</CDefines>
-        <CDefines Condition="'$(UseStl)' == 'true'">$(CDefines);USE_STL</CDefines>
-        <CDefines Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(CDefines);FEATURE_USE_ASM_GC_WRITE_BARRIERS</CDefines>
-        <CDefines Condition="'$(BinderDebugLog)' == 'true'">$(CDefines);BINDER_DEBUG_LOG</CDefines>
-        <CDefines Condition="'$(FeatureSymDiff)' == 'true'">$(CDefines);FEATURE_SYMDIFF</CDefines>
-        <CDefines Condition="'$(FeatureImplicitTls)' == 'true'">$(CDefines);FEATURE_IMPLICIT_TLS</CDefines>
-        <CDefines Condition="'$(FeatureReadyToRun)' == 'true'">$(CDefines);FEATURE_READYTORUN</CDefines>
-        <CDefines Condition="'$(FeatureReadyToRunCompiler)' == 'true'">$(CDefines);FEATURE_READYTORUN_COMPILER</CDefines>
-
         <DefineConstants Condition="'$(BuildTypeRet)' == 'true'">$(DefineConstants);BUILDTYPE_RET</DefineConstants>
         <DefineConstants Condition="'$(FeatureAppX)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants>
         <DefineConstants Condition="'$(FeatureArrayStubAsIL)' == 'true'">$(DefineConstants);FEATURE_ARRAYSTUB_AS_IL</DefineConstants>
@@ -107,7 +34,6 @@
         <DefineConstants Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(DefineConstants);FEATURE_USE_ASM_GC_WRITE_BARRIERS</DefineConstants>
         <DefineConstants Condition="'$(BinderDebugLog)' == 'true'">$(DefineConstants);BINDER_DEBUG_LOG</DefineConstants>
         <DefineConstants Condition="'$(FeatureSymDiff)' == 'true'">$(DefineConstants);FEATURE_SYMDIFF</DefineConstants>
-        <DefineConstants Condition="'$(FeatureReadyToRun)' == 'true'">$(DefineConstants);FEATURE_READYTORUN</DefineConstants>
 
         <DefineConstants Condition="'$(TargetsUnix)' == 'true'">$(DefineConstants);PLATFORM_UNIX</DefineConstants>
     </PropertyGroup>
diff --git a/clr.native.targets b/clr.native.targets
deleted file mode 100644
index cd2a52218f..0000000000
--- a/clr.native.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ItemGroup>
-          <Clean Include="@(PreprocessAssembleArm->'$(IntermediateOutputPath)%(Filename).obj')"/>
-    </ItemGroup>
-    
-    <Target Name="PreprocessAssembleArm"
-            BeforeTargets="CppPreprocess"
-            Condition="@(PreprocessAssembleArm) != ''"
-            Inputs="@(PreprocessAssembleArm)"
-            Outputs="@(PreprocessAssembleArm->'$(IntermediateOutputPath)%(Filename).obj')">
-        <CL Condition="'%(PreprocessAssembleArm.Identity)' != ''" 
-            AdditionalIncludeDirectories="$(UserIncludes);$(SdkIncPath);%(PreprocessAssembleArm.Includes)"
-            AdditionalOptions="%(PreprocessAssembleArm.AdditionalOptions)"
-            ForcedIncludeFiles="%(PreprocessAssembleArm.ForceInclude)"
-            MinimalRebuildFromTracking="$(Internal_MinimalRebuildFromTracking)" 
-            PreprocessorDefinitions="%(PreprocessAssembleArm.Defines);@(CommonPreprocessDefines);$(ClDefines)"
-            PreprocessOutputPath ="$(IntermediateOutputPath)"
-            PreprocessSuppressLineNumbers="true"
-            PreprocessToFile="true"
-            Sources="@(PreprocessAssembleArm)"
-            TLogReadFiles="@(ClTLogReadFile)" 
-            TLogWriteFiles="@(ClTLogWriteFile)" 
-            ToolExe="$(ClToolExe)" 
-            ToolPath="$(ClToolPath)"
-            TrackerLogDirectory="$(IntermediateOutputDirectory)"
-            TrackFileAccess="$(TrackFileAccess)" 
-            >
-        </CL>
-    </Target>
-
-</Project>
diff --git a/clr.props b/clr.props
deleted file mode 100644
index 856bebfc81..0000000000
--- a/clr.props
+++ /dev/null
@@ -1,315 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--*****************************************************-->
-  <!--This MSBuild project file was automatically generated-->
-  <!--from the original SOURCES/DIRS file by the KBC tool.-->
-  <!--*****************************************************-->
-  <!--Import the settings-->
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\InternalAPIs\NDP_Common\inc\Microsoft.Ndp.Settings.targets" />
-
-  <!--Leaf project Properties-->
-  <PropertyGroup>
-    <Clrbase>$(_NTDRIVE)$(_NTROOT)\ndp\clr</Clrbase>
-    <ClrSrcDirectory>$(Clrbase)\src\</ClrSrcDirectory>
-
-    <ClrLibDest Condition="('$(BuildProjectName)' == '')">$(IntraPartitionAPIsPath)\$(LibSubPath)</ClrLibDest>
-    <ClrLibDest Condition="('$(BuildProjectName)' == 'CoreCLR' or '$(BuildProjectName)' == 'CoreSys')">$(IntraPartitionAPIsPath)\CORElib\$(InterApiType)\$(RealBuildArchitecture)</ClrLibDest>
-    <ClrLibPath>$(ClrLibDest)</ClrLibPath>
-    
-    <!-- Use IntermediateOutputDirectory as our Output, and also set BinplaceRoot to the BinariesDirectory.
-         This prevents us publishing a bunch of files we don't really need into the BinariesDirectory,
-         such as extra PDBs, .mt files, etc.  See clr.targets for the managed story which works differently.
-    -->
-    <BinariesDirectory Condition="'$(BinariesSubDirectory)' != ''">$(BinariesDirectory)\$(BinariesSubDirectory)</BinariesDirectory>
-    <OutputPath>$(IntermediateOutputDirectory)\</OutputPath>
-    <BinplaceRoot>$(BinariesDirectory)</BinplaceRoot>
-    <BinplaceSymbols>true</BinplaceSymbols>
-    <OutputLibPath>$(ClrLibPath)</OutputLibPath> 
-    <UsePdbToCompile>true</UsePdbToCompile>
-    <UseIncrementalCompiling>true</UseIncrementalCompiling>
-    <RootOutputPath>$(BinariesDirectory)</RootOutputPath>
-
-    <!-- Tags to detect illegal usage -->
-    <ObjectDirectory>**##ILLEGAL_ ObjectDirectory##**</ObjectDirectory>
-    <ObjectDirectoryPhase0>**##ILLEGAL_ ObjectDirectory0##**</ObjectDirectoryPhase0>
-    <ObjectDirectoryPhase1>**##ILLEGAL_ ObjectDirectory1##**</ObjectDirectoryPhase1>
-    <ObjectDirectoryPhase2>**##ILLEGAL_ ObjectDirectory2##**</ObjectDirectoryPhase2>
-
-
-    <!-- Enable this when we're ready to handle P2P -->
-    <BuildProjectReferences>true</BuildProjectReferences>
-
-    <!-- Use the CLR warning suppression instead of the devdiv one-->
-    <ClEnforceStandardScoping>true</ClEnforceStandardScoping>
-    <ForcedIncludeFiles>WarningControl.h</ForcedIncludeFiles>
-    
-    <ClForcedIncludeFiles>$(ForcedIncludeFiles)</ClForcedIncludeFiles>
-    <Fullcxxeh>Async</Fullcxxeh>
-    <Synccxxeh>Sync</Synccxxeh>
-    <Sehonly>Disabled</Sehonly>
-    <ClNativeExceptionHandling>$(Fullcxxeh)</ClNativeExceptionHandling>
-    <ClExternCNeverThrowsException>false</ClExternCNeverThrowsException>
-
-    <!-- Use iso volatile semantics for better performance -->
-    <ClIsoVolatile>true</ClIsoVolatile>
-
-    <!-- Originally, src\tools\I386mk.inc turned FPO off by default because it makes ETW stack crawling bad.  -->
-    <Fpo>0</Fpo>
-
-    <!-- Ensure that we're not setting /DNT_UP=1 which disables multiprocessor builds -->
-    <NtUp Condition="'$(NtUp)' == ''">0</NtUp>
-
-    <ClrBuildError>*** CLR Build Error:</ClrBuildError>
-    <ClrBuildTrace>*** CLR Trace:</ClrBuildTrace>
-
-    <ClAdditionalOptions Condition="'$(NoClMpFlag)'!='true'">$(ClAdditionalOptions) /MP</ClAdditionalOptions>
-    <ClAdditionalOptions>$(ClAdditionalOptions) /GS /d2Zi+</ClAdditionalOptions>
-    <ClBufferSecurityCheck>true</ClBufferSecurityCheck>
-    
-         
-    <!-- In Dbg and Chk builds, set /homeparams on x64 -->
-    <ClAdditionalOptions Condition="'$(BuildArchitecture)' == 'amd64' and ('$(BuildType)' == 'Checked' or '$(BuildType)' == 'Debug')">$(ClAdditionalOptions) /homeparams</ClAdditionalOptions>
-    
-    <!-- Warning Try not use _BuildArch if is not specific to build system. Cross-compilation requires to make distiction between build arhitecture
-        and target arhitecture.
-        Use _BuildArch only when you need to trigger, use the tools of some arhitecture.
-        Use TargetArch for anything else: feature selection, files selection, etc.
-    -->
-    <_BuildArch>$(_BUILDARCH)</_BuildArch>
-
-    <TargetArch Condition="'$(TargetArch)' == '' and '$(CrossTargetArchitecture)'!=''">$(CrossTargetArchitecture)</TargetArch>
-    <TargetArch Condition="'$(TargetArch)' == ''">$(BuildArchitecture)</TargetArch>
-
-    <TargetArch Condition="'$(TargetArch)'=='AMD64'">amd64</TargetArch>
-    
-    <!-- Enable X86-ARM cross-plat defines --> 
-    <CDefines Condition="'$(TargetArch)' == 'i386'">$(CDefines);_TARGET_X86_=1;</CDefines>
-    <CDefines Condition="'$(TargetArch)' == 'amd64'">$(CDefines);_TARGET_AMD64_=1;</CDefines>
-    <CDefines Condition="'$(TargetArch)' == 'arm'">$(CDefines);_TARGET_ARM_=1;</CDefines>
-    <CDefines Condition="'$(TargetArch)' == 'arm64'">$(CDefines);_TARGET_ARM64_=1;</CDefines>
-
-    <AsmSuffix Condition="'$(BuildArchitecture)' == 'i386' or '$(BuildArchitecture)' == 'amd64'">asm</AsmSuffix>
-
-    <CDefines Condition="'$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm64'">$(CDefines);BIT64</CDefines>
-
-    <!-- Note: ClrProduct can be set prior to this file to 'Standalone'. -->
-    <ClrProduct Condition="(('$(BuildProjectName)' == 'CoreCLR' or '$(BuildProjectName)' == 'CoreSys')) and ('$(ClrProduct)' == '' or '$(CoreTarget)' == 'true')">core_clr</ClrProduct>
-
-    <ClAdditionalOptions>$(ClAdditionalOptions) /Zm200</ClAdditionalOptions>
-    <TargetDefines Condition="'$(BuildArchitecture)'=='i386'">$(BuildArchitecture);_X86_</TargetDefines>
-    <TargetDefines Condition="'$(BuildArchitecture)'=='amd64'">$(BuildArchitecture);_AMD64_</TargetDefines>
-    <TargetDefines Condition="'$(BuildArchitecture)'=='arm'">$(BuildArchitecture);_ARM_</TargetDefines>
-    <TargetDefines Condition="'$(BuildArchitecture)'=='arm64'">$(BuildArchitecture);_ARM64_</TargetDefines>
-
-    <TargetCpu Condition="('$(TargetArch)' == 'i386')">i386</TargetCpu>
-    <TargetCpu Condition="('$(TargetArch)' == 'amd64')">amd64</TargetCpu>
-    <TargetCpu Condition="('$(TargetArch)' == 'arm')">arm</TargetCpu>
-    <TargetCpu Condition="('$(TargetArch)' == 'arm64')">arm64</TargetCpu>
-    
-    <GeneratePlacefileFromFilelist>true</GeneratePlacefileFromFilelist>
-    
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(DoPrefastBuild)' == 'true'">
-    <PrefastClToolPath>$(ToolsPath)\$(ToolsArchitecture)\prefast\scripts</PrefastClToolPath>
-    <PrefastClToolExe>prefast.exe $(ClToolPath)\$(ClToolExe)</PrefastClToolExe>
-  </PropertyGroup>
-
-
-  <!-- CLR Feature Settings.  We set the default values here, allow leaf projects to override, and then
-       set the CDefines based on these properties in clr.targets
-  -->
-  <Import Project="$(MSBuildThisFileDirectory)clr.coreclr.props" />
-
-  <PropertyGroup Condition="'$(CrossGenCompile)'=='true'">
-    <!-- Override settings of certain features to disable them for crossgen unconditionally -->
-    <!-- If you add new features to this list make sure that they are not affecting codegen or content of datastructures persisted in NGen image -->
-    <EnCSupported>false</EnCSupported>
-    <PerfcountersSupportedBuild>false</PerfcountersSupportedBuild>
-    <FeatureEventTrace>false</FeatureEventTrace>
-    <FeatureFusion>false</FeatureFusion>
-    <FeatureMdaSupported>false</FeatureMdaSupported>
-    <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
-    <FeatureRandomizedStringHashing>false</FeatureRandomizedStringHashing>
-    <FeatureStackProbe>false</FeatureStackProbe>
-    <FeatureReJIT>false</FeatureReJIT>
-    <FeatureVersioningLog>false</FeatureVersioningLog>
-    <FeatureNativeImageGeneration>true</FeatureNativeImageGeneration>
-    <FeatureReadyToRunCompiler Condition="'$(FeatureReadyToRun)' == 'true'">true</FeatureReadyToRunCompiler>
-    <!-- Link crossgen with static CRT to make it standalone .exe -->
-    <LinkUseCMT>true</LinkUseCMT>
-    <UseMsvcrt>false</UseMsvcrt>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(ClrProduct)'=='Standalone'">
-    <!--
-        No features enabled by design - turn them on in your project file either:
-          - before including this file, or 
-          - after via <ClAdditionalOptions>$(ClAdditionalOptions) -DFEATURE_YourFeatureName</ClAdditionalOptions>.
-        Created primarily for standalone MetaData DLLs for WinRT - file:src\DLLs\StandaloneMD-RO and file:src\DLLs\StandaloneMD-RW
-        
-        By default uses statically linked CRT:
-            <UseMsvcrt>false</UseMsvcrt>
-            <LinkUseCMT>true</LinkUseCMT>
-    -->
-  </PropertyGroup>
- 
-  <PropertyGroup>
-    <DebugBuild Condition="'$(NTDEBUG)' == '' or '$(NTDEBUG)'=='ntsdnodbg'">false</DebugBuild>
-    <DebugBuild Condition="'$(NTDEBUG)' != '' and '$(NTDEBUG)'!='ntsdnodbg'">true</DebugBuild>
-  </PropertyGroup>
-  
-  <Choose>
-    <When Condition="$(DebugBuild)">
-      <PropertyGroup>
-        <CDefines>$(CDefines);NTMAKEENV;_DEBUG</CDefines>
-        <DebugCrts>true</DebugCrts>
-      </PropertyGroup>
-      
-      <PropertyGroup Condition="'$(_BUILDOPT)' == 'no opt'">
-        <Optimize>false</Optimize> 
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <CDefines>$(CDefines);NTMAKEENV;NDEBUG;PERF_TRACKING</CDefines> 
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <PropertyGroup>
-    <!--  "/Oi"  --> 
-    <ClIntrinsicFunctions>true</ClIntrinsicFunctions> 
-
-    <!-- "Disabled"=="/Od" "MinSpace"=="/O1" "MaxSpeed"=="/O2"  --> 
-    <ClOptimization Condition="'$(_BUILDOPT)' == 'full opt'">MinSpace</ClOptimization>
-    <ClOptimization Condition="'$(_BUILDOPT)' != 'full opt'">Disabled</ClOptimization>
-
-    <!-- Size == "/Os"  Speed == "/Ot" Disabled == "" --> 
-    <ClFavorSizeOrSpeed>Disabled</ClFavorSizeOrSpeed>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <CDefines>$(CDefines);_BLD_CLR</CDefines> 
-
-    <ClAdditionalOptions>$(ExceptionHandling) $(ClAdditionalOptions) /we4640</ClAdditionalOptions> 
-
-    <!-- Desktop CLR, starting with version 4.5, supports Win2k8 R1 and higher on server, and Win7 and higher on client.
-         So across server & client, 0x0600 is the default minimum required WINVER -->
-    <Win32WinNt>0x0600</Win32WinNt>
-
-    <!-- CoreSys supports Win8 and higher -->
-    <Win32WinNt Condition="'$(BuildForCoreSystem)' == 'true' and '$(CrossTargetArchitecture)' == ''">0x0602</Win32WinNt>
-
-    <!-- When building cross-target binaries, they must be able to run on pre-Win8 OS and thus, should have subsystem version 6.00. so, override the Subsystem setting
-         specified in tools\Microsoft.DevDiv.targets.
-    -->
-    <SubsystemVersion Condition="'$(BuildForCoreSystem)' == 'true' and '$(AllowCrossTargeting)' == 'true'">6.00</SubsystemVersion>
-    
-    <!-- Some special projects under CLR, like clr\src\DLLS\culture\mscorwks\culture.nativeproj and
-         clr\src\DLLS\normalization\mscorwks\normalization.nativeproj need to be compiled with 
-         a special WINVER, so respect their requests -->
-    <Win32WinNt Condition="'$(ClrOverriddenWin32WinNt)' != ''">$(ClrOverriddenWin32WinNt)</Win32WinNt>
-    
-    <!-- Now make sure WINVER matches Win32WinNt -->
-    <CDefines Condition="'$(Win32WinNt)' != ''">$(CDefines);WINVER=$(Win32WinNt)</CDefines>
-
-
-    <LinkLibIgnore Condition="'$(TargetArch)' == 'i386'">4013</LinkLibIgnore> 
-    <ClrBuildLeanAndMean>true</ClrBuildLeanAndMean>
-    <LinkLibIgnore Condition="!('$(TargetArch)' == 'i386')">4197,4013</LinkLibIgnore>  
-    <LinkLibIgnore>$(LinkLibIgnore);4254</LinkLibIgnore>
-    <UseVsVersion Condition="'$(UseVsVersion)' == ''">false</UseVsVersion>
-    <LibWarnAsError>true</LibWarnAsError>
-
-    <CoreSystemSdkPath Condition="'$(TargetArch)' != 'arm64'">$(ExternalAPIsPath)\Win8CoreSystem</CoreSystemSdkPath>
-    <CoreSystemSdkPath Condition="'$(TargetArch)' == 'arm64'">$(ExternalAPIsPath)\Win9CoreSystem</CoreSystemSdkPath>
-    
-    <UserIncludes>$(Clrbase)\src\inc; $(Clrbase)\src\strongname\inc; $(IntraPartitionAPIsPath)\inc; $(UserIncludes); $(ClrIncPath)</UserIncludes> 
-    <UserIncludes Condition="'$(BuildForCoreSystem)' != 'true' or  '$(CrossTargetArchitecture)' != ''">$(UserIncludes); $(VCToolsIncPath); $(VCPublicIncPath);</UserIncludes>
-    <UserIncludes Condition="'$(BuildForCoreSystem)' == 'true' and '$(CrossTargetArchitecture)' == ''">$(UserIncludes); $(CoreSystemSdkPath)\inc; $(CoreSystemSdkPath)\inc\crt;</UserIncludes>
-    <UserIncludes Condition="'$(UseVsVersion)' == 'false'">$(UserIncludes); $(NdpRootIncPath); $(NDP_CommonIncPath)</UserIncludes>
-    <UserIncludes Condition="'$(FeatureCominterop)' == 'true'">$(Clrbase)\src\inc\WinRT; $(UserIncludes)</UserIncludes>
-
-    <PogoInstrument>false</PogoInstrument> 
-    <PogoOptimize>false</PogoOptimize> 
-    <PogoUpdate>false</PogoUpdate> 
-    <PogoExePhase>1</PogoExePhase>
-    
-    <ResgenDefines Condition="'$(FeatureMacl)' == '1'">$(ResgenDefines) /define:FEATURE_MACL</ResgenDefines> 
-    <ResgenDefines Condition="'$(FeatureDisplayCultureInfo)' == '1'">$(ResgenDefines) /define:FEATURE_DISPLAY_CULTURE_INFO</ResgenDefines> 
-    <ResgenDefines Condition="'$(FeatureDisplayRegionInfo)' == '1'">$(ResgenDefines) /define:FEATURE_DISPLAY_REGION_INFO</ResgenDefines> 
-
-    <RootOutputPath>$(BinariesDirectory)</RootOutputPath>
-
-
-    <!-- Explicitly disable UninitializedVariableCheck and StackFrameCheck since the DevDiv targets sets them as default on and it
-    breaks the build when optimizations are enabled
-    -->
-    <NoRtc>true</NoRtc>
-    <NoBuildTypeDefines>true</NoBuildTypeDefines>
-
-    <!-- 
-        The DevDiv targets define these to stuff we don't use if they're left blank and there's no easy way to keep them off 
-        of the CL.exe command line.   
-    -->
-    <OakIncPath >.</OakIncPath>
-    <ConfigIncPath >.</ConfigIncPath>
-    <VSCommonIncPath >.</VSCommonIncPath>
-    
-    <!-- Devdiv targets have a slightly different semantics for debug defines like DBG.  Defined as 
-         BuildType == Debug || BuildType == Checked && DebugBuild == True.  In CLR, Checked has DBG
-         defined so we override to preserve ntbuild behaviour
-    -->
-    <CDefines Condition="'$(BuildType)' == 'Checked' or '$(BuildType)' == 'Debug'">$(CDefines);DBG=1</CDefines>
-
-    <!-- Note: This defines only name of the lib 'ClrCrtLib'. Project has to use it explicitly like this: <LibCLib>$(ClrCrtLib)</LibCLib> -->
-    <ClrCrtLib Condition="'$(BuildForCoreSystem)' != 'true'">$(CrtLibPath)\msvcrt$(BuildSuffix)_clr.lib</ClrCrtLib>
-
-    <RefAsmOutputDirectory>$(BinariesDirectory)\ref\</RefAsmOutputDirectory>
-
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(BuildForCoreSystem)' == 'true' and ('$(HostMachineOS)'=='' or '$(HostMachineOS)' == 'OneCore' or '$(HostMachineOS)'=='OneCoreWin7Compat')">
-    <!--
-        For the most part we build against CoreSystem in the same way as we do against full Windows. But
-        linking is very different. There are a different set of import libraries (in sdk\lib\CoreSystem) and
-        we pick up the system CRT (from sdk rather than vc).
-
-        There are 3 different variations of linking we might use:
-        CoreSystem forwarder libraries - This links against mincore_fw.lib, which causes the binaries to reference
-           a bunch of small forwarder dlls at runtime. These forwarders redirect CoreSystem api-set imports back
-           to standard win32 API exports. Binaries linked this way can run on any CoreSystem OS + Win7, however
-           all the forwarder dlls must be present on the LoadLibrary search path.
-        CoreSystem stand alone libraries - This links against mincore.lib (and maybe others like mincore_legacy.lib).
-           These binaries can run on OneCore OS or Win8+ and don't have any dependency on forwarders.
-        Win32 APIs - This links against the traditional win32 libraries such as kernel32 and the VC CRT. These
-           binaries run on Win7+ but don't work on pure OneCore SKUs. 
-
-        Most of the binaries we build in the CoreSystem build get linked using the forwarder libraries. To do
-        that we need to set $(BuildForCoreSystem)=true and $(BuildForWindows7)=true. All the binaries in this
-        group have never set the $(HostMachineOS) property. On ARM we don't support win7, so in that case we
-        use the stand alone library linkage, $(BuildForWindows7)=false.
-        
-        Some of the binaries we build are cross compiled, such as some debugging related binaries. In this scenario
-        we are debugging a CoreSystem coreclr, but the debugger may be running on a different machine. Because
-        these libraries can be loaded via LoadLibrary and won't have forwarder libraries available, we use some of
-        the alternate linkages. All binaries in this set have set the $(HostMachineOS) to something...
-        $(HostMachineOS)=='windows' => we want Win32 API and won't enter this conditional
-        $(HostMachineOS)=='OneCore' => we want the stand alone libraries
-        $(HostMachineOS)=='OneCoreWin7Compat' => we want the forwarders
-    -->
-    <BuildForWindows7 Condition="'$(BuildForWindows7)'==''">true</BuildForWindows7>
-    <BuildForWindows7 Condition="'$(HostMachineOS)'=='OneCore'">false</BuildForWindows7>
-    <BuildForWindows7 Condition="'$(TargetArch)'=='arm' or '$(TargetArch)'=='arm64'">false</BuildForWindows7>
-
-    <SdkLibPath>$(CoreSystemSdkPath)\sdk\lib\mincore\$(BuildArchitecture)</SdkLibPath>
-    <SdkLibPath Condition="'$(BuildForWindows7)' == 'true'">$(ExternalAPIsPath)\Windows\Win7\$(BuildArchitecture)</SdkLibPath>
-
-    <CoreSystemCrt>$(SdkLibPath)\msvcrt.lib</CoreSystemCrt>
-    <CrtSecureDeprecate>true</CrtSecureDeprecate>
-    <LinkNoLibraries>true</LinkNoLibraries>
-    <LinkNoWin32Libraries>true</LinkNoWin32Libraries>
-    <NoWinXPSP3NXCompat>true</NoWinXPSP3NXCompat>
-  </PropertyGroup>
-</Project>
diff --git a/clr.targets b/clr.targets
deleted file mode 100644
index 5572178c4e..0000000000
--- a/clr.targets
+++ /dev/null
@@ -1,94 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <!-- Differences in the native vs managed devdiv targets mean that we want to output to
-         IntermediateOutputDirectory under native, since we can set BinplaceRoot and have
-         BinPlace do all the final copying of binaries and pdbs.  We output to BinariesDirectory
-         under managed, since BinplaceRoot doesn't exist in Microsoft.DevDiv.targets
-    -->
-    <PropertyGroup>
-      <OutputPath Condition="'$(ProjectLanguage)' != 'Native'">$(BinariesDirectory)\</OutputPath>
-      <OutputPath Condition="'$(LinkResourceOnlyDll)' == 'true' and '$(ResourceOnlyDllWithSymbols)' != 'true'">$(BinariesDirectory)\</OutputPath>
-    </PropertyGroup>
-    
-    <!-- Import the file that based on feature flags generates the defines -->
-    <Import Project="$(MSBuildThisFileDirectory)clr.defines.targets" />
-
-    <!--
-        Assembly Signing
-        
-        NTBuild uses a central file list to determine which assemblies get binplaced and signed.
-        Reuse this for our build so we correctly sign only that which needs signing and don't
-        blindly sign everything.
-    -->
-    <PropertyGroup>
-      <SignFile Condition="$(SignFile)==''">$(IntermediateOutputDirectory)\sign.txt</SignFile>
-    </PropertyGroup>
-    
-    <Target Name="GenerateSignFile"
-      Condition="'$(ProjectLanguage)' != 'Native'"
-      Inputs="@(FileList)"
-      Outputs="$(SignFile)"
-      BeforeTargets="CheckIfAssemblyNeedsSigning">
-      <Exec Command="$(DevDivToolsPath)\gensignfile.bat $(SignFile) @(FileList) $(BuildProjectName)" 
-            StandardOutputImportance="Normal"/>
-    </Target>
-       
-    <PropertyGroup>
-      <CheckIfAssemblyNeedsSigningDependsOn Condition="'$(ProjectLanguage)' == 'Native'">GenerateAssemblyAttributes</CheckIfAssemblyNeedsSigningDependsOn>
-      <CheckIfAssemblyNeedsSigningDependsOn Condition="'$(ProjectLanguage)' != 'Native'">Preprocess</CheckIfAssemblyNeedsSigningDependsOn>
-    </PropertyGroup>
-    <Target Name="CheckIfAssemblyNeedsSigning"
-            Condition="'$(ProjectLanguage)' != 'Native' and '$(AlwaysSign)' != 'true'"
-            AfterTargets="GenerateSignFile"
-            BeforeTargets="$(CheckIfAssemblyNeedsSigningDependsOn)">
-      <Exec Command="findstr /i /x /c:&quot;$(TargetFileName)&quot; $(SignFile) >nul 2>&amp;1" IgnoreExitCode="true">
-        <Output TaskParameter="ExitCode" PropertyName="ExitCode" />
-      </Exec>
-      
-      <PropertyGroup>
-        <SignAssemblyAttribute Condition="'$(ExitCode)' == '0'">true</SignAssemblyAttribute>
-        <SignAssemblyAttribute Condition="'$(ExitCode)' != '0'">false</SignAssemblyAttribute>
-      </PropertyGroup>
-      
-      <ItemGroup>
-        <Internal_ClDefines Condition="'$(ExitCode)' != '0'" Remove="SIGN_ASSEMBLY=1" />
-      </ItemGroup>
-      <Message Text="CheckIfAssemblyNeedsSigning  assembly: $(TargetFileName)  Exitcode: $(ExitCode)  SignAssemblyAttribute: $(SignAssemblyAttribute)" />
-    </Target>
-
-    <!-- Overriding a Target that's defined in Microsoft.DevDiv.Common.targets since it uses the wrong defines and includes for RC in CSC projects  -->
-    <Target Name="GenerateUnmanagedResources"
-        Condition="'@(RCResourceFile)' != '' and '$(CallRcFromCscProject)'=='true'"
-        DependsOnTargets="$(GenerateUnmanagedResourcesDependsOn)">
-        
-        <PropertyGroup>
-            <Internal_GURIncludes>$(ClrBase)\src\inc</Internal_GURIncludes>
-            <Internal_GURIncludes>$(Internal_GURIncludes);$(VCPublicIncPath)</Internal_GURIncludes> 
-            <Internal_GURIncludes>$(Internal_GURIncludes);$(EnlistmentRootPath)\ndp\inc\version</Internal_GURIncludes>
-            <Internal_GURIncludes>$(Internal_GURIncludes);$(EnlistmentRootPath)\InternalAPIs\NDP_Common\Inc</Internal_GURIncludes>
-            <Internal_GURIncludes>$(Internal_GURIncludes);$(SdkIncPath)</Internal_GURIncludes>
-        </PropertyGroup>
-          
-        <RC 
-            AdditionalIncludeDirectories="$(Internal_GURIncludes)"
-            Culture="409"
-            TrackerLogDirectory="$(IntermediateOutputDirectory)"
-            MinimalRebuildFromTracking="$(Internal_MinimalRebuildFromTracking)"
-            PreprocessorDefinitions="$(CDefines)"
-            ResourceOutputFileName="@(RCResourceFile->'$(IntermediateOutputPath)%(Filename).res')"
-            Source="%(RCResourceFile.Identity)"
-            ToolPath="$(RCToolPath)"
-            TrackFileAccess="$(TrackFileAccess)"
-            SuppressStartupBanner="$(RCSupressStartupBanner)"
-            />
-        <PropertyGroup>
-            <Win32Resource>@(RCResourceFile->'$(IntermediateOutputPath)%(Filename).res')</Win32Resource>
-        </PropertyGroup>
-    </Target>    
-
-
-    <Import Project="clr.native.targets" Condition="'$(ProjectLanguage)' == 'Native'" />
-    <Import Project="$(_NTDRIVE)$(_NTROOT)\InternalAPIs\NDP_Common\inc\Microsoft.Ndp.targets" />
-    <Import Project="clr.prefast.targets" Condition="'$(DoPrefastBuild)' == 'true'" />
-
-</Project>
diff --git a/src/mscorlib/src/System/Runtime/Versioning/NonVersionableAttribute.cs b/src/mscorlib/src/System/Runtime/Versioning/NonVersionableAttribute.cs
index 216a48a370..e4809953bc 100644
--- a/src/mscorlib/src/System/Runtime/Versioning/NonVersionableAttribute.cs
+++ b/src/mscorlib/src/System/Runtime/Versioning/NonVersionableAttribute.cs
@@ -25,9 +25,6 @@ using System.Diagnostics;
 
 namespace System.Runtime.Versioning
 {
-    // This Conditional is here to strip the annotations for targets where ReadyToRun is not supported.
-    // If this attribute is ever made public, this Conditional should be removed.
-    [Conditional("FEATURE_READYTORUN")]
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Constructor,
                     AllowMultiple = false, Inherited = false)]
     internal sealed class NonVersionableAttribute : Attribute