From f771444042944963746ff9b631c60d3320c0e806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Zaj=C4=85c?= <piotr.zajac@live.com>
Date: Wed, 16 Sep 2020 14:58:20 +0200
Subject: [PATCH] Point to data discoverer NoPreDiscoveryDataDiscoverer (#35)

* Point to AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer
* Remove dotnet-xunit tool reference
* Update NuGet packages:
  - Microsoft.CodeAnalysis.FxCopAnalyzers 3.0.0 -> 3.3.0
  - Microsoft.NET.Test.Sdk 16.6.1 -> 16.7.1
  - xunit.runner.visualstudio 2.4.2 -> 2.4.3
  - AutoFixture* 4.13.0 -> 4.14.0
---
 ...y.AutoFixture.XUnit2.AutoFakeItEasy.Tests.csproj | 13 ++++++-------
 .../Attributes/AutoMockDataAttribute.cs             |  2 ++
 .../Attributes/InlineAutoMockDataAttribute.cs       |  2 ++
 .../Attributes/MemberAutoMockDataAttribute.cs       |  2 +-
 ...ctivity.AutoFixture.XUnit2.AutoFakeItEasy.csproj |  8 ++++----
 ...ectivity.AutoFixture.XUnit2.AutoMoq.Tests.csproj | 13 ++++++-------
 .../Attributes/AutoMockDataAttribute.cs             |  2 ++
 .../Attributes/InlineAutoMockDataAttribute.cs       |  2 ++
 .../Attributes/MemberAutoMockDataAttribute.cs       |  2 +-
 .../Objectivity.AutoFixture.XUnit2.AutoMoq.csproj   |  8 ++++----
 ....AutoFixture.XUnit2.AutoNSubstitute.Tests.csproj | 13 ++++++-------
 .../Attributes/AutoMockDataAttribute.cs             |  2 ++
 .../Attributes/InlineAutoMockDataAttribute.cs       |  2 ++
 .../Attributes/MemberAutoMockDataAttribute.cs       |  2 +-
 ...tivity.AutoFixture.XUnit2.AutoNSubstitute.csproj |  8 ++++----
 ...Objectivity.AutoFixture.XUnit2.Core.Tests.csproj | 11 +++++------
 .../Objectivity.AutoFixture.XUnit2.Core.csproj      |  6 +++---
 17 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests.csproj b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests.csproj
index 5c48f772..6bfd8ba9 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.Tests.csproj
@@ -35,9 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.AutoFakeItEasy" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.AutoFakeItEasy" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
@@ -45,11 +45,11 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="FakeItEasy" Version="5.4.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
@@ -70,11 +70,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/AutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/AutoMockDataAttribute.cs
index df01e571..aee43925 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/AutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/AutoMockDataAttribute.cs
@@ -6,8 +6,10 @@
     using Objectivity.AutoFixture.XUnit2.Core.Attributes;
     using Objectivity.AutoFixture.XUnit2.Core.Common;
     using Objectivity.AutoFixture.XUnit2.Core.Providers;
+    using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class AutoMockDataAttribute : AutoDataBaseAttribute
     {
         public AutoMockDataAttribute()
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/InlineAutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/InlineAutoMockDataAttribute.cs
index e86819a1..d77e43a6 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/InlineAutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/InlineAutoMockDataAttribute.cs
@@ -6,8 +6,10 @@
     using Objectivity.AutoFixture.XUnit2.Core.Attributes;
     using Objectivity.AutoFixture.XUnit2.Core.Common;
     using Objectivity.AutoFixture.XUnit2.Core.Providers;
+    using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class InlineAutoMockDataAttribute : InlineAutoDataBaseAttribute
     {
         public InlineAutoMockDataAttribute(params object[] values)
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/MemberAutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/MemberAutoMockDataAttribute.cs
index fac102f3..694f8a2b 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/MemberAutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Attributes/MemberAutoMockDataAttribute.cs
@@ -9,7 +9,7 @@
     using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
-    [DataDiscoverer("Xunit.Sdk.MemberDataDiscoverer", "xunit.core")]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class MemberAutoMockDataAttribute : MemberAutoDataBaseAttribute
     {
         public MemberAutoMockDataAttribute(string memberName, params object[] parameters)
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.csproj b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.csproj
index cf6d08dc..b47c0c08 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy/Objectivity.AutoFixture.XUnit2.AutoFakeItEasy.csproj
@@ -55,12 +55,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.AutoFakeItEasy" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.AutoFakeItEasy" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests.csproj b/src/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests.csproj
index 2ad484d8..98e054d9 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests/Objectivity.AutoFixture.XUnit2.AutoMoq.Tests.csproj
@@ -35,9 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.AutoMoq" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.AutoMoq" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
@@ -45,11 +45,11 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -70,11 +70,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/AutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/AutoMockDataAttribute.cs
index 378c7f6b..5441837b 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/AutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/AutoMockDataAttribute.cs
@@ -6,8 +6,10 @@
     using Objectivity.AutoFixture.XUnit2.Core.Attributes;
     using Objectivity.AutoFixture.XUnit2.Core.Common;
     using Objectivity.AutoFixture.XUnit2.Core.Providers;
+    using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class AutoMockDataAttribute : AutoDataBaseAttribute
     {
         public AutoMockDataAttribute()
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/InlineAutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/InlineAutoMockDataAttribute.cs
index 6261e148..3bfd373c 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/InlineAutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/InlineAutoMockDataAttribute.cs
@@ -6,8 +6,10 @@
     using Objectivity.AutoFixture.XUnit2.Core.Attributes;
     using Objectivity.AutoFixture.XUnit2.Core.Common;
     using Objectivity.AutoFixture.XUnit2.Core.Providers;
+    using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class InlineAutoMockDataAttribute : InlineAutoDataBaseAttribute
     {
         public InlineAutoMockDataAttribute(params object[] values)
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/MemberAutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/MemberAutoMockDataAttribute.cs
index e16986bc..1edb24b4 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/MemberAutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Attributes/MemberAutoMockDataAttribute.cs
@@ -9,7 +9,7 @@
     using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
-    [DataDiscoverer("Xunit.Sdk.MemberDataDiscoverer", "xunit.core")]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class MemberAutoMockDataAttribute : MemberAutoDataBaseAttribute
     {
         public MemberAutoMockDataAttribute(string memberName, params object[] parameters)
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Objectivity.AutoFixture.XUnit2.AutoMoq.csproj b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Objectivity.AutoFixture.XUnit2.AutoMoq.csproj
index 56ca5bff..dbf9124d 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Objectivity.AutoFixture.XUnit2.AutoMoq.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoMoq/Objectivity.AutoFixture.XUnit2.AutoMoq.csproj
@@ -55,12 +55,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.AutoMoq" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.AutoMoq" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests.csproj b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests.csproj
index dc79dfbf..c8c04b9c 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.Tests.csproj
@@ -35,9 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
@@ -45,11 +45,11 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -70,11 +70,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/AutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/AutoMockDataAttribute.cs
index 2e1ab508..3d2a02cb 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/AutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/AutoMockDataAttribute.cs
@@ -6,8 +6,10 @@
     using Objectivity.AutoFixture.XUnit2.Core.Attributes;
     using Objectivity.AutoFixture.XUnit2.Core.Common;
     using Objectivity.AutoFixture.XUnit2.Core.Providers;
+    using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class AutoMockDataAttribute : AutoDataBaseAttribute
     {
         public AutoMockDataAttribute()
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/InlineAutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/InlineAutoMockDataAttribute.cs
index d200cced..307bf9f0 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/InlineAutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/InlineAutoMockDataAttribute.cs
@@ -6,8 +6,10 @@
     using Objectivity.AutoFixture.XUnit2.Core.Attributes;
     using Objectivity.AutoFixture.XUnit2.Core.Common;
     using Objectivity.AutoFixture.XUnit2.Core.Providers;
+    using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class InlineAutoMockDataAttribute : InlineAutoDataBaseAttribute
     {
         public InlineAutoMockDataAttribute(params object[] values)
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/MemberAutoMockDataAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/MemberAutoMockDataAttribute.cs
index e3c69ebe..9d490e07 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/MemberAutoMockDataAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Attributes/MemberAutoMockDataAttribute.cs
@@ -9,7 +9,7 @@
     using Xunit.Sdk;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
-    [DataDiscoverer("Xunit.Sdk.MemberDataDiscoverer", "xunit.core")]
+    [DataDiscoverer("AutoFixture.Xunit2.NoPreDiscoveryDataDiscoverer", "AutoFixture.Xunit2")]
     public sealed class MemberAutoMockDataAttribute : MemberAutoDataBaseAttribute
     {
         public MemberAutoMockDataAttribute(string memberName, params object[] parameters)
diff --git a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.csproj b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.csproj
index ccf8cd4e..dd8f0c6c 100644
--- a/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.AutoNSubstitute/Objectivity.AutoFixture.XUnit2.AutoNSubstitute.csproj
@@ -55,12 +55,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Objectivity.AutoFixture.XUnit2.Core.Tests.csproj b/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Objectivity.AutoFixture.XUnit2.Core.Tests.csproj
index 433ed921..f5076faa 100644
--- a/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Objectivity.AutoFixture.XUnit2.Core.Tests.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Objectivity.AutoFixture.XUnit2.Core.Tests.csproj
@@ -35,8 +35,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
@@ -44,11 +44,11 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -69,11 +69,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Objectivity.AutoFixture.XUnit2.Core/Objectivity.AutoFixture.XUnit2.Core.csproj b/src/Objectivity.AutoFixture.XUnit2.Core/Objectivity.AutoFixture.XUnit2.Core.csproj
index 64961e92..cb3b5890 100644
--- a/src/Objectivity.AutoFixture.XUnit2.Core/Objectivity.AutoFixture.XUnit2.Core.csproj
+++ b/src/Objectivity.AutoFixture.XUnit2.Core/Objectivity.AutoFixture.XUnit2.Core.csproj
@@ -31,10 +31,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.13.0" />
-    <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
+    <PackageReference Include="AutoFixture" Version="4.14.0" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.14.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>