Re-add minimal Tests project

Author: Mpdreamz

Elasticsearch.sln

@@ -11,6 +11,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground", "src\Playground\Playground.csproj", "{8F2EA767-8746-4816-B6EE-342BCB8F1AAB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{362B2776-4B29-46AB-B237-56776B5372B6}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Directory.Build.props = tests\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Core", "tests\Tests.Core\Tests.Core.csproj", "{70225C3F-393A-40F5-A778-8FF71A38C4C0}"
 EndProject
@@ -58,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsear
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsearch.Serverless", "src\Elastic.Clients.Elasticsearch.Serverless\Elastic.Clients.Elasticsearch.Serverless.csproj", "{49D7F5A7-AA32-492B-B957-0E3325861F55}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "tests\Tests\Tests.csproj", "{6FD804B2-CE80-41CB-A411-2023F34C18FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -112,6 +117,10 @@ Global
 		{49D7F5A7-AA32-492B-B957-0E3325861F55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49D7F5A7-AA32-492B-B957-0E3325861F55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49D7F5A7-AA32-492B-B957-0E3325861F55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FD804B2-CE80-41CB-A411-2023F34C18FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FD804B2-CE80-41CB-A411-2023F34C18FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FD804B2-CE80-41CB-A411-2023F34C18FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FD804B2-CE80-41CB-A411-2023F34C18FE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -129,6 +138,7 @@ Global
 		{F6162603-D134-4121-8106-2BA4DAD7350B} = {362B2776-4B29-46AB-B237-56776B5372B6}
 		{8C9275D9-29CE-4A20-8FD5-6B26C6CAAADB} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
 		{49D7F5A7-AA32-492B-B957-0E3325861F55} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
+		{6FD804B2-CE80-41CB-A411-2023F34C18FE} = {362B2776-4B29-46AB-B237-56776B5372B6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CE74F821-B001-4C69-A58D-CF81F8B0B632}

build/scripts/Paths.fs

@@ -17,9 +17,10 @@ module Paths =
     let Output(folder) = sprintf "%s/%s" BuildOutput folder
 
     let InplaceBuildOutput project tfm = 
-        sprintf "src/%s/bin/Release/%s" project tfm
+        //sprintf "src/%s/bin/Release/%s" project tfm
+        sprintf ".artifacts/bin/%s/release_%s" project tfm
     let InplaceBuildTestOutput project tfm = 
-        sprintf "tests/%s/bin/Release/%s" project tfm
+        sprintf "artifacts/bin/%s/release_%s" project tfm
     let MagicDocumentationFile  = 
         "src/Elasticsearch.Net/obj/Release/netstandard2.1/Elasticsearch.Net.csprojAssemblyReference.cache" 
 

tests/Directory.Build.props

@@ -4,7 +4,4 @@
     <!-- CAC001: We dont want to set ConfigureAwait() in tests, assume who evers calling our lib doesn't do this either.-->
     <NoWarn>CAC001</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TestPackageVersion)'!=''">
-    <RestoreSources>$(SolutionRoot)/build/output;https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
 </Project>

tests/Tests/Aggregations/Metric/GeoCentroidAggregationUsageTests.cs

@@ -8,7 +8,6 @@
 using Tests.Domain;
 using Tests.Core.Extensions;
 using Tests.Framework.EndpointTests.TestState;
-using Elastic.Clients.Elasticsearch.Experimental;
 using Elastic.Clients.Elasticsearch.QueryDsl;
 
 namespace Tests.Aggregations.Metric;

tests/Tests/ClientConcepts/OpenTelemetry/OpenTelemetryTests.cs

@@ -4,6 +4,8 @@
 
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
+using FluentAssertions;
 using Tests.Core.Client;
 using Tests.Domain;
 using Xunit;
@@ -36,7 +38,7 @@ public async Task BasicOpenTelemetryTest()
 
 		VerifyActivity(oTelActivity, "ping");
 
-		await client.SearchAsync<Project>(s => s.Index("test").Query(q => q.MatchAll()));
+		await client.SearchAsync<Project>(s => s.Index("test").Query(q => q.MatchAll(m => { })));
 
 		VerifyActivity(oTelActivity, "search", "http://localhost:9200/test/_search?pretty=true&error_trace=true");
 

tests/Tests/QueryDsl/BoolDsl/OperatorUsageBase.cs

@@ -25,7 +25,7 @@ protected static void ReturnsBool(Query combined, Action<BoolQuery> boolQueryAss
 		boolQueryAssert(boolQuery);
 	}
 
-	protected static void ReturnsSingleQuery<T>(Query combined, Action<T> queryAssert) where T : SearchQuery
+	protected static void ReturnsSingleQuery<T>(Query combined, Action<T> queryAssert) where T : Query
 	{
 		combined.Should().NotBeNull();
 		combined.TryGet<T>(out var query).Should().BeTrue();

tests/Tests/Tests.csproj

@@ -33,4 +33,9 @@
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
+  <ItemGroup>
+    <!-- TODO ADD THESE BACK -->
+    <Compile Remove="**" />
+    <Compile Include="ClientConcepts\OpenTelemetry\OpenTelemetryTests.cs" />
+  </ItemGroup>
 </Project>