Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5b5dca3

Browse files
Disable the default interface methods feature
This feature is not shipping in 2.1.
1 parent 4b97514 commit 5b5dca3

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

clrdefinitions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(clrfeatures.cmake)
22

33
# If set, indicates that this is not an officially supported release
44
# Keep in sync with IsPrerelease in dir.props
5-
set(PRERELEASE 1)
5+
set(PRERELEASE 0)
66

77
# Features we're currently flighting, but don't intend to ship in officially supported releases
88
if (PRERELEASE)

dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<!-- If true, indicates that this is not an officially supported release -->
143143
<!-- It is important to flip this to false in official release branches -->
144144
<!-- Keep it in sync with PRERELEASE in clrdefinitions.cmake -->
145-
<IsPrerelease>true</IsPrerelease>
145+
<IsPrerelease>false</IsPrerelease>
146146

147147
<!-- This should be kept in sync with package details in src/.nuget/init/project.json -->
148148
<RuntimeIdGraphDefinitionVersion>1.0.2-beta-24224-02</RuntimeIdGraphDefinitionVersion>

tests/issues.targets

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,23 @@
195195
</ExcludeList>
196196
</ItemGroup>
197197

198+
<!-- Tests for features we are not shipping in this release -->
199+
200+
<ItemGroup Condition="'$(XunitTestBinBase)' != ''">
201+
<ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\genericmethods\genericmethods\*">
202+
<Issue>Not a shipping feature</Issue>
203+
</ExcludeList>
204+
<ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\methodimpl\methodimpl\*">
205+
<Issue>Not a shipping feature</Issue>
206+
</ExcludeList>
207+
<ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\simple\simple\*">
208+
<Issue>Not a shipping feature</Issue>
209+
</ExcludeList>
210+
<ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\valuetypes\valuetypes\*">
211+
<Issue>Not a shipping feature</Issue>
212+
</ExcludeList>
213+
</ItemGroup>
214+
198215
<!-- The following are x86 failures -->
199216

200217
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86'">

tests/testsFailingOutsideWindows.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ GC/Regressions/dev10bugs/536168/536168/536168.sh
7474
Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape/diamondshape.sh
7575
Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics/sharedgenerics.sh
7676
Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall/constrainedcall.sh
77+
Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods/genericmethods.sh
78+
Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl/methodimpl.sh
79+
Loader/classloader/DefaultInterfaceMethods/simple/simple/simple.sh
80+
Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes/valuetypes.sh
7781
Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612/Generated612.sh
7882
Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613/Generated613.sh
7983
Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generated614.sh

0 commit comments

Comments
 (0)