Merge remote-tracking branch 'origin/master' into dotnet10/UpdateToPreview

Author: andrewlock

.azure-pipelines/steps/update-github-status-jobs.yml

@@ -66,4 +66,4 @@ jobs:
       parameters:
         checkName: $(System.StageName)
         status: 'failure'
-        description: 'Run failed'
+        description: 'Run failed, please investigate and/or retry this (if flake) via Azure DevOps'

docker-compose.yml

@@ -1184,3 +1184,7 @@ services:
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Strong!Passw0rd
+
+  # keep syncronized image version with tracer\test\Datadog.Trace.TestHelpers.AutoInstrumentation\Containers\AerospikeFixture.cs
+  aerospike:
+    image: aerospike/aerospike-server:6.2.0.6

tracer/build/PackageVersionsLatestMajors.g.props

@@ -61,6 +61,7 @@ static IntegrationMap()
             NugetPackages.Add("Microsoft.VisualStudio.TestPlatform.TestFramework", new [] { "Microsoft.VisualStudio.TestPlatform" });
             NugetPackages.Add("Microsoft.VisualStudio.TestPlatform.Common", new [] { "Microsoft.VisualStudio.TestPlatform" });
             NugetPackages.Add("Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter", new [] { "MSTest.TestAdapter" });
+            NugetPackages.Add("Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices", new [] { "MSTest.TestAdapter" });
             NugetPackages.Add("MySqlConnector", new [] { "MySqlConnector" });
             NugetPackages.Add("MySql.Data", new [] { "MySql.Data" });
             NugetPackages.Add("Npgsql", new [] { "Npgsql" });