Update dependencies and configurations (#66)

Mpdreamz · web-flow · commit 34d6e3d65a77 · 2024-10-10T18:31:27.000+02:00
* Update dependencies and configurations

Upgraded several package references and configurations across multiple projects to ensure compatibility and performance. Replaced deprecated syntax, optimized namespaces, and enhanced directory structures for better maintainability.

* Simplify EphemeralCluster configuration

Removed unnecessary commented-out configuration options for clarity. The change ensures the code is more readable and maintainable by using a clean, straightforward cluster configuration.
diff --git a/build/scripts/CommandLine.fs b/build/scripts/CommandLine.fs
@@ -27,10 +27,10 @@ with
     interface IArgParserTemplate with
         member this.Usage =
             match this with
-            | Clean _ -> "clean known output locations"
-            | Build _ -> "Run build and tests"
-            | Release _ -> "runs build, and create an validates the packages shy of publishing them"
-            | Publish _ -> "Runs the full release"
+            | Clean -> "clean known output locations"
+            | Build -> "Run build and tests"
+            | Release -> "runs build, and create an validates the packages shy of publishing them"
+            | Publish -> "Runs the full release"
             
             | SingleTarget _ -> "Runs the provided sub command without running their dependencies"
             | Token _ -> "Token to be used to authenticate with github"
diff --git a/examples/Elastic.Ephemeral.Example/Program.cs b/examples/Elastic.Ephemeral.Example/Program.cs
@@ -11,7 +11,7 @@
 using HttpMethod = Elastic.Transport.HttpMethod;
 
 
-var config = new EphemeralClusterConfiguration("8.7.0", XPack | Security | SSL);
+var config = new EphemeralClusterConfiguration("8.15.0");
 using var cluster = new EphemeralCluster(config);
 
 var exitEvent = new ManualResetEvent(false);
diff --git a/examples/Elastic.Managed.Example/Program.cs b/examples/Elastic.Managed.Example/Program.cs
@@ -3,22 +3,26 @@
 // See the LICENSE file in the project root for more information
 
 using System;
+using System.IO;
 using Elastic.Elasticsearch.Managed;
 using Elastic.Elasticsearch.Managed.Configuration;
 using Elastic.Elasticsearch.Managed.ConsoleWriters;
+using Elastic.Stack.ArtifactsApi;
+using Elastic.Stack.ArtifactsApi.Products;
 
 namespace Elastic.Managed.Example
 {
 	public static class Program
 	{
 		public static void Main(string[] args)
 		{
-			var version = "6.3.0";
-			var esHome =
-				Environment.ExpandEnvironmentVariables(
-					$@"%LOCALAPPDATA%\ElasticManaged\{version}\elasticsearch-{version}");
+			ElasticVersion version = "latest-8";
+			var folderName = version.Artifact(Product.Elasticsearch).LocalFolderName;
 
-			var clusterConfiguration = new ClusterConfiguration(version, esHome, 2);
+			var temp = Path.Combine(Path.GetTempPath(), "elastic", folderName, "my-cluster");
+			var home = Path.Combine(temp, "home");
+
+			var clusterConfiguration = new ClusterConfiguration(version, home, 2);
 			using (var cluster = new ElasticsearchCluster(clusterConfiguration))
 				cluster.Start(new ConsoleLineWriter(), TimeSpan.FromMinutes(2));
 
diff --git a/examples/Elastic.Xunit.ExampleComplex/Clusters.cs b/examples/Elastic.Xunit.ExampleComplex/Clusters.cs
@@ -12,11 +12,10 @@ namespace Elastic.Xunit.ExampleComplex
 {
 	internal static class EphemeralClusterExtensions
 	{
-		private static readonly ConcurrentDictionary<IEphemeralCluster, IElasticClient> Clients =
-			new ConcurrentDictionary<IEphemeralCluster, IElasticClient>();
+		private static readonly ConcurrentDictionary<IEphemeralCluster, IElasticClient> Clients = new();
 
 		public static IElasticClient GetOrAddClient(this IEphemeralCluster cluster) =>
-			Clients.GetOrAdd(cluster, (c) =>
+			Clients.GetOrAdd(cluster, c =>
 			{
 				var connectionPool = new StaticConnectionPool(c.NodesUris());
 				var settings = new ConnectionSettings(connectionPool);
@@ -30,15 +29,11 @@ public interface IMyCluster
 		IElasticClient Client { get; }
 	}
 
-	public abstract class MyClusterBase : XunitClusterBase, IMyCluster
+	public abstract class MyClusterBase() : XunitClusterBase(new XunitClusterConfiguration(MyRunOptions.TestVersion)
+	{
+		ShowElasticsearchOutputAfterStarted = false,
+	}), IMyCluster
 	{
-		protected MyClusterBase() : base(new XunitClusterConfiguration(MyRunOptions.TestVersion)
-		{
-			ShowElasticsearchOutputAfterStarted = false,
-		})
-		{
-		}
-
 		public IElasticClient Client => this.GetOrAddClient();
 	}
 
diff --git a/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj b/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/examples/Elastic.Xunit.ExampleComplex/Tests.cs b/examples/Elastic.Xunit.ExampleComplex/Tests.cs
@@ -2,11 +2,9 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Elastic.Elasticsearch.Managed;
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Xunit;
 
 namespace Elastic.Xunit.ExampleComplex
 {
diff --git a/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj b/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj
@@ -4,8 +4,8 @@
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/examples/Elastic.Xunit.ExampleMinimal/ExampleTest.cs b/examples/Elastic.Xunit.ExampleMinimal/ExampleTest.cs
@@ -21,7 +21,7 @@ public class MyTestCluster : XunitClusterBase
 		///     We pass our configuration instance to the base class.
 		///     We only configure it to run version 6.2.3 here but lots of additional options are available.
 		/// </summary>
-		public MyTestCluster() : base(new XunitClusterConfiguration("latest-8") { })
+		public MyTestCluster() : base(new XunitClusterConfiguration("latest-8"))
 		{
 		}
 	}
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.302",
+    "version": "8.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -33,6 +33,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" PrivateAssets="All" />
+    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj b/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj
@@ -7,9 +7,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net461'" Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Elasticsearch.Managed\Elastic.Elasticsearch.Managed.csproj" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
 </Project>
diff --git a/src/Elastic.Elasticsearch.Managed/ClusterBase.cs b/src/Elastic.Elasticsearch.Managed/ClusterBase.cs
@@ -53,12 +53,8 @@ public interface ICluster<out TConfiguration> : ICluster,IDisposable
 	}
 
 
-	public abstract class ClusterBase : ClusterBase<ClusterConfiguration>
-	{
-		protected ClusterBase(ClusterConfiguration clusterConfiguration) : base(clusterConfiguration)
-		{
-		}
-	}
+	public abstract class ClusterBase(ClusterConfiguration clusterConfiguration)
+		: ClusterBase<ClusterConfiguration>(clusterConfiguration);
 
 	public abstract class ClusterBase<TConfiguration> : ICluster<TConfiguration>
 		where TConfiguration : IClusterConfiguration<NodeFileSystem>
diff --git a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj
@@ -10,8 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Proc" Version="0.6.1" />
-    <!--<ProjectReference Include="..\..\..\..\proc\src\Proc\Proc.csproj" />-->
-    <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj" />
diff --git a/src/Elastic.Elasticsearch.Managed/ElasticsearchCluster.cs b/src/Elastic.Elasticsearch.Managed/ElasticsearchCluster.cs
@@ -4,12 +4,7 @@
 
 using Elastic.Elasticsearch.Managed.Configuration;
 
-namespace Elastic.Elasticsearch.Managed
-{
-	public class ElasticsearchCluster : ClusterBase
-	{
-		public ElasticsearchCluster(ClusterConfiguration clusterConfiguration) : base(clusterConfiguration)
-		{
-		}
-	}
-}
+namespace Elastic.Elasticsearch.Managed;
+
+public class ElasticsearchCluster(ClusterConfiguration clusterConfiguration)
+	: ClusterBase(clusterConfiguration);
diff --git a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Nullean.Xunit.Partitions" Version="0.5.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj" />
diff --git a/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj b/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj
@@ -7,7 +7,12 @@
     
     <ItemGroup>
         <PackageReference Include="SemanticVersioning" Version="1.3.0" />
-        <PackageReference Include="System.Text.Json" Version="4.6.0" />
+        <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    </ItemGroup>
+    
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+      <Reference Include="System.Net.Http" />
+      <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Elastic.Stack.ArtifactsApi/Resolvers/SnapshotApiResolver.cs b/src/Elastic.Stack.ArtifactsApi/Resolvers/SnapshotApiResolver.cs
@@ -18,8 +18,8 @@ namespace Elastic.Stack.ArtifactsApi.Resolvers
 {
 	public static class SnapshotApiResolver
 	{
-		public static readonly System.Lazy<IReadOnlyCollection<Version>> AvailableVersions =
-			new System.Lazy<IReadOnlyCollection<Version>>(LoadVersions, LazyThreadSafetyMode.ExecutionAndPublication);
+		public static readonly Lazy<IReadOnlyCollection<Version>> AvailableVersions =
+			new(LoadVersions, LazyThreadSafetyMode.ExecutionAndPublication);
 
 		private static Regex PackageProductRegex { get; } =
 			new Regex(@"(.*?)-(\d+\.\d+\.\d+(?:-(?:SNAPSHOT|alpha\d+|beta\d+|rc\d+))?)");
diff --git a/src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj b/src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj
@@ -11,6 +11,6 @@
     <!--<PackageReference Include="TypeLite" Version="1.1.0" />-->
     <Reference Include="TypeLite.dll" />
     <PackageReference Include="NEST" Version="7.7.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@ namespace Elastic.Xunit.ExampleComplex`
`12`	`12`	`{`
`13`	`13`	`internal static class EphemeralClusterExtensions`
`14`	`14`	`{`
`15`		`- private static readonly ConcurrentDictionary<IEphemeralCluster, IElasticClient> Clients =`
`16`		`- new ConcurrentDictionary<IEphemeralCluster, IElasticClient>();`
	`15`	`+ private static readonly ConcurrentDictionary<IEphemeralCluster, IElasticClient> Clients = new();`
`17`	`16`
`18`	`17`	`public static IElasticClient GetOrAddClient(this IEphemeralCluster cluster) =>`
`19`		`- Clients.GetOrAdd(cluster, (c) =>`
	`18`	`+ Clients.GetOrAdd(cluster, c =>`
`20`	`19`	`{`
`21`	`20`	`var connectionPool = new StaticConnectionPool(c.NodesUris());`
`22`	`21`	`var settings = new ConnectionSettings(connectionPool);`
`@@ -30,15 +29,11 @@ public interface IMyCluster`
`30`	`29`	`IElasticClient Client { get; }`
`31`	`30`	`}`
`32`	`31`
`33`		`- public abstract class MyClusterBase : XunitClusterBase, IMyCluster`
	`32`	`+ public abstract class MyClusterBase() : XunitClusterBase(new XunitClusterConfiguration(MyRunOptions.TestVersion)`
	`33`	`+ {`
	`34`	`+ ShowElasticsearchOutputAfterStarted = false,`
	`35`	`+ }), IMyCluster`
`34`	`36`	`{`
`35`		`- protected MyClusterBase() : base(new XunitClusterConfiguration(MyRunOptions.TestVersion)`
`36`		`- {`
`37`		`- ShowElasticsearchOutputAfterStarted = false,`
`38`		`- })`
`39`		`- {`
`40`		`- }`
`41`		`-`
`42`	`37`	`public IElasticClient Client => this.GetOrAddClient();`
`43`	`38`	`}`
`44`	`39`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class MyTestCluster : XunitClusterBase`
`21`	`21`	`/// We pass our configuration instance to the base class.`
`22`	`22`	`/// We only configure it to run version 6.2.3 here but lots of additional options are available.`
`23`	`23`	`/// </summary>`
`24`		`- public MyTestCluster() : base(new XunitClusterConfiguration("latest-8") { })`
	`24`	`+ public MyTestCluster() : base(new XunitClusterConfiguration("latest-8"))`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.302",`
	`3`	`+ "version": "8.0.100",`
`4`	`4`	`"rollForward": "latestFeature",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`