diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000000..b5814ac7df2
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,59 @@
+# 7.x
+
+## 7.17.0 [2022-02-01]
+
+https://github.com/elastic/elasticsearch-net/compare/7.16.0...7.17.0
+
+## Features & Enhancements
+
+- #6070 Add `IgnoreUnmapped` to `GeoDistanceQuery`, `GeoBoundingBoxQuery` and `GeoPolygon` (issue: #6066)
+- #6094 Add shard_stats to primary index stats (issue: #6079)
+- #6101 Support index template v2 APIs in NEST
+
+## Bug Fixes
+
+- #6085 Support version on ingest pipelines (issue: #6082)
+- #6088 Add missing fields for `IpProperty` (issue: #6067)
+- #6090 Support deserialisation of simple scripts (issue: #5684)
+- #6091 Add missing `TermVectorOption` (issue: #6078)
+- #6095 Update boxplot to handle non-numeric values (issue: #6050)
+- #6098 Move explain to body in search template API (issue: #5040)
+
+## Breaking Changes
+
+To align with naming elsewhere during the implementation of NEST APIs for index template v2, some of the low-level client types and methods have been renamed:
+- ExistsIndexTemplateRequestParameters => IndexTemplateV2ExistsRequestParameters
+- ExistsTemplateForAll => TemplateV2ExistsForAll
+- ExistsTemplateForAllAsync => TemplateV2ExistsForAllAsync
+
+## 7.16.0 [2021-12-08]
+
+https://github.com/elastic/elasticsearch-net/compare/7.15.2...7.16.0
+
+## Enhancements
+
+- #6023 Add Component template APIs (issues: #4748, #4718)
+- #6024 Support configuring a certificate fingerprint
+- #6031 Add inference processor (issues: #4412, #4341)
+
+## Bugs
+
+- #6055 Fix cleanup repository patch and regen LL code (issue: #6054)
+
+## 7.15.2 [2021-10-28]
+
+https://github.com/elastic/elasticsearch-net/compare/7.15.1...7.15.2
+
+## Bug Fixes
+
+- #6038 Support `wildcard` field in `WildcardQuery` (issue: #6033)
+- #6042 Support deprecated range query properties
+
+## 7.15.1 [2021-10-21]
+
+https://github.com/elastic/elasticsearch-net/compare/7.15.0...7.15.1
+
+## Enhancements
+
+- #6025 Add experimental config to disable TLS1.3
+- #6027 Support params on SQL query & translate APIs (issue: #6022)
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.txt b/CODE_OF_CONDUCT.txt
new file mode 100644
index 00000000000..6e06986b868
--- /dev/null
+++ b/CODE_OF_CONDUCT.txt
@@ -0,0 +1 @@
+See: https://www.elastic.co/community/codeofconduct
\ No newline at end of file
diff --git a/contributing.md b/CONTRIBUTING.md
similarity index 100%
rename from contributing.md
rename to CONTRIBUTING.md
diff --git a/Elasticsearch.sln b/Elasticsearch.sln
index 3d06d64c6ce..92eeb068ebd 100644
--- a/Elasticsearch.sln
+++ b/Elasticsearch.sln
@@ -33,15 +33,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.gitignore = .gitignore
build.bat = build.bat
build.sh = build.sh
- contributing.md = contributing.md
+ CONTRIBUTING.md = CONTRIBUTING.md
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
dotnet-tools.json = dotnet-tools.json
global.json = global.json
issue_template.md = issue_template.md
- license.txt = license.txt
+ LICENSE.txt = LICENSE.txt
nuget.config = nuget.config
- readme.md = readme.md
+ README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsearch", "src\Elastic.Clients.Elasticsearch\Elastic.Clients.Elasticsearch.csproj", "{F8A7E60C-0C48-4D76-AF7F-7881DF5A263D}"
diff --git a/license.txt b/LICENSE.txt
similarity index 100%
rename from license.txt
rename to LICENSE.txt
diff --git a/NOTICE.txt b/NOTICE.txt
index 4c8a4135e63..6cff923273c 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,31 +1,2 @@
Elasticsearch .NET clients
-Copyright 2012-2021 Elasticsearch B.V.
-
-==========
-Notice for: Utf8Json
-----------
-Based on the Utf8Json project by Yoshifumi Kawai,
-licensed under the MIT license. https://github.com/neuecc/Utf8Json/
-
-MIT License
-
-Copyright (c) 2017 Yoshifumi Kawai
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+Copyright 2012-2022 Elasticsearch B.V.
diff --git a/readme.md b/README.md
similarity index 99%
rename from readme.md
rename to README.md
index f6bee8f6a3d..b844db4ac5f 100644
--- a/readme.md
+++ b/README.md
@@ -359,4 +359,4 @@ A small HTTP server will be spun up locally on port 8000 through which you can v
This software is Copyright (c) 2014-2021 by Elasticsearch BV.
-This is free software, licensed under: [The Apache License Version 2.0](https://github.com/elastic/elasticsearch-net/blob/main/license.txt).
+This is free software, licensed under: [The Apache License Version 2.0](https://github.com/elastic/elasticsearch-net/blob/main/LICENSE.txt).
diff --git a/src/_PublishArtifacts.Build.props b/src/_PublishArtifacts.Build.props
index 2d9913a49e0..f724b2e2522 100644
--- a/src/_PublishArtifacts.Build.props
+++ b/src/_PublishArtifacts.Build.props
@@ -15,9 +15,9 @@
True
nuget-icon.png
-
+
True
- license.txt
+ LICENSE.txt