From abc7d705154f365223dc6bc8323856b05bfc1d88 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 12 Nov 2025 14:02:38 +0100 Subject: [PATCH 1/4] Migrate to .NET 10 --- .github/workflows/ci.yml | 6 +++--- build/scripts/scripts.fsproj | 2 +- .../Elastic.Ephemeral.Example.csproj | 4 ++-- .../Elastic.Managed.Example.csproj | 2 +- .../Elastic.Xunit.ExampleComplex.csproj | 8 ++++---- .../Elastic.Xunit.ExampleMinimal.csproj | 8 ++++---- examples/ScratchPad/ScratchPad.csproj | 4 ++-- global.json | 2 +- .../Elastic.Elasticsearch.Ephemeral.csproj | 3 ++- .../Tasks/IClusterComposeTask.cs | 4 ++-- .../Elastic.Elasticsearch.Managed.csproj | 3 ++- .../Elastic.Elasticsearch.Xunit.csproj | 5 +++-- .../Elastic.Stack.ArtifactsApi.csproj | 5 +++-- 13 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index faf127f..88411c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 1 - run: | @@ -27,11 +27,11 @@ jobs: git tag --list # Install .NET version as mandated by global.json - - uses: actions/setup-dotnet@v4.1.0 + - uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | - 6.x + 10.x env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index f2027b1..a5235d9 100644 --- a/build/scripts/scripts.fsproj +++ b/build/scripts/scripts.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net10.0 false diff --git a/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj index 351c5ef..c307ffc 100644 --- a/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj +++ b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net10.0 enable enable False @@ -13,7 +13,7 @@ - + diff --git a/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj b/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj index cc1f68c..55b5f73 100644 --- a/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj +++ b/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net10.0 False diff --git a/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj b/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj index 2a83554..f1ac8a7 100644 --- a/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj +++ b/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj @@ -1,17 +1,17 @@ - net6.0;net462 + net10.0;net462 False - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj b/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj index 0d99b8c..7639ce5 100644 --- a/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj +++ b/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj @@ -1,16 +1,16 @@ - net6.0;net462 + net10.0;net462 False - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/examples/ScratchPad/ScratchPad.csproj b/examples/ScratchPad/ScratchPad.csproj index 444bde4..567a04a 100644 --- a/examples/ScratchPad/ScratchPad.csproj +++ b/examples/ScratchPad/ScratchPad.csproj @@ -1,11 +1,11 @@  Exe - net6.0 + net10.0 False - + diff --git a/global.json b/global.json index 789bff3..fe7e453 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj b/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj index 31a3f21..79b967c 100644 --- a/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj +++ b/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj @@ -1,12 +1,13 @@  - netstandard2.0;netstandard2.1;net462;net8.0 + netstandard2.0;netstandard2.1;net462;net8.0;net10.0 Provides an EphemeralCluster implementation that can download/bootstrap/run a throwaway customizable Elasticsearch cluster elastic,elasticsearch,cluster,ephemeral + diff --git a/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs b/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs index 6ccd063..fc4d6bc 100644 --- a/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs +++ b/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs @@ -95,7 +95,7 @@ private HttpResponseMessage Call( $"{{{nameof(Call)}}} [{statusUrl}] SSL: {cluster.ClusterConfiguration.EnableSsl} Security: {cluster.ClusterConfiguration.EnableSecurity}"); if (cluster.ClusterConfiguration.EnableSsl) { -#if !NETSTANDARD +#if !NETSTANDARD && !NET8_0_OR_GREATER ServicePointManager.ServerCertificateValidationCallback += ServerCertificateValidationCallback; #else handler.ServerCertificateCustomValidationCallback += (m, c, cn, p) => true; @@ -130,7 +130,7 @@ private HttpResponseMessage Call( } finally { -#if !NETSTANDARD +#if !NETSTANDARD && !NET8_0_OR_GREATER ServicePointManager.ServerCertificateValidationCallback -= ServerCertificateValidationCallback; #endif } diff --git a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj index b98666a..ee95bcc 100644 --- a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj +++ b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net462;net8.0 + netstandard2.0;netstandard2.1;net462;net8.0;net10.0 Provides an observable ElasticsearchNode abstraction that can be used to wrap an elasticsearch process. Also ships with an cluster abstraction that can start one or more ElasticsearchNode's @@ -11,5 +11,6 @@ + \ No newline at end of file diff --git a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj index 2d3adc5..9b4a9c8 100644 --- a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj +++ b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj @@ -1,6 +1,6 @@  - netstandard2.0;netstandard2.1;net462;net8.0 + netstandard2.0;netstandard2.1;net462;net8.0;net10.0 True False Provides an Xunit test framework allowing you to run integration tests against local ephemeral Elasticsearch clusters @@ -8,7 +8,8 @@ - + + diff --git a/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj b/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj index f0d4157..8d070ce 100644 --- a/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj +++ b/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj @@ -1,14 +1,15 @@ - netstandard2.0;net462;net8.0 + netstandard2.0;net462;net8.0;net10.0 Provides a set of classes to resolve the location of Elastic stack products in various stages: released, snapshot and build candidates elastic,elasticsearch,stack,versioning,artifacts + - + From b9a7624b7f29278c57430a8f7f18913a4dc9a90e Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 12 Nov 2025 14:05:44 +0100 Subject: [PATCH 2/4] migrate to slnx --- Elastic.Abstractions.sln | 111 -------------------------------------- Elastic.Abstractions.slnx | 28 ++++++++++ 2 files changed, 28 insertions(+), 111 deletions(-) delete mode 100644 Elastic.Abstractions.sln create mode 100644 Elastic.Abstractions.slnx diff --git a/Elastic.Abstractions.sln b/Elastic.Abstractions.sln deleted file mode 100644 index da2ff04..0000000 --- a/Elastic.Abstractions.sln +++ /dev/null @@ -1,111 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScratchPad", "examples\ScratchPad\ScratchPad.csproj", "{E7AD2461-309A-4BA7-A6EB-5C1F4F882BC2}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "scripts", "build\scripts\scripts.fsproj", "{D6997ADC-E933-418E-831C-DE1A78897493}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Elasticsearch.Managed", "src\Elastic.Elasticsearch.Managed\Elastic.Elasticsearch.Managed.csproj", "{0FCE020D-F4BD-4933-A0AB-27537EFA273E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Elasticsearch.Ephemeral", "src\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj", "{F5D3D2D7-CDA1-462A-81FD-A446C4CEB287}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Elasticsearch.Xunit", "src\Elastic.Elasticsearch.Xunit\Elastic.Elasticsearch.Xunit.csproj", "{681C6112-B885-4553-A06C-4CD9C262FC49}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Xunit.Example", "examples\Elastic.Xunit.ExampleComplex\Elastic.Xunit.ExampleComplex.csproj", "{A660CA00-91E4-4994-BBA2-406BC5259C33}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9D154338-4AA8-40A9-A378-B27C05D45791}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Xunit.ExampleMinimal", "examples\Elastic.Xunit.ExampleMinimal\Elastic.Xunit.ExampleMinimal.csproj", "{93EA909E-7CA6-4263-9E27-0B53BC90CF48}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Managed.Example", "examples\Elastic.Managed.Example\Elastic.Managed.Example.csproj", "{294F5209-AD64-4812-AA4E-C7B016927A0F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Stack.ArtifactsApi", "src\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj", "{80DE8673-CB3E-4D0B-99F4-A5CECF6BE752}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{77E78EDE-60D5-469A-B431-443A7966A243}" -ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props -EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F75ACC18-D314-4F1F-88A3-2002EAC4E207}" -ProjectSection(SolutionItems) = preProject - dotnet-tools.json = dotnet-tools.json - Directory.Build.props = Directory.Build.props - build.bat = build.bat - build.sh = build.sh - global.json = global.json - License.txt = License.txt - nuget-icon.png = nuget-icon.png - README.md = README.md - .github\workflows\ci.yml = .github\workflows\ci.yml -EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Ephemeral.Example", "examples\Elastic.Ephemeral.Example\Elastic.Ephemeral.Example.csproj", "{9666AFDC-B0E8-489C-A25A-17E67303A969}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {A660CA00-91E4-4994-BBA2-406BC5259C33} = {9D154338-4AA8-40A9-A378-B27C05D45791} - {E7AD2461-309A-4BA7-A6EB-5C1F4F882BC2} = {9D154338-4AA8-40A9-A378-B27C05D45791} - {93EA909E-7CA6-4263-9E27-0B53BC90CF48} = {9D154338-4AA8-40A9-A378-B27C05D45791} - {294F5209-AD64-4812-AA4E-C7B016927A0F} = {9D154338-4AA8-40A9-A378-B27C05D45791} - {F5D3D2D7-CDA1-462A-81FD-A446C4CEB287} = {77E78EDE-60D5-469A-B431-443A7966A243} - {0FCE020D-F4BD-4933-A0AB-27537EFA273E} = {77E78EDE-60D5-469A-B431-443A7966A243} - {681C6112-B885-4553-A06C-4CD9C262FC49} = {77E78EDE-60D5-469A-B431-443A7966A243} - {80DE8673-CB3E-4D0B-99F4-A5CECF6BE752} = {77E78EDE-60D5-469A-B431-443A7966A243} - {D6997ADC-E933-418E-831C-DE1A78897493} = {F75ACC18-D314-4F1F-88A3-2002EAC4E207} - {9666AFDC-B0E8-489C-A25A-17E67303A969} = {9D154338-4AA8-40A9-A378-B27C05D45791} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {AFADDCED-A7DD-43E7-B03C-27F57AC5C358} - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E7AD2461-309A-4BA7-A6EB-5C1F4F882BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7AD2461-309A-4BA7-A6EB-5C1F4F882BC2}.Release|Any CPU.Build.0 = Release|Any CPU - {E7AD2461-309A-4BA7-A6EB-5C1F4F882BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7AD2461-309A-4BA7-A6EB-5C1F4F882BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.Build.0 = Release|Any CPU - {D6997ADC-E933-418E-831C-DE1A78897493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6997ADC-E933-418E-831C-DE1A78897493}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FCE020D-F4BD-4933-A0AB-27537EFA273E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FCE020D-F4BD-4933-A0AB-27537EFA273E}.Release|Any CPU.Build.0 = Release|Any CPU - {0FCE020D-F4BD-4933-A0AB-27537EFA273E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FCE020D-F4BD-4933-A0AB-27537EFA273E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5D3D2D7-CDA1-462A-81FD-A446C4CEB287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5D3D2D7-CDA1-462A-81FD-A446C4CEB287}.Release|Any CPU.Build.0 = Release|Any CPU - {F5D3D2D7-CDA1-462A-81FD-A446C4CEB287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5D3D2D7-CDA1-462A-81FD-A446C4CEB287}.Debug|Any CPU.Build.0 = Debug|Any CPU - {681C6112-B885-4553-A06C-4CD9C262FC49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {681C6112-B885-4553-A06C-4CD9C262FC49}.Release|Any CPU.Build.0 = Release|Any CPU - {681C6112-B885-4553-A06C-4CD9C262FC49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {681C6112-B885-4553-A06C-4CD9C262FC49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A660CA00-91E4-4994-BBA2-406BC5259C33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A660CA00-91E4-4994-BBA2-406BC5259C33}.Release|Any CPU.Build.0 = Release|Any CPU - {A660CA00-91E4-4994-BBA2-406BC5259C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A660CA00-91E4-4994-BBA2-406BC5259C33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93EA909E-7CA6-4263-9E27-0B53BC90CF48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93EA909E-7CA6-4263-9E27-0B53BC90CF48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93EA909E-7CA6-4263-9E27-0B53BC90CF48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93EA909E-7CA6-4263-9E27-0B53BC90CF48}.Release|Any CPU.Build.0 = Release|Any CPU - {294F5209-AD64-4812-AA4E-C7B016927A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {294F5209-AD64-4812-AA4E-C7B016927A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {294F5209-AD64-4812-AA4E-C7B016927A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {294F5209-AD64-4812-AA4E-C7B016927A0F}.Release|Any CPU.Build.0 = Release|Any CPU - {80DE8673-CB3E-4D0B-99F4-A5CECF6BE752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80DE8673-CB3E-4D0B-99F4-A5CECF6BE752}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80DE8673-CB3E-4D0B-99F4-A5CECF6BE752}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80DE8673-CB3E-4D0B-99F4-A5CECF6BE752}.Release|Any CPU.Build.0 = Release|Any CPU - {9666AFDC-B0E8-489C-A25A-17E67303A969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9666AFDC-B0E8-489C-A25A-17E67303A969}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9666AFDC-B0E8-489C-A25A-17E67303A969}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9666AFDC-B0E8-489C-A25A-17E67303A969}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Elastic.Abstractions.slnx b/Elastic.Abstractions.slnx new file mode 100644 index 0000000..727c8a6 --- /dev/null +++ b/Elastic.Abstractions.slnx @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ee47c5e63c91482df1b823d6cded05ae3a2d5351 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 12 Nov 2025 20:12:28 +0100 Subject: [PATCH 3/4] update dotnet tools and nuget packages --- Directory.Build.props | 6 +++--- build/scripts/Paths.fs | 2 +- build/scripts/Program.fs | 5 +++-- build/scripts/scripts.fsproj | 4 ++-- dotnet-tools.json | 8 ++++---- examples/ScratchPad/ScratchPad.csproj | 2 +- .../Elastic.Elasticsearch.Managed.csproj | 2 +- .../Elastic.Elasticsearch.Xunit.csproj | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 53d0449..857f594 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,14 +1,14 @@  - canary - 0.1 + canary.0 + 0.2 latest true - + \ No newline at end of file diff --git a/build/scripts/Paths.fs b/build/scripts/Paths.fs index e43d48e..1d1ed5f 100644 --- a/build/scripts/Paths.fs +++ b/build/scripts/Paths.fs @@ -17,7 +17,7 @@ let GenerateApiChanges = false let Root = let mutable dir = DirectoryInfo(".") - while dir.GetFiles("*.sln").Length = 0 do dir <- dir.Parent + while dir.GetFiles("*.slnx").Length = 0 do dir <- dir.Parent Environment.CurrentDirectory <- dir.FullName dir diff --git a/build/scripts/Program.fs b/build/scripts/Program.fs index a574d9a..f7a2341 100644 --- a/build/scripts/Program.fs +++ b/build/scripts/Program.fs @@ -30,7 +30,8 @@ let main argv = Targets.Setup parsed arguments let swallowTypes = [typeof; typeof] - Targets.RunTargetsAndExit - ([target], (fun e -> swallowTypes |> List.contains (e.GetType()) ), ":") + task { + return! Targets.RunTargetsAndExitAsync([ target ], (fun e -> swallowTypes |> List.contains (e.GetType())), (fun _ -> ":"), null, null) + } |> Async.AwaitTask |> Async.RunSynchronously 0 diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index a5235d9..3f2e458 100644 --- a/build/scripts/scripts.fsproj +++ b/build/scripts/scripts.fsproj @@ -7,8 +7,8 @@ - - + + diff --git a/dotnet-tools.json b/dotnet-tools.json index b03a447..6a2e0b1 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,28 +3,28 @@ "isRoot": true, "tools": { "minver-cli": { - "version": "4.3.0", + "version": "6.0.0", "commands": [ "minver" ], "rollForward": false }, "assembly-differ": { - "version": "0.14.0", + "version": "0.17.0", "commands": [ "assembly-differ" ], "rollForward": false }, "release-notes": { - "version": "0.5.2", + "version": "0.10.0", "commands": [ "release-notes" ], "rollForward": false }, "nupkg-validator": { - "version": "0.7.0", + "version": "0.10.1", "commands": [ "nupkg-validator" ], diff --git a/examples/ScratchPad/ScratchPad.csproj b/examples/ScratchPad/ScratchPad.csproj index 567a04a..a13a5a1 100644 --- a/examples/ScratchPad/ScratchPad.csproj +++ b/examples/ScratchPad/ScratchPad.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj index ee95bcc..71ce606 100644 --- a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj +++ b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj index 9b4a9c8..4dc5dc5 100644 --- a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj +++ b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj @@ -7,7 +7,7 @@ elastic,elasticsearch,xunit,cluster,integration,test,ephemeral - + From d1042f225e2a9724c05b8d8b95a1dab60a7d2f1b Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 12 Nov 2025 20:14:30 +0100 Subject: [PATCH 4/4] cleanup --- .github/workflows/ci.yml | 4 +-- src/Directory.Build.props | 2 +- .../Elastic.Elasticsearch.Ephemeral.csproj | 7 ++-- .../Elastic.Elasticsearch.Managed.csproj | 7 ++-- .../Elastic.Elasticsearch.Xunit.csproj | 7 ++-- .../Elastic.Stack.ArtifactsApi.csproj | 33 +++++++++---------- 6 files changed, 28 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88411c9..69c0b35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,12 +26,12 @@ jobs: echo exit code $? git tag --list - # Install .NET version as mandated by global.json + # Install the dotnet version as mandated by global.json - uses: actions/setup-dotnet@v5 with: global-json-file: global.json dotnet-version: | - 10.x + 10.x env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7384c98..8e5245d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,7 +32,7 @@ - + diff --git a/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj b/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj index 79b967c..079514c 100644 --- a/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj +++ b/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj @@ -6,14 +6,13 @@ elastic,elasticsearch,cluster,ephemeral - - + - + - + \ No newline at end of file diff --git a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj index 71ce606..40afbcb 100644 --- a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj +++ b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj @@ -3,14 +3,13 @@ netstandard2.0;netstandard2.1;net462;net8.0;net10.0 - Provides an observable ElasticsearchNode abstraction that can be used to wrap an elasticsearch process. + Provides an observable ElasticsearchNode abstraction that can be used to wrap an elasticsearch process. Also ships with an cluster abstraction that can start one or more ElasticsearchNode's elastic,elasticsearch,cluster,observable,rx - - - + + \ No newline at end of file diff --git a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj index 4dc5dc5..0e1e57a 100644 --- a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj +++ b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj @@ -7,11 +7,10 @@ elastic,elasticsearch,xunit,cluster,integration,test,ephemeral - - - + + - + \ No newline at end of file diff --git a/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj b/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj index 8d070ce..306af3c 100644 --- a/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj +++ b/src/Elastic.Stack.ArtifactsApi/Elastic.Stack.ArtifactsApi.csproj @@ -1,21 +1,20 @@ - - netstandard2.0;net462;net8.0;net10.0 - Provides a set of classes to resolve the location of Elastic stack products in various stages: released, snapshot and build candidates - elastic,elasticsearch,stack,versioning,artifacts - - - - - - - - - + + netstandard2.0;net462;net8.0;net10.0 + Provides a set of classes to resolve the location of Elastic stack products in various stages: released, snapshot and build candidates + elastic,elasticsearch,stack,versioning,artifacts + - - - - + + + + + + + + + + +