Skip to content

Commit 56aa636

Browse files
committed
Feature/7.x/remove upgrade assistant (#4004)
* remove Nest.UpgradeAssistant * remove Nest.7xUpgradeAssistant code (cherry picked from commit b031724)
1 parent f845aab commit 56aa636

File tree

195 files changed

+0
-5992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+0
-5992
lines changed

build/NEST.7xUpgradeAssistant.nuspec

-35
This file was deleted.

build/scripts/Projects.fs

-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module Projects =
2020
| Nest
2121
| ElasticsearchNet
2222
| NestJsonNetSerializer
23-
| NestUpgradeAssistant
2423

2524
type PrivateProject =
2625
| Tests
@@ -40,7 +39,6 @@ module Projects =
4039
Project Project.ElasticsearchNet;
4140
Project Project.Nest;
4241
Project Project.NestJsonNetSerializer;
43-
Project Project.NestUpgradeAssistant;
4442
PrivateProject PrivateProject.Tests
4543
]
4644

@@ -49,7 +47,6 @@ module Projects =
4947
Project Project.ElasticsearchNet;
5048
Project Project.Nest;
5149
Project Project.NestJsonNetSerializer;
52-
Project Project.NestUpgradeAssistant;
5350
]
5451
static member Tests = seq [PrivateProject PrivateProject.Tests]
5552

@@ -70,7 +67,6 @@ module Projects =
7067
| Project Nest -> "Nest"
7168
| Project ElasticsearchNet -> "Elasticsearch.Net"
7269
| Project NestJsonNetSerializer -> "Nest.JsonNetSerializer"
73-
| Project NestUpgradeAssistant -> "Nest.7xUpgradeAssistant"
7470
| PrivateProject Tests -> "Tests"
7571
| PrivateProject DocGenerator -> "DocGenerator"
7672
| PrivateProject ApiGenerator -> "ApiGenerator"
@@ -80,7 +76,6 @@ module Projects =
8076
match this with
8177
| Project Nest -> "NEST"
8278
| Project NestJsonNetSerializer -> "NEST.JsonNetSerializer"
83-
| Project NestUpgradeAssistant -> "NEST.7xUpgradeAssistant"
8479
| _ -> this.Name
8580

8681
member this.NeedsMerge = match this with | Project NestJsonNetSerializer -> false | _ -> true

build/scripts/Releasing.fs

-4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ module Release =
107107
| Project ElasticsearchNet ->
108108
rewriteDllFile p.Name
109109
ignore()
110-
| Project NestUpgradeAssistant
111110
| Project NestJsonNetSerializer ->
112111
let nestDeps = doc.XPathSelectElements("/x:package/x:metadata//x:dependency[@id='NEST']", nsManager);
113112
nestDeps |> Seq.iter (fun e ->
@@ -144,9 +143,6 @@ module Release =
144143

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

152148
let NugetPack (ArtifactsVersion(version)) = packProjects version nugetPackMain

src/Elasticsearch.sln

-7
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ ProjectSection(SolutionItems) = preProject
6565
..\build\NEST.nuspec = ..\build\NEST.nuspec
6666
..\NuGet.config = ..\NuGet.config
6767
..\build\Elasticsearch.Net.nuspec = ..\build\Elasticsearch.Net.nuspec
68-
..\build\NEST.7xUpgradeAssistant.nuspec = ..\build\NEST.7xUpgradeAssistant.nuspec
6968
EndProjectSection
7069
EndProject
7170
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markdown", "Markdown", "{2FABB663-F4DB-499A-89F8-3A08828D1D91}"
@@ -75,8 +74,6 @@ ProjectSection(SolutionItems) = preProject
7574
..\readme.md = ..\readme.md
7675
EndProjectSection
7776
EndProject
78-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.7xUpgradeAssistant", "Nest.7xUpgradeAssistant\Nest.7xUpgradeAssistant.csproj", "{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}"
79-
EndProject
8077
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{40A4ECFA-F8A7-4560-861E-0B8A1DE1C49D}"
8178
EndProject
8279
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "Examples\Examples\Examples.csproj", "{27BFE628-6BE9-48E7-891F-E228DBF0E294}"
@@ -169,10 +166,6 @@ Global
169166
{D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.ActiveCfg = Release|Any CPU
170167
{D6997ADC-E933-418E-831C-DE1A78897493}.Debug|Any CPU.Build.0 = Debug|Any CPU
171168
{D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.Build.0 = Release|Any CPU
172-
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173-
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
174-
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
175-
{B8B8C45A-22D3-4D1E-9A3A-C030997D5BF7}.Release|Any CPU.Build.0 = Release|Any CPU
176169
{27BFE628-6BE9-48E7-891F-E228DBF0E294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177170
{27BFE628-6BE9-48E7-891F-E228DBF0E294}.Debug|Any CPU.Build.0 = Debug|Any CPU
178171
{27BFE628-6BE9-48E7-891F-E228DBF0E294}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/Nest.7xUpgradeAssistant/ElasticClient-AcknowledgeWatch.cs

-32
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-ActivateWatch.cs

-32
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-Alias.cs

-27
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-AliasExists.cs

-34
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-Analyze.cs

-27
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-Authenticate.cs

-31
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-CancelTasks.cs

-30
This file was deleted.

src/Nest.7xUpgradeAssistant/ElasticClient-CatAliases.cs

-32
This file was deleted.

0 commit comments

Comments
 (0)