From 1fa75b8b18fac3bb5c837d9fbb3db61ce6eab722 Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Tue, 17 Jan 2017 15:46:45 -0800
Subject: [PATCH] Remove FEATURE_COLLECTIBLE_TYPES symbol

Commit migrated from https://github.com/dotnet/coreclr/commit/4aa0b8d6ec28ce759effe64c6babd4ae74018bce
---
 src/coreclr/clr.coreclr.props                                           | 1 -
 src/coreclr/clr.defines.targets                                         | 1 -
 src/coreclr/clr.desktop.props                                           | 1 -
 src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs  | 2 --
 .../src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs    | 2 --
 5 files changed, 7 deletions(-)

diff --git a/src/coreclr/clr.coreclr.props b/src/coreclr/clr.coreclr.props
index 47371c3..c8c391c 100644
--- a/src/coreclr/clr.coreclr.props
+++ b/src/coreclr/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/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets
index b4de3b5..98dff71 100644
--- a/src/coreclr/clr.defines.targets
+++ b/src/coreclr/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/src/coreclr/clr.desktop.props b/src/coreclr/clr.desktop.props
index 682c85a..070c2aa 100644
--- a/src/coreclr/clr.desktop.props
+++ b/src/coreclr/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/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
index 9331ae1..9520015 100644
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
+++ b/src/coreclr/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/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs
index 5c86d8e..398f3d9 100644
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilderAccess.cs
+++ b/src/coreclr/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
     }
 }
-- 
2.7.4