Remove shape query (#6944)

* Remove shape query

* Update to latest 6.x SDK

* Remove test

Author: stevejgordon

.ci/DockerFile

@@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=6.0.401
+ARG DOTNET_VERSION=6.0.403
 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.401}
+DOTNET_VERSION=${DOTNET_VERSION-6.0.403}
 
 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.401`   | The .NET sdk version used to grab the proper container |
+| `DOTNET_VERSION`        | `6.0.403`   | 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.401"
+    $DOTNET_VERSION = "6.0.403"
 )
 
 $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.401}
+DOTNET_VERSION=${DOTNET_VERSION-6.0.403}
 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.401"
+    $DOTNET_VERSION = "6.0.403"
 )
 
 $ESC = [char]27

.ci/test-matrix.yml

@@ -8,6 +8,6 @@ TEST_SUITE:
   - platinum
 
 DOTNET_VERSION:
-  - 6.0.401
+  - 6.0.403
 
 exclude: ~

.github/workflows/integration-jobs.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.401'
+          dotnet-version: '6.0.403'
       - 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.401'
+          dotnet-version: '6.0.403'
       - 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.401'
+          dotnet-version: '6.0.403'
       - 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.401'
+          dotnet-version: '6.0.403'
       - 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.401'
+          dotnet-version: '6.0.403'
       - 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.401'
+          dotnet-version: '6.0.403'
       - 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.401'
+          dotnet-version: '6.0.403'
 
       - run: "./.ci/make.sh assemble ${{ matrix.stack_version }}"
         name: Assemble ${{ matrix.stack_version }}

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.401",
+    "version": "6.0.403",
     "rollForward": "minor",
     "allowPrerelease": false
   },

src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs

@@ -451,62 +451,6 @@ public override void Write(Utf8JsonWriter writer, FieldSortNumericType value, Js
 	}
 }
 
-[JsonConverter(typeof(GeoShapeRelationConverter))]
-public enum GeoShapeRelation
-{
-	[EnumMember(Value = "within")]
-	Within,
-	[EnumMember(Value = "intersects")]
-	Intersects,
-	[EnumMember(Value = "disjoint")]
-	Disjoint,
-	[EnumMember(Value = "contains")]
-	Contains
-}
-
-internal sealed class GeoShapeRelationConverter : JsonConverter<GeoShapeRelation>
-{
-	public override GeoShapeRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		var enumString = reader.GetString();
-		switch (enumString)
-		{
-			case "within":
-				return GeoShapeRelation.Within;
-			case "intersects":
-				return GeoShapeRelation.Intersects;
-			case "disjoint":
-				return GeoShapeRelation.Disjoint;
-			case "contains":
-				return GeoShapeRelation.Contains;
-		}
-
-		ThrowHelper.ThrowJsonException();
-		return default;
-	}
-
-	public override void Write(Utf8JsonWriter writer, GeoShapeRelation value, JsonSerializerOptions options)
-	{
-		switch (value)
-		{
-			case GeoShapeRelation.Within:
-				writer.WriteStringValue("within");
-				return;
-			case GeoShapeRelation.Intersects:
-				writer.WriteStringValue("intersects");
-				return;
-			case GeoShapeRelation.Disjoint:
-				writer.WriteStringValue("disjoint");
-				return;
-			case GeoShapeRelation.Contains:
-				writer.WriteStringValue("contains");
-				return;
-		}
-
-		writer.WriteNullValue();
-	}
-}
-
 [JsonConverter(typeof(HealthStatusConverter))]
 public enum HealthStatus
 {