Fix 5.x obsolete warnings

src/CodeGeneration/DocGenerator/Buildalyzer/Environment/FrameworkEnvironment.cs

@@ -32,8 +32,6 @@ namespace DocGenerator.Buildalyzer.Environment
 {
 	internal class FrameworkEnvironment : BuildEnvironment
 	{
-		private readonly bool _sdkProject;
-
 		public string ToolsPath { get; }
 		public string ExtensionsPath { get; }
 		public string SDKsPath { get; }

src/Nest/Aggregations/Metric/TopHits/TopHitsAggregation.cs

@@ -124,6 +124,7 @@ public TopHitsAggregationDescriptor<T> Highlight(Func<HighlightDescriptor<T>, IH
 		public TopHitsAggregationDescriptor<T> ScriptFields(Func<ScriptFieldsDescriptor, IPromise<IScriptFields>> scriptFieldsSelector) =>
 			Assign(a => a.ScriptFields = scriptFieldsSelector?.Invoke(new ScriptFieldsDescriptor())?.Value);
 
+		[Obsolete("Removed in NEST 6.x")]
 		public TopHitsAggregationDescriptor<T> FielddataFields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.FielddataFields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 

src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkDeleteResponseItem.cs

@@ -10,7 +10,6 @@ public class BulkDeleteResponseItem : BulkResponseItemBase
 		public override string Operation { get; internal set; }
 
 		[JsonProperty("found")]
-
 		[Obsolete("Removed in 6.0.")]
 		public bool Found { get; internal set; }
 	}

src/Nest/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs

@@ -43,6 +43,7 @@ public partial class PutIndexTemplateDescriptor
 
 		public PutIndexTemplateDescriptor Version(int version) => Assign(a => a.Version = version);
 
+		[Obsolete("Removed in NEST 6.x.")]
 		public PutIndexTemplateDescriptor Template(string template)=> Assign(a => a.Template = template);
 
 		public PutIndexTemplateDescriptor Settings(Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> settingsSelector) =>

src/Nest/Mapping/Types/Properties.cs

@@ -51,6 +51,7 @@ public partial interface IPropertiesDescriptor<T, out TReturnType>
 		TReturnType Date(Func<DatePropertyDescriptor<T>, IDateProperty> selector);
 		TReturnType Boolean(Func<BooleanPropertyDescriptor<T>, IBooleanProperty> selector);
 		TReturnType Binary(Func<BinaryPropertyDescriptor<T>, IBinaryProperty> selector);
+		[Obsolete("Removed in Elasticsearch 6.0, please consider using the ingest-attachment plugin.")]
 		TReturnType Attachment(Func<AttachmentPropertyDescriptor<T>, IAttachmentProperty> selector);
 		TReturnType Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)
 			where TChild : class;
@@ -99,6 +100,7 @@ public PropertiesDescriptor() : base(new Properties<T>()) { }
 
 		public PropertiesDescriptor<T> Binary(Func<BinaryPropertyDescriptor<T>, IBinaryProperty> selector) => SetProperty(selector);
 
+		[Obsolete("Removed in Elasticsearch 6.0, please consider using the ingest-attachment plugin.")]
 		public PropertiesDescriptor<T> Attachment(Func<AttachmentPropertyDescriptor<T>, IAttachmentProperty> selector) => SetProperty(selector);
 
 		public PropertiesDescriptor<T> Object<TChild>(Func<ObjectTypeDescriptor<T, TChild>, IObjectProperty> selector)

src/Nest/Mapping/Types/PropertyJsonConverter.cs

@@ -66,7 +66,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				case FieldType.GeoShape:
 					return jObject.ToObject<GeoShapeProperty>();
 				case FieldType.Attachment:
+#pragma warning disable 618
 					return jObject.ToObject<AttachmentProperty>();
+#pragma warning restore 618
 				case FieldType.Completion:
 					return jObject.ToObject<CompletionProperty>();
 				case FieldType.TokenCount:

src/Nest/Mapping/Visitor/IMappingVisitor.cs

@@ -19,7 +19,9 @@ public interface IMappingVisitor
 		void Visit(IIpProperty property);
 		void Visit(IGeoPointProperty property);
 		void Visit(IGeoShapeProperty property);
+#pragma warning disable 618
 		void Visit(IAttachmentProperty property);
+#pragma warning restore 618
 		void Visit(INumberProperty property);
 		void Visit(ICompletionProperty property);
 		void Visit(IMurmur3HashProperty property);
@@ -64,7 +66,9 @@ public virtual void Visit(IGeoPointProperty property) { }
 
 		public virtual void Visit(IGeoShapeProperty property) { }
 
+#pragma warning disable 618
 		public virtual void Visit(IAttachmentProperty property) { }
+#pragma warning restore 618
 
 		public virtual void Visit(ICompletionProperty property) { }
 

src/Nest/Mapping/Visitor/IPropertyVisitor.cs

@@ -17,7 +17,9 @@ public interface IPropertyVisitor
 		void Visit(IObjectProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 		void Visit(IGeoPointProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 		void Visit(IGeoShapeProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+#pragma warning disable 618
 		void Visit(IAttachmentProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
+#pragma warning restore 618
 		void Visit(ICompletionProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 		void Visit(IIpProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);
 		void Visit(IMurmur3HashProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute);

src/Nest/Mapping/Visitor/MappingWalker.cs

@@ -149,7 +149,9 @@ public void Accept(IProperties properties)
 						});
 						break;
 					case FieldType.Attachment:
+#pragma warning disable 618
 						this.Visit<IAttachmentProperty>(field, t =>
+#pragma warning restore 618
 						{
 							this._visitor.Visit(t);
 							this.Accept(t.Fields);

src/Nest/Mapping/Visitor/NoopPropertyVisitor.cs

@@ -36,9 +36,11 @@ public virtual void Visit(IIpProperty type, PropertyInfo propertyInfo, Elasticse
 		{
 		}
 
+#pragma warning disable 618
 		public virtual void Visit(IAttachmentProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
 		{
 		}
+#pragma warning restore 618
 
 		public virtual void Visit(IGeoPointProperty type, PropertyInfo propertyInfo, ElasticsearchPropertyAttributeBase attribute)
 		{
@@ -100,8 +102,10 @@ public void Visit(IProperty type, PropertyInfo propertyInfo, ElasticsearchProper
 			if (type is IKeywordProperty keywordType)
 				Visit(keywordType, propertyInfo, attribute);
 
+#pragma warning disable 618
 			if (type is IAttachmentProperty attachmentType)
 				Visit(attachmentType, propertyInfo, attribute);
+#pragma warning restore 618
 
 			if (type is IGeoShapeProperty geoShapeType)
 				Visit(geoShapeType, propertyInfo, attribute);

src/Nest/Mapping/Visitor/PropertyWalker.cs

@@ -140,7 +140,9 @@ private IProperty InferProperty(Type type)
 				return new CompletionProperty();
 
 			if (type == typeof(Attachment))
+#pragma warning disable 618
 				return new AttachmentProperty();
+#pragma warning restore 618
 
 			if (type == typeof(DateRange))
 				return new DateRangeProperty();

src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs

@@ -131,6 +131,7 @@ public interface IQueryContainer
 		[JsonProperty("function_score")]
 		IFunctionScoreQuery FunctionScore { get; set; }
 
+		[Obsolete("Removed in NEST 6.x")]
 		[JsonProperty("template")]
 		ITemplateQuery Template { get; set; }
 
@@ -143,6 +144,7 @@ public interface IQueryContainer
 		[JsonProperty("geo_polygon")]
 		IGeoPolygonQuery GeoPolygon { get; set; }
 
+		[Obsolete("Removed in NEST 6.x")]
 		[JsonProperty("geo_distance_range")]
 		IGeoDistanceRangeQuery GeoDistanceRange { get; set; }
 

src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs

@@ -44,11 +44,15 @@ public partial class QueryContainer : IQueryContainer, IDescriptor
 		private IIndicesQuery _indices;
 #pragma warning restore 618
 		private IFunctionScoreQuery _functionScore;
+#pragma warning disable 618
 		private ITemplateQuery _template;
+#pragma warning restore 618
 		private IGeoBoundingBoxQuery _geoBoundingBox;
 		private IGeoDistanceQuery _geoDistance;
 		private IGeoPolygonQuery _geoPolygon;
+#pragma warning disable 618
 		private IGeoDistanceRangeQuery _geoDistanceRange;
+#pragma warning restore 618
 		private IGeoHashCellQuery _geoHashCell;
 		private IScriptQuery _script;
 		private IExistsQuery _exists;
@@ -107,11 +111,15 @@ private T Set<T>(T value) where T : IQuery
 		IIndicesQuery IQueryContainer.Indices { get { return _indices; } set { _indices = Set(value); } }
 #pragma warning restore 618
 		IFunctionScoreQuery IQueryContainer.FunctionScore { get { return _functionScore; } set { _functionScore = Set(value); } }
+#pragma warning disable 618
 		ITemplateQuery IQueryContainer.Template { get { return _template; } set { _template = Set(value); } }
+#pragma warning restore 618
 		IGeoBoundingBoxQuery IQueryContainer.GeoBoundingBox { get { return _geoBoundingBox; } set { _geoBoundingBox = Set(value); } }
 		IGeoDistanceQuery IQueryContainer.GeoDistance { get { return _geoDistance; } set { _geoDistance = Set(value); } }
 		IGeoPolygonQuery IQueryContainer.GeoPolygon { get { return _geoPolygon; } set { _geoPolygon = Set(value); } }
+#pragma warning disable 618
 		IGeoDistanceRangeQuery IQueryContainer.GeoDistanceRange { get { return _geoDistanceRange; } set { _geoDistanceRange = Set(value); } }
+#pragma warning restore 618
 		IGeoHashCellQuery IQueryContainer.GeoHashCell { get { return _geoHashCell; } set { _geoHashCell = Set(value); } }
 		IScriptQuery IQueryContainer.Script { get { return _script; } set { _script = Set(value); } }
 		IExistsQuery IQueryContainer.Exists { get { return _exists; } set { _exists = Set(value); } }

src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs

@@ -245,6 +245,7 @@ public QueryContainer GeoHashCell(Func<GeoHashCellQueryDescriptor<T>, IGeoHashCe
 		/// Matches documents with a geo_point type field to include only those
 		/// that exist within a specific distance range from a given geo_point
 		/// </summary>
+		[Obsolete("Scheduled to be removed in 6.0")]
 		public QueryContainer GeoDistanceRange(Func<GeoDistanceRangeQueryDescriptor<T>, IGeoDistanceRangeQuery> selector) =>
 			WrapInContainer(selector, (query, container) => container.GeoDistanceRange = query);
 

src/Nest/QueryDsl/Compound/Bool/BoolQuery.cs

@@ -56,7 +56,14 @@ public interface IBoolQuery : IQuery
 
 	public class BoolQuery : QueryBase, IBoolQuery
 	{
-		internal static bool Locked(IBoolQuery q) => !q.Name.IsNullOrEmpty() || q.Boost.HasValue || q.DisableCoord.HasValue || q.MinimumShouldMatch != null;
+		internal static bool Locked(IBoolQuery q) =>
+			!q.Name.IsNullOrEmpty() ||
+			q.Boost.HasValue ||
+#pragma warning disable 618
+			q.DisableCoord.HasValue ||
+#pragma warning restore 618
+			q.MinimumShouldMatch != null;
+
 		bool IBoolQuery.Locked => BoolQuery.Locked(this);
 
 		private IList<QueryContainer> _must;

src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs

@@ -260,6 +260,7 @@ public QueryStringQueryDescriptor<T> EnablePositionIncrements(bool? enablePositi
 
 		public QueryStringQueryDescriptor<T> AnalyzeWildcard(bool? analyzeWildcard = true) => Assign(a => a.AnalyzeWildcard = analyzeWildcard);
 
+		[Obsolete("Removed in NEST 6.x.")]
 		public QueryStringQueryDescriptor<T> AutoGeneratePhraseQueries(bool? autoGeneratePhraseQueries = true) =>
 			Assign(a => a.AutoGeneratePhraseQueries = autoGeneratePhraseQueries);
 
@@ -298,6 +299,7 @@ public QueryStringQueryDescriptor<T> QuoteFieldSuffix(string quoteFieldSuffix) =
 
 		public QueryStringQueryDescriptor<T> Escape(bool? escape = true) => Assign(a => a.Escape = escape);
 
+		[Obsolete("Removed in NEST 6.x.")]
 		public QueryStringQueryDescriptor<T> AllFields(bool? allFields = true) => Assign(a => a.AllFields = allFields);
 
 		[Obsolete("Removed in NEST 6.x.")]

src/Nest/QueryDsl/Geo/Distance/GeoDistanceQuery.cs

@@ -14,6 +14,7 @@ public interface IGeoDistanceQuery : IFieldNameQuery
 		Distance Distance { get; set; }
 
 		[JsonProperty("optimize_bbox")]
+		[Obsolete("Scheduled to be removed in 6.0")]
 		GeoOptimizeBBox? OptimizeBoundingBox { get; set; }
 
 		[JsonProperty("distance_type")]
@@ -64,6 +65,7 @@ public class GeoDistanceQueryDescriptor<T>
 		GeoLocation IGeoDistanceQuery.Location { get; set; }
 		Distance IGeoDistanceQuery.Distance { get; set; }
 		GeoDistanceType? IGeoDistanceQuery.DistanceType { get; set; }
+		[Obsolete("Scheduled to be removed in 6.0")]
 		GeoOptimizeBBox? IGeoDistanceQuery.OptimizeBoundingBox { get; set; }
 		bool? IGeoDistanceQuery.Coerce { get; set; }
 		bool? IGeoDistanceQuery.IgnoreMalformed { get; set; }

src/Nest/QueryDsl/Query.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Linq.Expressions;
-
-namespace Nest
+using System;
+using System.Linq.Expressions;
+
+namespace Nest
 {
 	public static class Query<T> where T : class
 	{
@@ -41,6 +41,7 @@ public static QueryContainer GeoBoundingBox(Func<GeoBoundingBoxQueryDescriptor<T
 		public static QueryContainer GeoDistance(Func<GeoDistanceQueryDescriptor<T>, IGeoDistanceQuery> selector) =>
 			new QueryContainerDescriptor<T>().GeoDistance(selector);
 
+		[Obsolete("Scheduled to be removed in 6.0")]
 		public static QueryContainer GeoDistanceRange(Func<GeoDistanceRangeQueryDescriptor<T>, IGeoDistanceRangeQuery> selector) =>
 			new QueryContainerDescriptor<T>().GeoDistanceRange(selector);
 
@@ -117,16 +118,16 @@ public static QueryContainer Nested(Func<NestedQueryDescriptor<T>, INestedQuery>
 		public static QueryContainer ParentId(Func<ParentIdQueryDescriptor<T>, IParentIdQuery> selector) =>
 			new QueryContainerDescriptor<T>().ParentId(selector);
 
-		public static QueryContainer Percolate(Func<PercolateQueryDescriptor<T>, IPercolateQuery> selector) =>
-			new QueryContainerDescriptor<T>().Percolate(selector);
-
-		[Obsolete("Use overload that accepts MultiTermQueryRewrite as an argument")]
-		public static QueryContainer Prefix(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
-			new QueryContainerDescriptor<T>().Prefix(fieldDescriptor, value, boost, rewrite, name);
-
-		public static QueryContainer Prefix(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
-			new QueryContainerDescriptor<T>().Prefix(fieldDescriptor, value, boost, rewrite, name);
-
+		public static QueryContainer Percolate(Func<PercolateQueryDescriptor<T>, IPercolateQuery> selector) =>
+			new QueryContainerDescriptor<T>().Percolate(selector);
+
+		[Obsolete("Use overload that accepts MultiTermQueryRewrite as an argument")]
+		public static QueryContainer Prefix(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
+			new QueryContainerDescriptor<T>().Prefix(fieldDescriptor, value, boost, rewrite, name);
+
+		public static QueryContainer Prefix(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
+			new QueryContainerDescriptor<T>().Prefix(fieldDescriptor, value, boost, rewrite, name);
+
 		[Obsolete("Use overload that accepts MultiTermQueryRewrite as an argument")]
 		public static QueryContainer Prefix(Field field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
 			new QueryContainerDescriptor<T>().Prefix(field, value, boost, rewrite, name);
@@ -138,7 +139,7 @@ public static QueryContainer Prefix(Func<PrefixQueryDescriptor<T>, IPrefixQuery>
 			new QueryContainerDescriptor<T>().Prefix(selector);
 
 		public static QueryContainer QueryString(Func<QueryStringQueryDescriptor<T>, IQueryStringQuery> selector) =>
-			new QueryContainerDescriptor<T>().QueryString(selector);
+			new QueryContainerDescriptor<T>().QueryString(selector);
 
 		public static QueryContainer Range(Func<NumericRangeQueryDescriptor<T>, INumericRangeQuery> selector) =>
 			new QueryContainerDescriptor<T>().Range(selector);
@@ -196,28 +197,28 @@ public static QueryContainer TermRange(Func<TermRangeQueryDescriptor<T>, ITermRa
 			new QueryContainerDescriptor<T>().TermRange(selector);
 
 		public static QueryContainer Terms(Func<TermsQueryDescriptor<T>, ITermsQuery> selector) =>
-			new QueryContainerDescriptor<T>().Terms(selector);
+			new QueryContainerDescriptor<T>().Terms(selector);
 
 		public static QueryContainer Type(Func<TypeQueryDescriptor, ITypeQuery> selector) =>
 			new QueryContainerDescriptor<T>().Type(selector);
 
 		public static QueryContainer Type<TOther>() => Type(q => q.Value<TOther>());
 
 		[Obsolete("Use overload that accepts MultiTermQueryRewrite as an argument")]
-		public static QueryContainer Wildcard(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
-			new QueryContainerDescriptor<T>().Wildcard(fieldDescriptor, value, boost, rewrite, name);
-
-		public static QueryContainer Wildcard(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
-			new QueryContainerDescriptor<T>().Wildcard(fieldDescriptor, value, boost, rewrite, name);
-
-		[Obsolete("Use overload that accepts MultiTermQueryRewrite as an argument")]
-		public static QueryContainer Wildcard(Field field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
-			new QueryContainerDescriptor<T>().Wildcard(field, value, boost, rewrite, name);
-
+		public static QueryContainer Wildcard(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
+			new QueryContainerDescriptor<T>().Wildcard(fieldDescriptor, value, boost, rewrite, name);
+
+		public static QueryContainer Wildcard(Expression<Func<T, object>> fieldDescriptor, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
+			new QueryContainerDescriptor<T>().Wildcard(fieldDescriptor, value, boost, rewrite, name);
+
+		[Obsolete("Use overload that accepts MultiTermQueryRewrite as an argument")]
+		public static QueryContainer Wildcard(Field field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
+			new QueryContainerDescriptor<T>().Wildcard(field, value, boost, rewrite, name);
+
 		public static QueryContainer Wildcard(Field field, string value, double? boost = null, MultiTermQueryRewrite rewrite = null, string name = null) =>
 			new QueryContainerDescriptor<T>().Wildcard(field, value, boost, rewrite, name);
 
 		public static QueryContainer Wildcard(Func<WildcardQueryDescriptor<T>, IWildcardQuery> selector) =>
-			new QueryContainerDescriptor<T>().Wildcard(selector);
-	}
+			new QueryContainerDescriptor<T>().Wildcard(selector);
+	}
 }

src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs

@@ -41,7 +41,11 @@ public class ScriptQuery : QueryBase, IScriptQuery
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Script = this;
 		internal static bool IsConditionless(IScriptQuery q) =>
-			q.Inline.IsNullOrEmpty() && q.Id == null && q.File.IsNullOrEmpty();
+			q.Inline.IsNullOrEmpty() &&
+			q.Id == null &&
+#pragma warning disable 618
+			q.File.IsNullOrEmpty();
+#pragma warning restore 618
 
 	}
 

src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs

@@ -24,7 +24,9 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			writer.WriteStartObject();
 			{
 				if (v.Id != null) writer.WriteProperty(serializer, "id", v.Id);
+#pragma warning disable 618
 				if (v.File != null) writer.WriteProperty(serializer, "file", v.File);
+#pragma warning restore 618
 				if (v.Inline != null) writer.WriteProperty(serializer, "inline", v.Inline);
 				if (v.Lang != null) writer.WriteProperty(serializer, "lang", v.Lang);
 				if (v.Params != null) writer.WriteProperty(serializer, "params", v.Params);
@@ -56,7 +58,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 						r.Id = p.Value.Value<string>();
 						break;
 					case "file":
+#pragma warning disable 618
 						r.File = p.Value.Value<string>();
+#pragma warning restore 618
 						break;
 					case "inline":
 						r.Inline = p.Value.Value<string>();

src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs

@@ -147,13 +147,17 @@ private void Write(string queryType, Field field = null)
 
 		public virtual void Visit(IGeoPolygonQuery query) => Write("geo_polygon");
 
+#pragma warning disable 618
 		public virtual void Visit(IGeoDistanceRangeQuery query) => Write("geo_distance_range");
+#pragma warning restore 618
 
 		public virtual void Visit(IGeoDistanceQuery query) => Write("geo_distance");
 
 		public virtual void Visit(IGeoHashCellQuery filter) => Write("geohash_cell");
 
+#pragma warning disable 618
 		public virtual void Visit(ITemplateQuery query) => Write("template");
+#pragma warning restore 618
 
 		public virtual void Visit(ISpanMultiTermQuery query) => Write("span_multi_term");