Remove disabled FEATURE_METHOD_RENTAL

Commit migrated from https://github.com/dotnet/coreclr/commit/9aecd9e5cbd057ad45244f6d0de0f2c1b7f49d2d

diff --git a/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets
index 1d7e924..cb374e6 100644 (file)
--- a/src/coreclr/clr.defines.targets
+++ b/src/coreclr/clr.defines.targets
@@ -57,7 +57,6 @@
         <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="'$(FeatureMethodRental)' == 'true'">$(CDefines);FEATURE_METHOD_RENTAL</CDefines>
         <CDefines Condition="'$(FeatureMixedMode)' == 'true'">$(CDefines);FEATURE_MIXEDMODE</CDefines>
         <CDefines Condition="'$(FeatureMultiModuleAssemblies)' == 'true'">$(CDefines);FEATURE_MULTIMODULE_ASSEMBLIES</CDefines>
         <CDefines Condition="'$(FeatureNativeImageGeneration)' == 'true'">$(CDefines);FEATURE_NATIVE_IMAGE_GENERATION</CDefines>
@@ -130,7 +129,6 @@
         <DefineConstants Condition="'$(FeatureIsostoreLight)' == 'true'">$(DefineConstants);FEATURE_ISOSTORE_LIGHT</DefineConstants>
         <DefineConstants Condition="'$(FeatureMacl)' == 'true'">$(DefineConstants);FEATURE_MACL</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtw)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW</DefineConstants>
-        <DefineConstants Condition="'$(FeatureMethodRental)' == 'true'">$(DefineConstants);FEATURE_METHOD_RENTAL</DefineConstants>
         <DefineConstants Condition="'$(FeatureMultiModuleAssemblies)' == 'true'">$(DefineConstants);FEATURE_MULTIMODULE_ASSEMBLIES</DefineConstants>
         <DefineConstants Condition="'$(FeatureNongenericCollections)' == 'true'">$(DefineConstants);FEATURE_NONGENERIC_COLLECTIONS</DefineConstants>
         <DefineConstants Condition="'$(FeatureNormIdnaOnly)' == 'true'">$(DefineConstants);FEATURE_NORM_IDNA_ONLY</DefineConstants>

diff --git a/src/coreclr/clr.desktop.props b/src/coreclr/clr.desktop.props
index 47fe90c..47d0260 100644 (file)
--- a/src/coreclr/clr.desktop.props
+++ b/src/coreclr/clr.desktop.props
@@ -43,7 +43,6 @@
     <FeatureMacl>true</FeatureMacl>
     <FeatureManagedEtw>true</FeatureManagedEtw>
     <FeatureMdaSupported>true</FeatureMdaSupported>
-    <FeatureMethodRental>true</FeatureMethodRental>
     <FeatureMixedMode>true</FeatureMixedMode>
     <FeatureMultiModuleAssemblies>true</FeatureMultiModuleAssemblies>
     <FeatureNativeImageGeneration>true</FeatureNativeImageGeneration>

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs
index 8dba934..daa0e23 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs
@@ -85,16 +85,6 @@ namespace System.Runtime.InteropServices
     {
     }
 
-#if FEATURE_METHOD_RENTAL
-    [GuidAttribute("C2323C25-F57F-3880-8A4D-12EBEA7A5852")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.MethodRental))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _MethodRental
-    {
-    }
-#endif
 
     [GuidAttribute("D05FFA9A-04AF-3519-8EE1-8D93AD73430B")]
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]