diff --git a/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj b/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj
index b00fd7313..d14069227 100644
--- a/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj
+++ b/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj
@@ -1,24 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
-
-
- false
- net5.0
- false
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
+
+ false
+ net5.0
+ false
+
+
+
diff --git a/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj b/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj
index 10b0b0117..3892ea370 100644
--- a/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj
+++ b/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj
@@ -1,4 +1,5 @@
-
+
+
netstandard2.0;net461
True
@@ -6,7 +7,7 @@
opensearch,opensearch,xunit,cluster,integration,test,ephemeral
-
+
diff --git a/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs b/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs
index 5830f6b3f..5dca5c302 100644
--- a/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs
+++ b/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs
@@ -53,7 +53,8 @@ public IEnumerable Discover(ITestFrameworkDiscoveryOptions disco
: new IXunitTestCase[] {new SkippingTestCase(skipReason, testMethod, null)}
: new[]
{
- new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod)
+ new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(),
+ discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod)
};
///
diff --git a/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/SkippingTestCase.cs b/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/SkippingTestCase.cs
index 7f8f4305c..bd234f3ef 100644
--- a/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/SkippingTestCase.cs
+++ b/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/SkippingTestCase.cs
@@ -45,9 +45,11 @@ public SkippingTestCase()
/// The test method this test case belongs to.
/// The arguments for the test method.
public SkippingTestCase(string skipReason, ITestMethod testMethod, object[] testMethodArguments = null)
- : base(TestMethodDisplay.ClassAndMethod, testMethod, testMethodArguments) =>
+ : base(TestMethodDisplay.ClassAndMethod, TestMethodDisplayOptions.None, testMethod, testMethodArguments) =>
SkipReason = skipReason ?? "skipped";
+ public int Timeout => 0;
+
///
public Task RunAsync(
IMessageSink diagnosticMessageSink,
diff --git a/src/OpenSearch.Stack.ArtifactsApi/OpenSearch.Stack.ArtifactsApi.csproj b/src/OpenSearch.Stack.ArtifactsApi/OpenSearch.Stack.ArtifactsApi.csproj
index 1a59ab318..c228e377f 100644
--- a/src/OpenSearch.Stack.ArtifactsApi/OpenSearch.Stack.ArtifactsApi.csproj
+++ b/src/OpenSearch.Stack.ArtifactsApi/OpenSearch.Stack.ArtifactsApi.csproj
@@ -1,4 +1,4 @@
-
+
netstandard2.0;net461
Provides a set of classes to resolve the location of OpenSearch stack products in various stages: released, snapshot and build candidates
@@ -7,7 +7,9 @@
-
+
+
+
diff --git a/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj b/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj
index 4fb84d80b..9a1e672dc 100644
--- a/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj
+++ b/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj
@@ -1,3 +1,4 @@
+