From 6eebb9d678a786c081b121709fa7471ff0bd08df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Wed, 13 Mar 2019 19:50:13 +0100
Subject: Enable FeatureDefaultInterfaces unconditionally (#23225)

Fixes #22940.
---
 clr.coreclr.props    | 1 +
 clr.defines.targets  | 2 +-
 clrdefinitions.cmake | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/clr.coreclr.props b/clr.coreclr.props
index e389a27abc..a3a3c00fcf 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -9,6 +9,7 @@
     <FeaturePerfTracing>true</FeaturePerfTracing>
     <FeatureTypeEquivalence>true</FeatureTypeEquivalence>
     <FeatureBasicFreeze>true</FeatureBasicFreeze>
+    <FeatureDefaultInterfaces>true</FeatureDefaultInterfaces>
     <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
   </PropertyGroup>
 
diff --git a/clr.defines.targets b/clr.defines.targets
index 5b48844caa..3fa0417f51 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <!-- Features we're currently flighting, but don't intend to ship in officially supported releases -->
     <PropertyGroup Condition="'$(IsPrerelease)' == 'true'">
-        <FeatureDefaultInterfaces>true</FeatureDefaultInterfaces>
+        <!-- FeatureXXX>true</FeatureXXX -->
     </PropertyGroup>
 
     <PropertyGroup>
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index 796261e9b2..9e22da2033 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -6,7 +6,7 @@ set(PRERELEASE 1)
 
 # Features we're currently flighting, but don't intend to ship in officially supported releases
 if (PRERELEASE)
-  add_definitions(-DFEATURE_DEFAULT_INTERFACES=1)  
+  # add_definitions(-DFEATURE_XXX=1)
 endif (PRERELEASE)
 
 if (CLR_CMAKE_TARGET_ARCH_AMD64)
@@ -119,6 +119,7 @@ if(FEATURE_DBGIPC)
   add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
   add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
 endif(FEATURE_DBGIPC)
+add_definitions(-DFEATURE_DEFAULT_INTERFACES)
 if(FEATURE_EVENT_TRACE)
     add_definitions(-DFEATURE_EVENT_TRACE=1)
     add_definitions(-DFEATURE_PERFTRACING=1)
-- 
cgit v1.2.3