[Backport 8.0] Minor API fixes

.ci/DockerFile

@@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=6.0.101
+ARG DOTNET_VERSION=6.0.202
 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
 
 ARG USER_ID

.ci/make.sh

@@ -42,7 +42,7 @@ OUTPUT_DIR="$repo/${output_folder}"
 REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
 mkdir -p "$OUTPUT_DIR"
 
-DOTNET_VERSION=${DOTNET_VERSION-6.0.101}
+DOTNET_VERSION=${DOTNET_VERSION-6.0.202}
 
 echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"

.ci/readme.md

@@ -30,7 +30,7 @@ $ STACK_VERSION=8.0.0-SNAPSHOT ./.ci/run-tests
 |-------------------------|-------------|-------------|
 | `STACK_VERSION` | `N/A`       | The elasticsearch version to target
 | `TEST_SUITE`            | `basic`     | `free` or `platinum` sets which test suite to run and which container to run against. |
-| `DOTNET_VERSION`        | `6.0.101`   | The .NET sdk version used to grab the proper container |
+| `DOTNET_VERSION`        | `6.0.202`   | The .NET sdk version used to grab the proper container |
 
 If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use
 

.ci/run-repository.ps1

@@ -14,7 +14,7 @@ param(
     $NODE_NAME,
 
     [string]
-    $DOTNET_VERSION = "6.0.101"
+    $DOTNET_VERSION = "6.0.202"
 )
 
 $ESC = [char]27

.ci/run-repository.sh

@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 
-DOTNET_VERSION=${DOTNET_VERSION-6.0.101}
+DOTNET_VERSION=${DOTNET_VERSION-6.0.202}
 ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
 elasticsearch_container=${elasticsearch_container-}
 

.ci/run-tests.ps1

@@ -8,7 +8,7 @@ param (
     $TEST_SUITE = "free",
 
     [string]
-    $DOTNET_VERSION = "6.0.101"
+    $DOTNET_VERSION = "6.0.202"
 )
 
 $ESC = [char]27

.ci/test-matrix.yml

@@ -8,6 +8,6 @@ TEST_SUITE:
   - platinum
 
 DOTNET_VERSION:
-  - 6.0.101
+  - 6.0.202
 
 exclude: ~

.github/workflows/integration-jobs.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages

.github/workflows/make-bump.yml

@@ -35,7 +35,7 @@ jobs:
       # Add version and backport labels automatically
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
       - name: Install dotnet-script
         run: dotnet tool install release-notes --tool-path dotnet-tool
 

.github/workflows/make-release-notes.yml

@@ -51,7 +51,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
       - name: Install dotnet-script
         run: dotnet tool install release-notes --tool-path dotnet-tool
 

.github/workflows/stale-jobs.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages

.github/workflows/test-jobs.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages
@@ -53,7 +53,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages

.github/workflows/unified-release.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.101'
+          dotnet-version: '6.0.202'
 
       - run: "./.ci/make.sh assemble ${{ matrix.stack_version }}"
         name: Assemble ${{ matrix.stack_version }}

build/scripts/packages.lock.json

@@ -80,9 +80,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "8GZqv6buY71KQlWT+cl2eMi+aNX9xQ61RgI3Pzv9zPxPOX6tWCLRrBj0MYQ3h871r2RhiHUl7f0AXUD/POr8eA=="
       },
       "Microsoft.NETFramework.ReferenceAssemblies": {
         "type": "Direct",

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "6.0.202",
     "rollForward": "latestPatch",
     "allowPrerelease": false
   },

src/Elastic.Clients.Elasticsearch/Api/SqlQueryResponse.cs

@@ -0,0 +1,15 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// 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 System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch.Sql;
+
+public partial class SqlQueryResponse
+{
+	[JsonInclude]
+	[JsonPropertyName("rows")]
+	public IReadOnlyCollection<SqlRow> Rows { get; init; }
+}

src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs

@@ -187,7 +187,6 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls MachineLearningGetModelSnapshots = new ApiUrls(new[] { "/_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}", "/_ml/anomaly_detectors/{job_id}/model_snapshots" });
 		internal static ApiUrls MachineLearningGetOverallBuckets = new ApiUrls(new[] { "/_ml/anomaly_detectors/{job_id}/results/overall_buckets" });
 		internal static ApiUrls MachineLearningGetRecords = new ApiUrls(new[] { "/_ml/anomaly_detectors/{job_id}/results/records" });
-		internal static ApiUrls MachineLearningGetTrainedModels = new ApiUrls(new[] { "/_ml/trained_models/{model_id}", "/_ml/trained_models" });
 		internal static ApiUrls MachineLearningGetTrainedModelsStats = new ApiUrls(new[] { "/_ml/trained_models/{model_id}/_stats", "/_ml/trained_models/_stats" });
 		internal static ApiUrls MachineLearningInferTrainedModelDeployment = new ApiUrls(new[] { "/_ml/trained_models/{model_id}/deployment/_infer" });
 		internal static ApiUrls MachineLearningInfo = new ApiUrls(new[] { "/_ml/info" });

src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotRestoreRequest.g.cs

@@ -65,6 +65,10 @@ public SnapshotRestoreRequest(Elastic.Clients.Elasticsearch.Name repository, Ela
 		[JsonPropertyName("include_global_state")]
 		public bool? IncludeGlobalState { get; set; }
 
+		[JsonInclude]
+		[JsonPropertyName("index_settings")]
+		public Elastic.Clients.Elasticsearch.IndexManagement.PutSettingsRequest? IndexSettings { get; set; }
+
 		[JsonInclude]
 		[JsonPropertyName("indices")]
 		public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
@@ -118,6 +122,8 @@ public SnapshotRestoreRequestDescriptor Snapshot(Elastic.Clients.Elasticsearch.N
 
 		private bool? IncludeGlobalStateValue { get; set; }
 
+		private Elastic.Clients.Elasticsearch.IndexManagement.PutSettingsRequest? IndexSettingsValue { get; set; }
+
 		private Elastic.Clients.Elasticsearch.Indices? IndicesValue { get; set; }
 
 		private bool? PartialValue { get; set; }
@@ -150,6 +156,12 @@ public SnapshotRestoreRequestDescriptor IncludeGlobalState(bool? includeGlobalSt
 			return Self;
 		}
 
+		public SnapshotRestoreRequestDescriptor IndexSettings(Elastic.Clients.Elasticsearch.IndexManagement.PutSettingsRequest? indexSettings)
+		{
+			IndexSettingsValue = indexSettings;
+			return Self;
+		}
+
 		public SnapshotRestoreRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			IndicesValue = indices;
@@ -201,6 +213,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				writer.WriteBooleanValue(IncludeGlobalStateValue.Value);
 			}
 
+			if (IndexSettingsValue is not null)
+			{
+				writer.WritePropertyName("index_settings");
+				JsonSerializer.Serialize(writer, IndexSettingsValue, options);
+			}
+
 			if (IndicesValue is not null)
 			{
 				writer.WritePropertyName("indices");

src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryResponse.g.cs

@@ -43,9 +43,5 @@ public partial class SqlQueryResponse : ElasticsearchResponseBase
 		[JsonInclude]
 		[JsonPropertyName("is_running")]
 		public bool? IsRunning { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("rows")]
-		public IReadOnlyCollection<IReadOnlyCollection<object>> Rows { get; init; }
 	}
 }