[Backport 1.x] Bump Microsoft.NET.Test.Sdk and Microsoft.TestPlatform.ObjectModel

CHANGELOG.md

@@ -14,6 +14,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bumps `CSharpier.Core` from 0.27.3 to 0.28.2
 - Bumps `Spectre.Console` from 0.48.0 to 0.49.1
 - Bumps `Nullean.VsTest.Pretty.TestLogger` from 0.3.0 to 0.4.0
+- Bumps `Microsoft.NET.Test.Sdk` from 17.9.0 to 17.10.0
+- Bumps `Microsoft.TestPlatform.ObjectModel` from 17.9.0 to 17.10.0
 
 ## [1.7.1]
 ### Fixed
@@ -171,4 +173,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 [1.6.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.3.0...v1.4.0
-[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
+[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0

abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
   </ItemGroup>
 

abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
   </ItemGroup>
 

tests/Tests.Auth.AwsSigV4/Tests.Auth.AwsSigV4.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionRoot)\tests\Tests.Core\Tests.Core.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
   </ItemGroup>
 </Project>

tests/Tests.Reproduce/GitHubIssue5363.cs

@@ -34,64 +34,65 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Net.Diagnostics;
+using Tests.Core.Xunit;
 using Xunit;
 
-namespace Tests.Reproduce
+namespace Tests.Reproduce;
+
+[Skip("When run in parallel with other tests the diagnostic listener may throw null pointer exceptions")]
+public class GitHubIssue5363
 {
-	public class GitHubIssue5363
-	{
-		internal class TestDiagnosticListener : IObserver<DiagnosticListener>, IDisposable
-		{
-			private ConcurrentBag<IDisposable> Disposables { get; } = new();
-
-			public Action<IApiCallDetails> OnEnded { get; }
-
-			public TestDiagnosticListener(Action<IApiCallDetails> onEnded) => OnEnded = onEnded;
-
-			public void OnError(Exception error) { }
-			public void OnCompleted() { }
-
-			public void OnNext(DiagnosticListener value) =>
-				TrySubscribe(DiagnosticSources.RequestPipeline.SourceName,
-					() => new RequestPipelineDiagnosticObserver(null, v => OnEnded(v.Value)), value);
-
-			private void TrySubscribe(string sourceName, Func<IObserver<KeyValuePair<string, object>>> listener, DiagnosticListener value)
-			{
-				if (value.Name != sourceName)
-					return;
-				var d = value.Subscribe(listener());
-
-				Disposables.Add(d);
-			}
-
-			public void Dispose()
-			{
-				foreach (var d in Disposables)
-				{
-					d.Dispose();
-				}
-			}
-		}
-
-		[U]
-		public async Task DiagnosticListener_AuditTrailIsValid()
-		{
-			using var listener = new TestDiagnosticListener(data =>
-			{
-				var auditTrailEvent = data.AuditTrail[0];
-
-				Assert.True(auditTrailEvent.Ended != default);
-			});
-
-			using var foo = DiagnosticListener.AllListeners.Subscribe(listener);
-
-			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
-			var settings = new ConnectionConfiguration(connectionPool, new InMemoryConnection());
-
-			var client = new OpenSearchLowLevelClient(settings);
-			var person = new { Id = "1" };
-
-			await client.IndexAsync<BytesResponse>("test-index", PostData.Serializable(person));
-		}
-	}
+    internal class TestDiagnosticListener : IObserver<DiagnosticListener>, IDisposable
+    {
+        private ConcurrentBag<IDisposable> Disposables { get; } = new();
+
+        public Action<IApiCallDetails> OnEnded { get; }
+
+        public TestDiagnosticListener(Action<IApiCallDetails> onEnded) => OnEnded = onEnded;
+
+        public void OnError(Exception error) { }
+        public void OnCompleted() { }
+
+        public void OnNext(DiagnosticListener value) =>
+            TrySubscribe(DiagnosticSources.RequestPipeline.SourceName,
+                () => new RequestPipelineDiagnosticObserver(null, v => OnEnded(v.Value)), value);
+
+        private void TrySubscribe(string sourceName, Func<IObserver<KeyValuePair<string, object>>> listener, DiagnosticListener value)
+        {
+            if (value.Name != sourceName)
+                return;
+            var d = value.Subscribe(listener());
+
+            Disposables.Add(d);
+        }
+
+        public void Dispose()
+        {
+            foreach (var d in Disposables)
+            {
+                d.Dispose();
+            }
+        }
+    }
+
+    [U]
+    public async Task DiagnosticListener_AuditTrailIsValid()
+    {
+        using var listener = new TestDiagnosticListener(data =>
+        {
+            var auditTrailEvent = data.AuditTrail[0];
+
+            Assert.True(auditTrailEvent.Ended != default);
+        });
+
+        using var foo = DiagnosticListener.AllListeners.Subscribe(listener);
+
+        var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
+        var settings = new ConnectionConfiguration(connectionPool, new InMemoryConnection());
+
+        var client = new OpenSearchLowLevelClient(settings);
+        var person = new { Id = "1" };
+
+        await client.IndexAsync<BytesResponse>("test-index", PostData.Serializable(person));
+    }
 }

tests/Tests.Reproduce/Tests.Reproduce.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionRoot)\tests\Tests.Core\Tests.Core.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
   </ItemGroup>
 </Project>

tests/Tests/Tests.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionRoot)\tests\Tests.Core\Tests.Core.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="FSharp.Core" Version="8.0.300" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />