From d79ed020296a2ca784e818c48da0d3ba4eaf7151 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Mon, 29 Jul 2019 20:56:50 -0400
Subject: [PATCH] Re-enable xunit warning 2018 (dotnet/corefx#39865)

Commit migrated from https://github.com/dotnet/corefx/commit/fec76b0fc06b4fce9e4ac28b9a2bf1101209d984
---
 src/libraries/CodeAnalysis.ruleset                         |  1 -
 .../Composition/Factories/ContainerFactory.cs              | 14 --------------
 .../CompositionContainerAttributedModelCycleTests.cs       |  2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/libraries/CodeAnalysis.ruleset b/src/libraries/CodeAnalysis.ruleset
index 3298b4f..97a490c 100644
--- a/src/libraries/CodeAnalysis.ruleset
+++ b/src/libraries/CodeAnalysis.ruleset
@@ -79,6 +79,5 @@
     <Rule Id="xUnit1026" Action="None" /> <!-- Theory methods should use all of their parameters -->
     <Rule Id="xUnit2013" Action="None" /> <!-- Do not use equality check to check for collection size. -->
     <Rule Id="xUnit2017" Action="None" /> <!-- Do not use Contains() to check if a value exists in a collection -->
-    <Rule Id="xUnit2018" Action="None" /> <!-- Do not compare an object's exact type to an abstract class or interface -->
   </Rules>
 </RuleSet>
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/ContainerFactory.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/ContainerFactory.cs
index 22a10dd..a3a18b1 100644
--- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/ContainerFactory.cs
+++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/ContainerFactory.cs
@@ -45,20 +45,6 @@ namespace System.ComponentModel.Composition.Factories
             return Create(catalog);
         }
 
-        public static CompositionContainer CreateAttributed(params object[] parts)
-        {
-            var container = new CompositionContainer();
-            var partsArray = new ComposablePart[parts.Length];
-
-            for (int i = 0; i < parts.Length; i++)
-            {
-                Assert.IsNotType<Type>(parts[i]);
-                partsArray[i] = PartFactory.CreateAttributed(parts[i]);
-            }
-
-            return Create(partsArray);
-        }
-
         public static CompositionContainer Create(CompositionContainer parent, params ComposablePart[] parts)
         {
             CompositionContainer container;
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/Integration/CompositionContainerAttributedModelCycleTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/Integration/CompositionContainerAttributedModelCycleTests.cs
index 52eb766..ff22f48 100644
--- a/src/libraries/System.ComponentModel.Composition/tests/System/Integration/CompositionContainerAttributedModelCycleTests.cs
+++ b/src/libraries/System.ComponentModel.Composition/tests/System/Integration/CompositionContainerAttributedModelCycleTests.cs
@@ -125,7 +125,7 @@ namespace Tests.Integration
             {
                 var export = GetExport(type, types);
 
-                Assert.IsType<Type>(export.Value);
+                Assert.IsAssignableFrom<Type>(export.Value);
             }
         }
 
-- 
2.7.4