From 402f2cd6cd00cef73eb6ebbe3be9ed7b4d93af6e Mon Sep 17 00:00:00 2001 From: Michael Voorhees Date: Tue, 18 Jul 2023 13:23:44 -0400 Subject: [PATCH] Remove feature exclude xml tests illink dropped the exclude feature functionality, so will we. I believe Unity was the last user of these tests so it's safe to delete them now. --- .../Dependencies/OnAssembly_Lib1.cs | 13 --------- .../Dependencies/OnAssembly_Lib2.cs | 13 --------- .../LinkXml/FeatureExclude/OnAssembly.cs | 22 --------------- .../LinkXml/FeatureExclude/OnAssembly.xml | 8 ------ .../LinkXml/FeatureExclude/OnEvent.cs | 21 --------------- .../LinkXml/FeatureExclude/OnEvent.xml | 10 ------- .../LinkXml/FeatureExclude/OnField.cs | 20 -------------- .../LinkXml/FeatureExclude/OnField.xml | 10 ------- .../LinkXml/FeatureExclude/OnMethod.cs | 24 ----------------- .../LinkXml/FeatureExclude/OnMethod.xml | 10 ------- .../LinkXml/FeatureExclude/OnProperty.cs | 27 ------------------- .../LinkXml/FeatureExclude/OnProperty.xml | 10 ------- .../LinkXml/FeatureExclude/OnType.cs | 25 ----------------- .../LinkXml/FeatureExclude/OnType.xml | 6 ----- 14 files changed, 219 deletions(-) delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib1.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib2.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.xml delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.xml delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.xml delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.xml delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.xml delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.cs delete mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.xml diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib1.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib1.cs deleted file mode 100644 index ee457792a6aab2..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib1.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude.Dependencies -{ - public class OnAssembly_Lib1 - { - public static void UsedSoCompilerDoesntRemoveReference () - { - } - - public class FeatureOneClass - { - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib2.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib2.cs deleted file mode 100644 index 032ad67f723418..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/Dependencies/OnAssembly_Lib2.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude.Dependencies -{ - public class OnAssembly_Lib2 - { - public static void UsedSoCompilerDoesntRemoveReference () - { - } - - public class FeatureTwoClass - { - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.cs deleted file mode 100644 index 6f53fcf0a7b07e..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Mono.Linker.Tests.Cases.Expectations.Assertions; -using Mono.Linker.Tests.Cases.Expectations.Metadata; -using Mono.Linker.Tests.Cases.LinkXml.FeatureExclude.Dependencies; - -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude -{ - [TestCaseRequirements (TestRunCharacteristics.TargetingNetFramework, "--exclude-feature is not supported on .NET Core")] - [SetupLinkerArgument ("--exclude-feature", "one")] - [SetupCompileBefore ("library1.dll", new[] { typeof (OnAssembly_Lib1) })] - [SetupCompileBefore ("library2.dll", new[] { typeof (OnAssembly_Lib2) })] - [RemovedTypeInAssembly ("library1.dll", typeof (OnAssembly_Lib1.FeatureOneClass))] - [KeptTypeInAssembly ("library2.dll", typeof (OnAssembly_Lib2.FeatureTwoClass))] - [SetupLinkerDescriptorFile ("OnAssembly.xml")] - public class OnAssembly - { - public static void Main () - { - OnAssembly_Lib1.UsedSoCompilerDoesntRemoveReference (); - OnAssembly_Lib2.UsedSoCompilerDoesntRemoveReference (); - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.xml b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.xml deleted file mode 100644 index f512ad963de0bb..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnAssembly.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.cs deleted file mode 100644 index 47ae4e6492e34f..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Mono.Linker.Tests.Cases.Expectations.Assertions; -using Mono.Linker.Tests.Cases.Expectations.Metadata; - -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude -{ - [TestCaseRequirements (TestRunCharacteristics.TargetingNetFramework, "--exclude-feature is not supported on .NET Core")] - [SetupLinkerArgument ("--exclude-feature", "one")] - [SetupLinkerDescriptorFile ("OnEvent.xml")] - public class OnEvent - { - public static void Main () - { - } - - public event EventHandler FeatureOne; - - [Kept] - public event EventHandler FeatureTwo { [Kept] add { } [Kept] remove { } } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.xml b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.xml deleted file mode 100644 index c6a851c98a5db3..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnEvent.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.cs deleted file mode 100644 index 0fcea8b37e7110..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Mono.Linker.Tests.Cases.Expectations.Assertions; -using Mono.Linker.Tests.Cases.Expectations.Metadata; - -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude -{ - [TestCaseRequirements (TestRunCharacteristics.TargetingNetFramework, "--exclude-feature is not supported on .NET Core")] - [SetupLinkerArgument ("--exclude-feature", "one")] - [SetupLinkerDescriptorFile ("OnField.xml")] - public class OnField - { - public static void Main () - { - } - - private int _featureOne; - - [Kept] - private int _featureTwo; - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.xml b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.xml deleted file mode 100644 index a1afd0b206be99..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnField.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.cs deleted file mode 100644 index 503a5a48316dcc..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Mono.Linker.Tests.Cases.Expectations.Assertions; -using Mono.Linker.Tests.Cases.Expectations.Metadata; - -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude -{ - [TestCaseRequirements (TestRunCharacteristics.TargetingNetFramework, "--exclude-feature is not supported on .NET Core")] - [SetupLinkerArgument ("--exclude-feature", "one")] - [SetupLinkerDescriptorFile ("OnMethod.xml")] - public class OnMethod - { - public static void Main () - { - } - - public void FeatureOne () - { - } - - [Kept] - public void FeatureTwo () - { - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.xml b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.xml deleted file mode 100644 index 53fb365c047b77..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnMethod.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.cs deleted file mode 100644 index eae178bae7696d..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Mono.Linker.Tests.Cases.Expectations.Assertions; -using Mono.Linker.Tests.Cases.Expectations.Metadata; - -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude -{ - [TestCaseRequirements (TestRunCharacteristics.TargetingNetFramework, "--exclude-feature is not supported on .NET Core")] - [SetupLinkerArgument ("--exclude-feature", "one")] - [SetupLinkerDescriptorFile ("OnProperty.xml")] - public class OnProperty - { - public static void Main () - { - new Foo (); // Used to avoid lazy body marking - } - - [Kept] - [KeptMember (".ctor()")] - class Foo - { - public int FeatureOne { get; set; } - - [Kept] - [KeptBackingField] - public int FeatureTwo { [Kept] get; [Kept] set; } - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.xml b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.xml deleted file mode 100644 index fc0c4584636784..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnProperty.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.cs deleted file mode 100644 index d21e10c4ef7d9a..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Mono.Linker.Tests.Cases.Expectations.Assertions; -using Mono.Linker.Tests.Cases.Expectations.Metadata; - -namespace Mono.Linker.Tests.Cases.LinkXml.FeatureExclude -{ - [TestCaseRequirements (TestRunCharacteristics.TargetingNetFramework, "--exclude-feature is not supported on .NET Core")] - [SetupLinkerArgument ("--exclude-feature", "one")] - [SetupLinkerDescriptorFile ("OnType.xml")] - public class OnType - { - public static void Main () - { - } - - class FeatureOneClass - { - } - - [Kept] - [KeptMember (".ctor()")] - class FeatureTwoClass - { - } - } -} diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.xml b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.xml deleted file mode 100644 index 9f21a61e916a73..00000000000000 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinkXml/FeatureExclude/OnType.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -