Enable default interfaces unconditionally (dotnet/corefx#36012)

Corresponds to dotnet/coreclrdotnet/corefx#23225.

Commit migrated from https://github.com/dotnet/corefx/commit/5fb12949b1487e34657ba9f4e2e12f31f8305295

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.cs b/src/libraries/System.Runtime/ref/System.Runtime.cs
index 1b6b0e1..116238e 100644 (file)
--- a/src/libraries/System.Runtime/ref/System.Runtime.cs
+++ b/src/libraries/System.Runtime/ref/System.Runtime.cs
@@ -6797,9 +6797,7 @@ namespace System.Runtime.CompilerServices
     }
     public static partial class RuntimeFeature
     {
-#if FEATURE_DEFAULT_INTERFACES
         public const string DefaultImplementationsOfInterfaces = "DefaultImplementationsOfInterfaces";
-#endif
         public const string PortablePdb = "PortablePdb";
         public static bool IsDynamicCodeCompiled { get { throw null; } }
         public static bool IsDynamicCodeSupported { get { throw null; } }

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.csproj b/src/libraries/System.Runtime/ref/System.Runtime.csproj
index ed91482..a5c288f 100644 (file)
--- a/src/libraries/System.Runtime/ref/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/ref/System.Runtime.csproj
@@ -6,8 +6,6 @@
     <ProjectGuid>{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}</ProjectGuid>
     <!-- disable warnings about obsolete APIs -->
     <NoWarn>$(NoWarn);0809;0618</NoWarn>
-    <!-- Default interfaces are not officially supported in netcoreapp yet -->
-    <DefineConstants Condition="'$(IsPrerelease)' == 'true' and '$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_DEFAULT_INTERFACES</DefineConstants>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreappaot-Debug;netcoreappaot-Release;uap-Debug;uap-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt b/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt
index 7a719cb..7b90b8c 100644 (file)
--- a/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt
+++ b/src/libraries/System.Runtime/src/ApiCompatBaseline.netcoreappaot.txt
@@ -7,3 +7,4 @@ MembersMustExist : Member 'System.Text.Rune.DecodeUtf16(System.ReadOnlySpan<Syst
 MembersMustExist : Member 'System.Text.Rune.DecodeUtf16FromEnd(System.ReadOnlySpan<System.Char>, System.Text.Rune, System.Int32)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Text.Rune.DecodeUtf8(System.ReadOnlySpan<System.Byte>, System.Text.Rune, System.Int32)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Text.Rune.DecodeUtf8FromEnd(System.ReadOnlySpan<System.Byte>, System.Text.Rune, System.Int32)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.String System.Runtime.CompilerServices.RuntimeFeature.DefaultImplementationsOfInterfaces' does not exist in the implementation but it does exist in the contract.

diff --git a/src/libraries/System.Runtime/src/ApiCompatBaseline.uapaot.txt b/src/libraries/System.Runtime/src/ApiCompatBaseline.uapaot.txt
index 260fcc0..b18a31f 100644 (file)
--- a/src/libraries/System.Runtime/src/ApiCompatBaseline.uapaot.txt
+++ b/src/libraries/System.Runtime/src/ApiCompatBaseline.uapaot.txt
@@ -33,3 +33,4 @@ MembersMustExist : Member 'System.Text.Rune.DecodeUtf16(System.ReadOnlySpan<Syst
 MembersMustExist : Member 'System.Text.Rune.DecodeUtf16FromEnd(System.ReadOnlySpan<System.Char>, System.Text.Rune, System.Int32)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Text.Rune.DecodeUtf8(System.ReadOnlySpan<System.Byte>, System.Text.Rune, System.Int32)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Text.Rune.DecodeUtf8FromEnd(System.ReadOnlySpan<System.Byte>, System.Text.Rune, System.Int32)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.String System.Runtime.CompilerServices.RuntimeFeature.DefaultImplementationsOfInterfaces' does not exist in the implementation but it does exist in the contract.