Remove FEATURE_COLLECTIBLE_TYPES symbol

diff --git a/clr.coreclr.props b/clr.coreclr.props
index 47371c33a1c24524a8758a9e5067089cf3ce2f9a..c8c391ced2d9f88d07bf7ce7062178defa4f7307 100644 (file)
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -7,7 +7,6 @@
     <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls>
     <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL>
     <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
-    <FeatureCollectibleTypes>true</FeatureCollectibleTypes>
     <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
     <FeatureCoreclr>true</FeatureCoreclr>
     <FeatureCorruptingExceptions>true</FeatureCorruptingExceptions>

diff --git a/clr.defines.targets b/clr.defines.targets
index b4de3b561485ac02507b33920b0f67cb599ec95d..98dff71fbb75cdb581c288f34a49d7b1da24b440 100644 (file)
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -135,7 +135,6 @@
         <DefineConstants Condition="'$(FeatureClassicCominterop)' == 'true'">$(DefineConstants);FEATURE_CLASSIC_COMINTEROP</DefineConstants>
         <DefineConstants Condition="'$(FeatureClickonce)' == 'true'">$(DefineConstants);FEATURE_CLICKONCE</DefineConstants>
         <DefineConstants Condition="'$(FeatureCodepagesFile)' == 'true'">$(DefineConstants);FEATURE_CODEPAGES_FILE</DefineConstants>
-        <DefineConstants Condition="'$(FeatureCollectibleTypes)' == 'true'">$(DefineConstants);FEATURE_COLLECTIBLE_TYPES</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominterop)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropApartmentSupport)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_APARTMENT_SUPPORT</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropManagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_MANAGED_ACTIVATION</DefineConstants>

diff --git a/clr.desktop.props b/clr.desktop.props
index 682c85a6b6b5a93473055283a820dab6bef94957..070c2aa0279e7a815dd27903e97ea243d2792a1d 100644 (file)
--- a/clr.desktop.props
+++ b/clr.desktop.props
@@ -15,7 +15,6 @@
     <FeatureLegacySurface>true</FeatureLegacySurface>
     <FeatureClickonce>true</FeatureClickonce>
     <FeatureCodepagesFile>true</FeatureCodepagesFile>
-    <FeatureCollectibleTypes>true</FeatureCollectibleTypes>
     <FeatureCominterop>true</FeatureCominterop>
     <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
     <FeatureCominteropManagedActivation>true</FeatureCominteropManagedActivation>

diff --git a/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
index 9331ae193c2d30dece4e50335362a2d31e8f4ff0..95200157b45e750afd176370bca117d55ee5fa43 100644 (file)
--- a/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
+++ b/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
@@ -257,9 +257,7 @@ namespace System.Reflection.Emit
 #if FEATURE_REFLECTION_ONLY_LOAD
                 && access != AssemblyBuilderAccess.ReflectionOnly
 #endif // FEATURE_REFLECTION_ONLY_LOAD
-#if FEATURE_COLLECTIBLE_TYPES
                 && access != AssemblyBuilderAccess.RunAndCollect
-#endif // FEATURE_COLLECTIBLE_TYPES
                 )
             {
                 throw new ArgumentException(Environment.GetResourceString("Arg_EnumIllegalVal", (int)access), nameof(access));

diff --git a/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs b/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs
index 5c86d8ec874204ee9d9b9cbdee28549d8a0035b9..398f3d9c8a6321a3b1a6aca2394a56b5dffe8ab3 100644 (file)
--- a/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs
+++ b/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs
@@ -18,8 +18,6 @@ namespace System.Reflection.Emit
 #if FEATURE_REFLECTION_ONLY_LOAD
         ReflectionOnly = 6, // 4 | Save,
 #endif // FEATURE_REFLECTION_ONLY_LOAD
-#if FEATURE_COLLECTIBLE_TYPES
         RunAndCollect = 8 | Run
-#endif
     }
 }