diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2020-06-19 08:09:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 08:09:19 +0300 |
| commit | f555e6ac7590102f504a1a463b0de69e52418d68 (patch) | |
| tree | 04f5ddc2b6e7150c52cc95d571bec92e39700d18 /src/coreclr/clr.featuredefines.props | |
| parent | c5edc006987847b15741576cbcfddd42e6f87768 (diff) | |
Merge FEATURE_CLASSIC_COMINTEROP into FEATURE_COMINTEROP (#38107)
Also deleted some dead code
Diffstat (limited to 'src/coreclr/clr.featuredefines.props')
| -rw-r--r-- | src/coreclr/clr.featuredefines.props | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props index e5f90fd0b52..db5aa417281 100644 --- a/src/coreclr/clr.featuredefines.props +++ b/src/coreclr/clr.featuredefines.props @@ -29,7 +29,6 @@ <FeatureStubsAsIL Condition="'$(Platform)' == 'arm64'">true</FeatureStubsAsIL> <FeatureComWrappers>true</FeatureComWrappers> <FeatureCominterop>true</FeatureCominterop> - <FeatureClassicCominterop>true</FeatureClassicCominterop> <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation> <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport> <FeatureAppX>true</FeatureAppX> @@ -51,7 +50,6 @@ <DefineConstants Condition="'$(FeatureMulticastStubAsIL)' == 'true'">$(DefineConstants);FEATURE_MULTICASTSTUB_AS_IL</DefineConstants> <DefineConstants Condition="'$(FeatureInstantiatingStubAsIL)' == 'true'">$(DefineConstants);FEATURE_INSTANTIATINGSTUB_AS_IL</DefineConstants> <DefineConstants Condition="'$(FeatureStubsAsIL)' == 'true'">$(DefineConstants);FEATURE_STUBS_AS_IL</DefineConstants> - <DefineConstants Condition="'$(FeatureClassicCominterop)' == 'true'">$(DefineConstants);FEATURE_CLASSIC_COMINTEROP</DefineConstants> <DefineConstants Condition="'$(FeatureCollectibleALC)' == 'true'">$(DefineConstants);FEATURE_COLLECTIBLE_ALC</DefineConstants> <DefineConstants Condition="'$(FeatureComWrappers)' == 'true'">$(DefineConstants);FEATURE_COMWRAPPERS</DefineConstants> <DefineConstants Condition="'$(FeatureCominterop)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP</DefineConstants> |