summaryrefslogtreecommitdiff
path: root/clr.defines.targets
diff options
context:
space:
mode:
authordanmosemsft <danmose@microsoft.com>2017-01-23 09:43:51 -0800
committerdanmosemsft <danmose@microsoft.com>2017-01-23 10:28:34 -0800
commit3dc1198e182de928fa55118d9cba33ff91a1602b (patch)
treee7f58c9639efc75a49b4c3b85646a7a26cd14c98 /clr.defines.targets
parent4c81ba582c4e9a9128c917ccb25ecac19824b1f9 (diff)
downloadcoreclr-3dc1198e182de928fa55118d9cba33ff91a1602b.tar.gz
coreclr-3dc1198e182de928fa55118d9cba33ff91a1602b.tar.bz2
coreclr-3dc1198e182de928fa55118d9cba33ff91a1602b.zip
Remove disabled FEATURE_COMINTEROP_MANAGED_ACTIVATION
Diffstat (limited to 'clr.defines.targets')
-rw-r--r--clr.defines.targets2
1 files changed, 0 insertions, 2 deletions
diff --git a/clr.defines.targets b/clr.defines.targets
index 6fd3bc0da3..267beedf97 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -18,7 +18,6 @@
<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="'$(FeatureCominteropManagedActivation)' == 'true'">$(CDefines);FEATURE_COMINTEROP_MANAGED_ACTIVATION</CDefines>
<CDefines Condition="'$(FeatureCominteropRegistration)' == 'true'">$(CDefines);FEATURE_COMINTEROP_REGISTRATION</CDefines>
<CDefines Condition="'$(FeatureCominteropTlbSupport)' == 'true'">$(CDefines);FEATURE_COMINTEROP_TLB_SUPPORT</CDefines>
<CDefines Condition="'$(FeatureCominteropUnmanagedActivation)' == 'true'">$(CDefines);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION</CDefines>
@@ -119,7 +118,6 @@
<DefineConstants Condition="'$(FeatureClickonce)' == 'true'">$(DefineConstants);FEATURE_CLICKONCE</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>
<DefineConstants Condition="'$(FeatureCominteropUnmanagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION</DefineConstants>
<DefineConstants Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION</DefineConstants>
<DefineConstants Condition="'$(FeatureCominteropWinRTDesktopHost)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_WINRT_DESKTOP_HOST</DefineConstants>