Move to Nullean.Xunit.Partitions

elastic · Feb 9, 2024 · 0c5661f · 0c5661f
1 parent 1dbf386
commit 0c5661f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj
@@ -2,11 +2,12 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
     <IsPackable>True</IsPackable>
+    <IsTestProject>False</IsTestProject>
     <Description>Provides an Xunit test framework allowing you to run integration tests against local ephemeral Elasticsearch clusters</Description>
     <PackageTags>elastic,elasticsearch,xunit,cluster,integration,test,ephemeral</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nullean.Xunit.Partitions" Version="0.4.1" />
+    <PackageReference Include="Nullean.Xunit.Partitions" Version="0.4.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Elastic.Elasticsearch.Xunit/ElasticXunitRunOptions.cs b/src/Elastic.Elasticsearch.Xunit/ElasticXunitRunOptions.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq;
+using System.Runtime.Serialization;
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elastic.Stack.ArtifactsApi;
 using Nullean.Xunit.Partitions;
@@ -40,6 +41,7 @@ public class ElasticXunitRunOptions : PartitionOptions
 		///     Accepts a comma separated list of filters
 		/// </summary>
 		[Obsolete("Use PartitionFilterRegex instead", false)]
+		[IgnoreDataMember]
 		public string ClusterFilter
 		{
 			get => PartitionFilterRegex;
@@ -60,6 +62,7 @@ public string ClusterFilter
 		///     Accepts a comma separated list of filters
 		/// </summary>
 		[Obsolete("Use ParitionFilterRegex instead", false)]
+		[IgnoreDataMember]
 		public string TestFilter
 		{
 			get => TestFilterRegex;

diff --git a/src/Elastic.Elasticsearch.Xunit/Sdk/ElasticTestFramework.cs b/src/Elastic.Elasticsearch.Xunit/Sdk/ElasticTestFramework.cs
@@ -12,12 +12,12 @@
 namespace Elastic.Elasticsearch.Xunit.Sdk;
 
 // ReSharper disable once UnusedType.Global
-public class ElasticTestFramework : PartitionTestFramework<ElasticXunitRunOptions, TestAssemblyRunnerFactory, TestFrameworkDiscovererFactory>
+public class ElasticTestFramework : PartitionTestFramework<ElasticXunitRunOptions, TestAssemblyRunnerFactory, ElasticTestFrameworkDiscovererFactory>
 {
 	public ElasticTestFramework(IMessageSink messageSink) : base(messageSink) { }
 }
 
-public class TestFrameworkDiscovererFactory : ITestFrameworkDiscovererFactory
+public class ElasticTestFrameworkDiscovererFactory : ITestFrameworkDiscovererFactory
 {
 	public XunitTestFrameworkDiscoverer Create<TOptions>(
 		IAssemblyInfo assemblyInfo, ISourceInformationProvider sourceProvider, IMessageSink diagnosticMessageSink