Cleanup CoreLib defines (dotnet#13713)

clr.coreclr.props

@@ -1,64 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(ClrProduct)'=='core_clr'">
-    <BuildTypeRet Condition="'$(_BuildType)'=='ret'">true</BuildTypeRet>
-    <DebuggingSupported>true</DebuggingSupported>
-    <DebuggingSupportedBuild>true</DebuggingSupportedBuild>
-    <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported>
-    <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls>
-    <FeatureCodeVersioning>true</FeatureCodeVersioning>
-    <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
-    <FeatureDbiDebugging>true</FeatureDbiDebugging>
-    <FeatureDbiOopDebugging_HostLocal>false</FeatureDbiOopDebugging_HostLocal>
-    <FeatureDbiOopDebugging_HostWindowsx86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostWindowsx86>
-    <FeatureDbiOopDebugging_HostWindowsamd64 Condition="'$(TargetArch)' == 'amd64' or '$(TargetArch)' == 'arm64'">true</FeatureDbiOopDebugging_HostWindowsamd64>
-    <FeatureDbiOopDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostOneCorex86>
-    <FeatureDbiOopDebugging_HostOneCoreamd64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureDbiOopDebugging_HostOneCoreamd64>
+  <PropertyGroup>
     <FeatureEventTrace>true</FeatureEventTrace>
-    <FeatureTieredCompilation>true</FeatureTieredCompilation>
-    <FeatureFrameworkInternal>true</FeatureFrameworkInternal>
-    <FeatureHijack>true</FeatureHijack>
-    <FeatureInteropDebugging Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureInteropDebugging>
-    <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>
-    <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine>
-    <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
-    <FeaturePrejit>true</FeaturePrejit>
-    <FeatureStandaloneSn>true</FeatureStandaloneSn>
-    <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
-    <FeatureStrongnameTestkeyAllowed>true</FeatureStrongnameTestkeyAllowed>
-    <FeatureSyntheticCultures>true</FeatureSyntheticCultures>
-    <FeatureVersioningLog>true</FeatureVersioningLog>
-    <FeatureWin32Registry>true</FeatureWin32Registry>
-    <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>
-    <FeatureXPlatDacDebugging_HostOneCoreAMD64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureXPlatDacDebugging_HostOneCoreAMD64>
-    <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
-    <FeatureUseAsmGCWriteBarriers>true</FeatureUseAsmGCWriteBarriers>
-    <!-- Setting this to "false" works only for workstation GC, not server. -->
-    <FeatureSymDiff>true</FeatureSymDiff>
-    <FeatureClassicCominterop>true</FeatureClassicCominterop>
-    <FeatureCominterop>true</FeatureCominterop>
     <FeatureICastable>true</FeatureICastable>
-    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
-    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
-    <FeatureLazyCOWPages Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm')">true</FeatureLazyCOWPages>
-    <FeatureLegacyNetCFDbgHostControl>true</FeatureLegacyNetCFDbgHostControl>
-    <!-- The rejit feature is available only on supported architectures (x86 & x64) -->
-    <FeatureReJIT Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureReJIT>
-    <FeatureManagedEtw>false</FeatureManagedEtw>
     <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels>
-    <BinderDebugLog Condition="'$(_BuildType)'=='dbg'">true</BinderDebugLog>
-    <FeatureAppX>true</FeatureAppX>
-    <FeatureWinMDResilient>true</FeatureWinMDResilient>
-    <!-- 
-        FeatureImplicitTls has been verified to be functionally correct on x86 & amd64.
-        However there is still work to make it on par in terms of performance. So currently only
-        enabling for arm64 
-     -->
-    <FeatureImplicitTls Condition="'$(TargetArch)' == 'arm64'">true</FeatureImplicitTls>
-    <FeatureSvrGc Condition="'$(TargetArch)' != 'arm'">true</FeatureSvrGc>
+
+    <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
@@ -69,15 +15,6 @@
     <FeatureMulticastStubAsIL>true</FeatureMulticastStubAsIL>
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 
-    <!-- Windows specific features -->
-    <FeatureWin32Registry>false</FeatureWin32Registry>
-    <FeatureAppX>false</FeatureAppX>
-    <FeatureCominteropApartmentSupport>false</FeatureCominteropApartmentSupport>
-    <FeatureClassicCominterop>false</FeatureClassicCominterop>
-    <FeatureCominterop>false</FeatureCominterop>
-    <FeatureCominteropUnmanagedActivation>false</FeatureCominteropUnmanagedActivation>
-    <FeatureCominteropWinRTManagedActivation>false</FeatureCominteropWinRTManagedActivation>
-
     <FeatureCoreFxGlobalization>true</FeatureCoreFxGlobalization>
   </PropertyGroup>
 
@@ -87,7 +24,13 @@
     <FeatureManagedEtw>true</FeatureManagedEtw>
     <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
     <FeatureUseLcid>true</FeatureUseLcid>
-    <FeatureImplicitLongPath>true</FeatureImplicitLongPath>
+    <FeatureCominterop>true</FeatureCominterop>
+    <FeatureClassicCominterop>true</FeatureClassicCominterop>
+    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
+    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
+    <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
+    <FeatureAppX>true</FeatureAppX>
+    <FeatureWin32Registry>true</FeatureWin32Registry>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsLinux)' == 'true'">

clr.defines.targets

@@ -1,41 +1,25 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <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>
         <DefineConstants Condition="'$(FeatureMulticastStubAsIL)' == 'true'">$(DefineConstants);FEATURE_MULTICASTSTUB_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureStubsAsIL)' == 'true'">$(DefineConstants);FEATURE_STUBS_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureClassicCominterop)' == 'true'">$(DefineConstants);FEATURE_CLASSIC_COMINTEROP</DefineConstants>
-        <DefineConstants Condition="'$(FeatureCodeVersioning)' == 'true'">$(DefineConstants);FEATURE_CODE_VERSIONING</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominterop)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropApartmentSupport)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_APARTMENT_SUPPORT</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropUnmanagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureCoreFxGlobalization)' == 'true'">$(DefineConstants);FEATURE_COREFX_GLOBALIZATION</DefineConstants>
-        <DefineConstants Condition="'$(FeatureDisplayCultureInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_CULTURE_INFO</DefineConstants>
-        <DefineConstants Condition="'$(FeatureDisplayRegionInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_REGION_INFO</DefineConstants>
-        <DefineConstants Condition="'$(FeatureHosting)' == 'true'">$(DefineConstants);FEATURE_HOSTING</DefineConstants>
-        <DefineConstants Condition="'$(FeatureImplicitLongPath)' == 'true'">$(DefineConstants);FEATURE_IMPLICIT_LONGPATH</DefineConstants>
-        <DefineConstants Condition="'$(FeatureIsolatedStorageQuotaEnforcement)' == 'true'">$(DefineConstants);FEATURE_ISOLATED_STORAGE_QUOTA_ENFORCEMENT</DefineConstants>
-        <DefineConstants Condition="'$(FeatureJumpStamp)' == 'true'">$(DefineConstants);FEATURE_JUMPSTAMP</DefineConstants>
-        <DefineConstants Condition="'$(FeatureMacl)' == 'true'">$(DefineConstants);FEATURE_MACL</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtw)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW_CHANNELS</DefineConstants>
         <DefineConstants Condition="'$(FeaturePal)' == 'true'">$(DefineConstants);FEATURE_PAL</DefineConstants>
-        <DefineConstants Condition="'$(FeaturePathCompat)' == 'true'">$(DefineConstants);FEATURE_PATHCOMPAT</DefineConstants>
         <DefineConstants Condition="'$(FeaturePerfTracing)' == 'true'">$(DefineConstants);FEATURE_PERFTRACING</DefineConstants>
         <DefineConstants Condition="'$(FeatureXplatEventSource)' == 'true'">$(DefineConstants);FEATURE_EVENTSOURCE_XPLAT</DefineConstants>
-        <DefineConstants Condition="'$(FeatureSortTables)' == 'true'">$(DefineConstants);FEATURE_SORT_TABLES</DefineConstants>
-        <DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
         <DefineConstants Condition="'$(FeatureUseLcid)' == 'true'">$(DefineConstants);FEATURE_USE_LCID</DefineConstants>
-        <DefineConstants Condition="'$(FeatureValidator)' == 'true'">$(DefineConstants);FEATURE_VALIDATOR</DefineConstants>
         <DefineConstants Condition="'$(FeatureWin32Registry)' == 'true'">$(DefineConstants);FEATURE_WIN32_REGISTRY</DefineConstants>
-        <DefineConstants Condition="'$(FeatureWinMDResilient)' == 'true'">$(DefineConstants);FEATURE_WINMD_RESILIENT</DefineConstants>
+
         <DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants>
-        <DefineConstants Condition="'$(FeatureReJIT)' == 'true'">$(DefineConstants);FEATURE_REJIT</DefineConstants>
-        <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="'$(TargetsUnix)' == 'true'">$(DefineConstants);PLATFORM_UNIX</DefineConstants>
         <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);PLATFORM_WINDOWS</DefineConstants>