From e4ca10865699155ff90e02e9b0c54b6af8a3db00 Mon Sep 17 00:00:00 2001 From: Thomas Farr Date: Tue, 10 Dec 2024 10:23:14 +1300 Subject: [PATCH] [Backport 1.x] Dependabot updates (#869) * Bump FSharp.Core and Argu (#866) * Bump FSharp.Core and Argu Bumps [FSharp.Core](https://github.com/dotnet/fsharp) and [Argu](https://github.com/fsprojects/Argu). These dependencies needed to be updated together. Updates `FSharp.Core` from 8.0.401 to 6.0.0 - [Release notes](https://github.com/dotnet/fsharp/releases) - [Changelog](https://github.com/dotnet/fsharp/blob/main/release-notes.md) - [Commits](https://github.com/dotnet/fsharp/commits) Updates `Argu` from 6.2.4 to 6.2.5 - [Release notes](https://github.com/fsprojects/Argu/releases) - [Changelog](https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/fsprojects/Argu/compare/6.2.4...6.2.5) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: FSharp.Core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Argu dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * changelog Signed-off-by: Thomas Farr --------- Signed-off-by: dependabot[bot] Signed-off-by: Thomas Farr Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Farr (cherry picked from commit 00a9fec21d984017fa42e404b79a6d6217afddae) * Bump AWSSDK.Core from 3.7.400.47 to 3.7.400.59 (#867) * Bump AWSSDK.Core from 3.7.400.47 to 3.7.400.59 Bumps [AWSSDK.Core](https://github.com/aws/aws-sdk-net) from 3.7.400.47 to 3.7.400.59. - [Release notes](https://github.com/aws/aws-sdk-net/releases) - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: AWSSDK.Core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] (cherry picked from commit c95de74a1534a51e122a307bfbcd3e42adfefd70) * Bump CSharpier.Core, System.Text.Encodings.Web and System.Text.Json (#863) * Bump CSharpier.Core, System.Text.Encodings.Web and System.Text.Json Bumps [CSharpier.Core](https://github.com/belav/csharpier), [System.Text.Encodings.Web](https://github.com/dotnet/runtime) and [System.Text.Json](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `CSharpier.Core` from 0.29.2 to 0.30.2 - [Release notes](https://github.com/belav/csharpier/releases) - [Changelog](https://github.com/belav/csharpier/blob/main/CHANGELOG.md) - [Commits](https://github.com/belav/csharpier/compare/0.29.2...0.30.2) Updates `System.Text.Encodings.Web` from 8.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v8.0.0) Updates `System.Text.Json` from 8.0.5 to 8.0.5 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.5...v8.0.5) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: CSharpier.Core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: System.Text.Encodings.Web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: System.Text.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * changelog Signed-off-by: Thomas Farr * re-run codegen Signed-off-by: Thomas Farr --------- Signed-off-by: dependabot[bot] Signed-off-by: Thomas Farr Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Farr (cherry picked from commit b514527cc1529cb089dc049941c07b187c0a8656) * Bump Newtonsoft.Json and NSwag.Core (#862) * Bump Newtonsoft.Json and NSwag.Core Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) and [NSwag.Core](https://github.com/RicoSuter/NSwag). These dependencies needed to be updated together. Updates `Newtonsoft.Json` from 13.0.3 to 13.0.3 - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.3...13.0.3) Updates `NSwag.Core` from 14.1.0 to 14.2.0 - [Release notes](https://github.com/RicoSuter/NSwag/releases) - [Changelog](https://github.com/RicoSuter/NSwag/blob/master/CHANGELOG.md) - [Commits](https://github.com/RicoSuter/NSwag/compare/v14.1.0...v14.2.0) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: NSwag.Core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * changelog Signed-off-by: Thomas Farr --------- Signed-off-by: dependabot[bot] Signed-off-by: Thomas Farr Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Farr (cherry picked from commit 6f4134a10fadf0c5ee292c4c52d7dfcbee766481) * Bump System.Buffers from 4.5.1 to 4.6.0 (#856) * Bump System.Buffers from 4.5.1 to 4.6.0 Bumps [System.Buffers](https://github.com/dotnet/maintenance-packages) from 4.5.1 to 4.6.0. - [Release notes](https://github.com/dotnet/maintenance-packages/releases) - [Commits](https://github.com/dotnet/maintenance-packages/commits) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: System.Buffers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] (cherry picked from commit c0587ded702503547c032e4b5e9ae890aafc4f6d) * Bump YamlDotNet from 16.1.3 to 16.2.0 (#851) * Bump YamlDotNet from 16.1.3 to 16.2.0 Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 16.1.3 to 16.2.0. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v16.1.3...v16.2.0) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] (cherry picked from commit aed48ab379c344a5627c433d9c647b22c387e2a2) * Bump xunit from 2.8.0 to 2.9.2 (#850) * Bump xunit from 2.8.0 to 2.9.2 Bumps [xunit](https://github.com/xunit/xunit) from 2.8.0 to 2.9.2. - [Commits](https://github.com/xunit/xunit/compare/v2-2.8.0...v2-2.9.2) Signed-off-by: Thomas Farr --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] (cherry picked from commit a1afc8db890a847e72d72e04429fc4ec9d8f1fd7) * Revert "Bump System.Buffers from 4.5.1 to 4.6.0 (#856)" This reverts commit f8a2158dd6d6e8bd988ccc2e1b547165cbec6eae. Signed-off-by: Thomas Farr --------- Signed-off-by: Thomas Farr Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- CHANGELOG.md | 11 ++- .../OpenSearch.OpenSearch.Xunit.csproj | 2 +- src/ApiGenerator/ApiGenerator.csproj | 6 +- .../_Generated/ApiUrlsLookup.cs | 75 +++++++++++-------- .../OpenSearch.Net.Auth.AwsSigV4.csproj | 2 +- tests/Tests.Core/Tests.Core.csproj | 2 +- .../Tests.YamlRunner/Tests.YamlRunner.fsproj | 2 +- 7 files changed, 59 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5ebd1cf7c..860850ed8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added ### Dependencies -- Bumps `YamlDotNet` from 16.0.0 to 16.1.3 -- Bumps `AWSSDK.Core` from 3.7.400.11 to 3.7.400.45 +- Bumps `YamlDotNet` from 16.0.0 to 16.2.0 +- Bumps `AWSSDK.Core` from 3.7.400.11 to 3.7.400.59 - Bumps `Fake.Core.SemVer` from 6.1.0 to 6.1.3 - Bumps `Bogus` from 35.6.0 to 35.6.1 - Bumps `Fake.Core.Environment` from 6.1.0 to 6.1.3 @@ -17,12 +17,15 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `Fake.IO.FileSystem` from 6.1.0 to 6.1.3 - Bumps `Fake.IO.Zip` from 6.1.0 to 6.1.3 - Bumps `Fake.Tools.Git` from 6.1.0 to 6.1.3 -- Bumps `CSharpier.Core` from 0.29.1 to 0.29.2 +- Bumps `CSharpier.Core` from 0.29.1 to 0.30.2 - Bumps `Proc` from 0.8.1 to 0.8.2 - Bumps `System.Text.Json` from 8.0.4 to 8.0.5 - Bumps `JunitXml.TestLogger` from 4.0.254 to 4.1.0 - Bumps `FSharp.Core` from 8.0.400 to 8.0.401 - Bumps `JetBrains.Annotations` from 2024.2.0 to 2024.3.0 +- Bumps `xunit` from 2.8.0 to 2.9.2 +- Bumps `NSwag.Core` from 14.1.0 to 14.2.0 +- Bumps `Argu` from 6.2.4 to 6.2.5 ## [1.8.0] ### Added @@ -215,4 +218,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) [1.6.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...v1.6.0 [1.5.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.4.0...v1.5.0 [1.4.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.3.0...v1.4.0 -[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0 \ No newline at end of file +[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0 diff --git a/abstractions/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj b/abstractions/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj index 5a67b8c78b..bb844416a1 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj +++ b/abstractions/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj @@ -8,7 +8,7 @@ true - + diff --git a/src/ApiGenerator/ApiGenerator.csproj b/src/ApiGenerator/ApiGenerator.csproj index ba66810b43..3e5fcc7fde 100644 --- a/src/ApiGenerator/ApiGenerator.csproj +++ b/src/ApiGenerator/ApiGenerator.csproj @@ -9,11 +9,11 @@ true - + - - + + diff --git a/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs b/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs index 9d021a30da..7dc7f0cba9 100644 --- a/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs +++ b/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs @@ -45,51 +45,66 @@ namespace OpenSearch.Client { internal static partial class ApiUrlsLookups { - internal static readonly ApiUrls CatAllPitSegments = - new(new[] { "_cat/pit_segments/_all" }); + internal static readonly ApiUrls CatAllPitSegments = new( + new[] { "_cat/pit_segments/_all" } + ); internal static readonly ApiUrls CatPitSegments = new(new[] { "_cat/pit_segments" }); - internal static readonly ApiUrls CatSegmentReplication = - new(new[] { "_cat/segment_replication", "_cat/segment_replication/{index}" }); + internal static readonly ApiUrls CatSegmentReplication = new( + new[] { "_cat/segment_replication", "_cat/segment_replication/{index}" } + ); - internal static readonly ApiUrls ClusterDeleteComponentTemplate = - new(new[] { "_component_template/{name}" }); + internal static readonly ApiUrls ClusterDeleteComponentTemplate = new( + new[] { "_component_template/{name}" } + ); - internal static readonly ApiUrls ClusterComponentTemplateExists = - new(new[] { "_component_template/{name}" }); + internal static readonly ApiUrls ClusterComponentTemplateExists = new( + new[] { "_component_template/{name}" } + ); - internal static readonly ApiUrls ClusterGetComponentTemplate = - new(new[] { "_component_template", "_component_template/{name}" }); + internal static readonly ApiUrls ClusterGetComponentTemplate = new( + new[] { "_component_template", "_component_template/{name}" } + ); - internal static readonly ApiUrls ClusterPutComponentTemplate = - new(new[] { "_component_template/{name}" }); + internal static readonly ApiUrls ClusterPutComponentTemplate = new( + new[] { "_component_template/{name}" } + ); - internal static readonly ApiUrls NoNamespaceCreatePit = - new(new[] { "{index}/_search/point_in_time" }); + internal static readonly ApiUrls NoNamespaceCreatePit = new( + new[] { "{index}/_search/point_in_time" } + ); - internal static readonly ApiUrls NoNamespaceDeleteAllPits = - new(new[] { "_search/point_in_time/_all" }); + internal static readonly ApiUrls NoNamespaceDeleteAllPits = new( + new[] { "_search/point_in_time/_all" } + ); - internal static readonly ApiUrls NoNamespaceDeletePit = - new(new[] { "_search/point_in_time" }); + internal static readonly ApiUrls NoNamespaceDeletePit = new( + new[] { "_search/point_in_time" } + ); - internal static readonly ApiUrls NoNamespaceGetAllPits = - new(new[] { "_search/point_in_time/_all" }); + internal static readonly ApiUrls NoNamespaceGetAllPits = new( + new[] { "_search/point_in_time/_all" } + ); - internal static readonly ApiUrls IndicesDeleteComposableTemplate = - new(new[] { "_index_template/{name}" }); + internal static readonly ApiUrls IndicesDeleteComposableTemplate = new( + new[] { "_index_template/{name}" } + ); - internal static readonly ApiUrls IndicesComposableTemplateExists = - new(new[] { "_index_template/{name}" }); + internal static readonly ApiUrls IndicesComposableTemplateExists = new( + new[] { "_index_template/{name}" } + ); - internal static readonly ApiUrls IndicesGetComposableTemplate = - new(new[] { "_index_template", "_index_template/{name}" }); + internal static readonly ApiUrls IndicesGetComposableTemplate = new( + new[] { "_index_template", "_index_template/{name}" } + ); - internal static readonly ApiUrls IndicesPutComposableTemplate = - new(new[] { "_index_template/{name}" }); + internal static readonly ApiUrls IndicesPutComposableTemplate = new( + new[] { "_index_template/{name}" } + ); - internal static readonly ApiUrls IndicesStats = - new(new[] { "_stats", "{index}/_stats", "{index}/_stats/{metric}", "_stats/{metric}" }); + internal static readonly ApiUrls IndicesStats = new( + new[] { "_stats", "{index}/_stats", "{index}/_stats/{metric}", "_stats/{metric}" } + ); } } diff --git a/src/OpenSearch.Net.Auth.AwsSigV4/OpenSearch.Net.Auth.AwsSigV4.csproj b/src/OpenSearch.Net.Auth.AwsSigV4/OpenSearch.Net.Auth.AwsSigV4.csproj index eabede30d4..e135b07298 100644 --- a/src/OpenSearch.Net.Auth.AwsSigV4/OpenSearch.Net.Auth.AwsSigV4.csproj +++ b/src/OpenSearch.Net.Auth.AwsSigV4/OpenSearch.Net.Auth.AwsSigV4.csproj @@ -20,7 +20,7 @@ - + diff --git a/tests/Tests.Core/Tests.Core.csproj b/tests/Tests.Core/Tests.Core.csproj index b1813baad1..97284f751c 100644 --- a/tests/Tests.Core/Tests.Core.csproj +++ b/tests/Tests.Core/Tests.Core.csproj @@ -15,7 +15,7 @@ - + diff --git a/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj b/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj index dbfdadc495..6e4780b48e 100644 --- a/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj +++ b/tests/Tests.YamlRunner/Tests.YamlRunner.fsproj @@ -31,7 +31,7 @@ - +