Skip to content

Feature/7.x/remove upgrade assistant #4004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions build/NEST.7xUpgradeAssistant.nuspec

This file was deleted.

5 changes: 0 additions & 5 deletions build/scripts/Projects.fs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ module Projects =
| Nest
| ElasticsearchNet
| NestJsonNetSerializer
| NestUpgradeAssistant

type PrivateProject =
| Tests
Expand All @@ -40,7 +39,6 @@ module Projects =
Project Project.ElasticsearchNet;
Project Project.Nest;
Project Project.NestJsonNetSerializer;
Project Project.NestUpgradeAssistant;
PrivateProject PrivateProject.Tests
]

Expand All @@ -49,7 +47,6 @@ module Projects =
Project Project.ElasticsearchNet;
Project Project.Nest;
Project Project.NestJsonNetSerializer;
Project Project.NestUpgradeAssistant;
]
static member Tests = seq [PrivateProject PrivateProject.Tests]

Expand All @@ -70,7 +67,6 @@ module Projects =
| Project Nest -> "Nest"
| Project ElasticsearchNet -> "Elasticsearch.Net"
| Project NestJsonNetSerializer -> "Nest.JsonNetSerializer"
| Project NestUpgradeAssistant -> "Nest.7xUpgradeAssistant"
| PrivateProject Tests -> "Tests"
| PrivateProject DocGenerator -> "DocGenerator"
| PrivateProject ApiGenerator -> "ApiGenerator"
Expand All @@ -80,7 +76,6 @@ module Projects =
match this with
| Project Nest -> "NEST"
| Project NestJsonNetSerializer -> "NEST.JsonNetSerializer"
| Project NestUpgradeAssistant -> "NEST.7xUpgradeAssistant"
| _ -> this.Name

member this.NeedsMerge = match this with | Project NestJsonNetSerializer -> false | _ -> true
Expand Down
4 changes: 0 additions & 4 deletions build/scripts/Releasing.fs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ module Release =
| Project ElasticsearchNet ->
rewriteDllFile p.Name
ignore()
| Project NestUpgradeAssistant
| Project NestJsonNetSerializer ->
let nestDeps = doc.XPathSelectElements("/x:package/x:metadata//x:dependency[@id='NEST']", nsManager);
nestDeps |> Seq.iter (fun e ->
Expand Down Expand Up @@ -144,9 +143,6 @@ module Release =

let private nugetPackVersioned (p:DotNetProject) nugetId nuspec properties version =
match p with
| Project NestUpgradeAssistant ->
printfn "Skipping %s from building a versioned nightly" p.Name
ignore()
| _ -> nugetPackVersionedUnfiltered p nugetId nuspec properties version

let NugetPack (ArtifactsVersion(version)) = packProjects version nugetPackMain
Expand Down
7 changes: 0 additions & 7 deletions src/Elasticsearch.sln
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ ProjectSection(SolutionItems) = preProject
..\build\NEST.nuspec = ..\build\NEST.nuspec
..\NuGet.config = ..\NuGet.config
..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec
..\build\NEST.7xUpgradeAssistant.nuspec = ..\build\NEST.7xUpgradeAssistant.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markdown", "Markdown", "{2FABB663-F4DB-499A-89F8-3A08828D1D91}"
Expand All @@ -75,8 +74,6 @@ ProjectSection(SolutionItems) = preProject
..\readme.md = ..\readme.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.7xUpgradeAssistant", "Nest.7xUpgradeAssistant\Nest.7xUpgradeAssistant.csproj", "{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -161,9 +158,5 @@ Global
{D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6997ADC-E933-418E-831C-DE1A78897493}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.Build.0 = Release|Any CPU
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
32 changes: 0 additions & 32 deletions src/Nest.7xUpgradeAssistant/ElasticClient-AcknowledgeWatch.cs

This file was deleted.

32 changes: 0 additions & 32 deletions src/Nest.7xUpgradeAssistant/ElasticClient-ActivateWatch.cs

This file was deleted.

27 changes: 0 additions & 27 deletions src/Nest.7xUpgradeAssistant/ElasticClient-Alias.cs

This file was deleted.

34 changes: 0 additions & 34 deletions src/Nest.7xUpgradeAssistant/ElasticClient-AliasExists.cs

This file was deleted.

27 changes: 0 additions & 27 deletions src/Nest.7xUpgradeAssistant/ElasticClient-Analyze.cs

This file was deleted.

31 changes: 0 additions & 31 deletions src/Nest.7xUpgradeAssistant/ElasticClient-Authenticate.cs

This file was deleted.

30 changes: 0 additions & 30 deletions src/Nest.7xUpgradeAssistant/ElasticClient-CancelTasks.cs

This file was deleted.

32 changes: 0 additions & 32 deletions src/Nest.7xUpgradeAssistant/ElasticClient-CatAliases.cs

This file was deleted.

Loading