From 31ff9a7fb4ebd49d689612592e8d856cc1d17cc9 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Thu, 29 Jun 2023 15:19:07 +0200 Subject: [PATCH 1/9] Added ephemeral example --- Directory.Build.props | 2 +- Elastic.Abstractions.sln | 7 +++++++ .../Elastic.Ephemeral.Example.csproj | 14 ++++++++++++++ examples/Elastic.Ephemeral.Example/Program.cs | 7 +++++++ .../Elastic.Managed.Example.csproj | 2 +- .../Elastic.Xunit.ExampleComplex.csproj | 2 +- .../Elastic.Xunit.ExampleMinimal.csproj | 2 +- examples/ScratchPad/ScratchPad.csproj | 2 +- global.json | 2 +- .../Nest.TypescriptExporter.csproj | 2 +- 10 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj create mode 100644 examples/Elastic.Ephemeral.Example/Program.cs diff --git a/Directory.Build.props b/Directory.Build.props index 7b8bd0a..53d0449 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/Elastic.Abstractions.sln b/Elastic.Abstractions.sln index a1e0e9f..9cada97 100644 --- a/Elastic.Abstractions.sln +++ b/Elastic.Abstractions.sln @@ -43,6 +43,8 @@ ProjectSection(SolutionItems) = preProject .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 @@ -62,6 +64,7 @@ Global {80DE8673-CB3E-4D0B-99F4-A5CECF6BE752} = {77E78EDE-60D5-469A-B431-443A7966A243} {C05F7B36-EEF7-4BCD-86A2-F5F1BB8CFEB9} = {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} @@ -107,5 +110,9 @@ Global {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/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj new file mode 100644 index 0000000..60ff03f --- /dev/null +++ b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj @@ -0,0 +1,14 @@ + + + + Exe + net6.0 + enable + enable + + + + + + + diff --git a/examples/Elastic.Ephemeral.Example/Program.cs b/examples/Elastic.Ephemeral.Example/Program.cs new file mode 100644 index 0000000..a770bc5 --- /dev/null +++ b/examples/Elastic.Ephemeral.Example/Program.cs @@ -0,0 +1,7 @@ +// See https://aka.ms/new-console-template for more information + +using Elastic.Elasticsearch.Ephemeral; + +var config = new EphemeralClusterConfiguration("8.7.0"); +var cluster = new EphemeralCluster(config); +using var started = cluster.Start(); diff --git a/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj b/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj index 778ede3..cc1f68c 100644 --- a/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj +++ b/examples/Elastic.Managed.Example/Elastic.Managed.Example.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 False diff --git a/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj b/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj index dedea61..8f406d2 100644 --- a/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj +++ b/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj @@ -1,6 +1,6 @@ - net5.0;net461 + net6.0;net461 False diff --git a/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj b/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj index a96d86e..0f23aee 100644 --- a/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj +++ b/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj @@ -1,6 +1,6 @@ - net5.0;net461 + net6.0;net461 False diff --git a/examples/ScratchPad/ScratchPad.csproj b/examples/ScratchPad/ScratchPad.csproj index 7462b94..cef057c 100644 --- a/examples/ScratchPad/ScratchPad.csproj +++ b/examples/ScratchPad/ScratchPad.csproj @@ -1,7 +1,7 @@  Exe - net5.0 + net6.0 False diff --git a/global.json b/global.json index a3c9d40..c317b00 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.408", + "version": "6.0.302", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj b/src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj index f34599c..da98198 100644 --- a/src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj +++ b/src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj @@ -1,7 +1,7 @@  Exe - net5.0 + net6.0 False False From 2db3335f574fe3591b6d25309846549fd5cf1d8e Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Thu, 29 Jun 2023 15:21:33 +0200 Subject: [PATCH 2/9] license header --- examples/Elastic.Ephemeral.Example/Program.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/Elastic.Ephemeral.Example/Program.cs b/examples/Elastic.Ephemeral.Example/Program.cs index a770bc5..63d828e 100644 --- a/examples/Elastic.Ephemeral.Example/Program.cs +++ b/examples/Elastic.Ephemeral.Example/Program.cs @@ -1,4 +1,6 @@ -// See https://aka.ms/new-console-template for more information +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information using Elastic.Elasticsearch.Ephemeral; From 6ba12dd75a43a8e98fe01dc2a4bfa61ea396b59e Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 11:42:53 +0200 Subject: [PATCH 3/9] remove BOM --- examples/Elastic.Ephemeral.Example/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/Elastic.Ephemeral.Example/Program.cs b/examples/Elastic.Ephemeral.Example/Program.cs index 63d828e..f4cdb1c 100644 --- a/examples/Elastic.Ephemeral.Example/Program.cs +++ b/examples/Elastic.Ephemeral.Example/Program.cs @@ -1,4 +1,4 @@ -// Licensed to Elasticsearch B.V under one or more agreements. +// Licensed to Elasticsearch B.V under one or more agreements. // Elasticsearch B.V licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information From 665d4230d7b7b05837fdcc2975ccc04e778ab485 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 11:57:48 +0200 Subject: [PATCH 4/9] Use global json to install .NET SDK --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7dba5dc..e18c5fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,10 +25,11 @@ jobs: git fetch --prune --unshallow --tags echo exit code $? git tag --list - - uses: actions/setup-dotnet@v1 + + # Install .NET version as mandated by global.json + - uses: actions/setup-dotnet@v3 with: - dotnet-version: '5.0.408' - source-url: https://nuget.pkg.github.com/elastic/index.json + global-json-file: global.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} From 6eeeed659a0df0a7f35345a2b278d559b223039e Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 11:59:53 +0200 Subject: [PATCH 5/9] update scripts to net6 --- build/scripts/scripts.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index b0377d4..5220347 100644 --- a/build/scripts/scripts.fsproj +++ b/build/scripts/scripts.fsproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 false From ca6b049543ec22754ee428be1ec298e21646ead5 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 12:02:58 +0200 Subject: [PATCH 6/9] update nupkg-validator --- dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-tools.json b/dotnet-tools.json index 6da0302..29ff309 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "nupkg-validator": { - "version": "0.4.0", + "version": "0.5.0", "commands": [ "nupkg-validator" ] From e091fbc136cf2ce47fc1ae85813807dfc7ce3d43 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 12:04:43 +0200 Subject: [PATCH 7/9] update release-notes --- dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-tools.json b/dotnet-tools.json index 29ff309..1a284aa 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "release-notes": { - "version": "0.3.0", + "version": "0.5.2", "commands": [ "release-notes" ] From 6003986cd9c55055db128afd03b2905d57ee131a Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 13:06:01 +0200 Subject: [PATCH 8/9] update all tooling and invocations --- build/scripts/Targets.fs | 2 +- dotnet-tools.json | 2 +- .../Elastic.Ephemeral.Example.csproj | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs index 331d677..59ee764 100644 --- a/build/scripts/Targets.fs +++ b/build/scripts/Targets.fs @@ -21,7 +21,7 @@ let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"]) let private currentVersion = lazy( restoreTools.Value |> ignore - let r = Proc.Start("dotnet", "minver", "-d", "canary", "-m", "0.1") + let r = Proc.Start("dotnet", "minver", "-d=canary", "-m=0.1", "-v=e") let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith("MinVer:"))) o.Line ) diff --git a/dotnet-tools.json b/dotnet-tools.json index 1a284aa..93a2573 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "minver-cli": { - "version": "2.3.1", + "version": "4.3.0", "commands": [ "minver" ] diff --git a/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj index 60ff03f..3745a2f 100644 --- a/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj +++ b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj @@ -1,14 +1,15 @@ - - Exe - net6.0 - enable - enable - + + Exe + net6.0 + enable + enable + False + - - - + + + From 4d6e4bdb544ba518e5b588c2a66510dbdb9dc494 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Fri, 30 Jun 2023 13:14:04 +0200 Subject: [PATCH 9/9] update assembly-differ --- dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-tools.json b/dotnet-tools.json index 93a2573..bd0c010 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "assembly-differ": { - "version": "0.13.0", + "version": "0.14.0", "commands": [ "assembly-differ" ]