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}} 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/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/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 diff --git a/dotnet-tools.json b/dotnet-tools.json index 6da0302..bd0c010 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,25 +3,25 @@ "isRoot": true, "tools": { "minver-cli": { - "version": "2.3.1", + "version": "4.3.0", "commands": [ "minver" ] }, "assembly-differ": { - "version": "0.13.0", + "version": "0.14.0", "commands": [ "assembly-differ" ] }, "release-notes": { - "version": "0.3.0", + "version": "0.5.2", "commands": [ "release-notes" ] }, "nupkg-validator": { - "version": "0.4.0", + "version": "0.5.0", "commands": [ "nupkg-validator" ] 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..3745a2f --- /dev/null +++ b/examples/Elastic.Ephemeral.Example/Elastic.Ephemeral.Example.csproj @@ -0,0 +1,15 @@ + + + + Exe + net6.0 + enable + enable + False + + + + + + + diff --git a/examples/Elastic.Ephemeral.Example/Program.cs b/examples/Elastic.Ephemeral.Example/Program.cs new file mode 100644 index 0000000..f4cdb1c --- /dev/null +++ b/examples/Elastic.Ephemeral.Example/Program.cs @@ -0,0 +1,9 @@ +// 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; + +var config = new EphemeralClusterConfiguration("8.7.0"); +var cluster = new EphemeralCluster(config); +using var started = cluster.Start();