Merge pull request #15994 from MichalStrehovsky/disableDefaultintf

Disable the default interface methods feature (release/2.1)

Author: weshaggard

clrdefinitions.cmake

@@ -2,7 +2,7 @@ include(clrfeatures.cmake)
 
 # If set, indicates that this is not an officially supported release
 # Keep in sync with IsPrerelease in dir.props
-set(PRERELEASE 1)
+set(PRERELEASE 0)
 
 # Features we're currently flighting, but don't intend to ship in officially supported releases
 if (PRERELEASE)

dir.props

@@ -142,7 +142,7 @@
     <!-- If true, indicates that this is not an officially supported release -->
     <!-- It is important to flip this to false in official release branches -->
     <!-- Keep it in sync with PRERELEASE in clrdefinitions.cmake -->
-    <IsPrerelease>true</IsPrerelease>
+    <IsPrerelease>false</IsPrerelease>
 
     <!-- This should be kept in sync with package details in src/.nuget/init/project.json -->
     <RuntimeIdGraphDefinitionVersion>1.0.2-beta-24224-02</RuntimeIdGraphDefinitionVersion>

tests/issues.targets

@@ -195,6 +195,23 @@
         </ExcludeList>
     </ItemGroup>
 
+    <!-- Tests for features we are not shipping in this release -->
+
+    <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
+        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\genericmethods\genericmethods\*">
+            <Issue>Not a shipping feature</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\methodimpl\methodimpl\*">
+            <Issue>Not a shipping feature</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\simple\simple\*">
+            <Issue>Not a shipping feature</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\valuetypes\valuetypes\*">
+            <Issue>Not a shipping feature</Issue>
+        </ExcludeList>
+    </ItemGroup>
+
     <!-- The following are x86 failures -->
 
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86'">

tests/testsFailingOutsideWindows.txt

@@ -74,6 +74,10 @@ GC/Regressions/dev10bugs/536168/536168/536168.sh
 Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape/diamondshape.sh
 Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics/sharedgenerics.sh
 Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall/constrainedcall.sh
+Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods/genericmethods.sh
+Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl/methodimpl.sh
+Loader/classloader/DefaultInterfaceMethods/simple/simple/simple.sh
+Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes/valuetypes.sh
 Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612/Generated612.sh
 Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613/Generated613.sh
 Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generated614.sh