Skip to content

Commit 068ebde

Browse files
MpdreamzMpdreamz
committed
Move master over to 5.x version numbers
1 parent 3d8787b commit 068ebde

File tree

22 files changed

+180
-203
lines changed

22 files changed

+180
-203
lines changed

‎src/Benchmarking/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyDescriptionAttribute("")]
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
9-
[assembly: AssemblyVersionAttribute("2.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("2.0.5")]
11-
[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
9+
[assembly: AssemblyVersionAttribute("5.0.0")]
10+
[assembly: AssemblyFileVersionAttribute("5.0.0")]
11+
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
14-
internal const string Version = "2.0.0";
14+
internal const string Version = "5.0.0";
1515
}
1616
}

‎src/Benchmarking/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.5",
2+
"version": "5.0.0-alpha1",
33
"compilationOptions": {
44
"warningsAsErrors": false,
55
"define": [ "LINQ", "NDESK_OPTIONS" ],

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiEndpoint.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ public IEnumerable<CsharpMethod> CsharpMethods
129129
case "enum":
130130
return this.PascalCase(p.Name) + p.Name;
131131
case "number":
132-
// TODO should we support long or some numeric type here?
133132
return "string " + p.Name;
134133
default:
135134
return p.Type + " " + p.Name;

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyDescriptionAttribute("")]
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
9-
[assembly: AssemblyVersionAttribute("2.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("2.0.5")]
11-
[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
9+
[assembly: AssemblyVersionAttribute("5.0.0")]
10+
[assembly: AssemblyFileVersionAttribute("5.0.0")]
11+
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
14-
internal const string Version = "2.0.0";
14+
internal const string Version = "5.0.0";
1515
}
1616
}

‎src/CodeGeneration/CodeGeneration.LowLevelClient/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.5",
2+
"version": "5.0.0-alpha1",
33
"compilationOptions": {
44
"warningsAsErrors": false,
55
"emitEntryPoint": true

‎src/CodeGeneration/Nest.Litterateur/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyDescriptionAttribute("")]
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
9-
[assembly: AssemblyVersionAttribute("2.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("2.0.5")]
11-
[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
9+
[assembly: AssemblyVersionAttribute("5.0.0")]
10+
[assembly: AssemblyFileVersionAttribute("5.0.0")]
11+
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
14-
internal const string Version = "2.0.0";
14+
internal const string Version = "5.0.0";
1515
}
1616
}

‎src/CodeGeneration/Nest.Litterateur/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.5",
2+
"version": "5.0.0-alpha1",
33
"compilationOptions": {
44
"warningsAsErrors": false,
55
"emitEntryPoint": true

‎src/Elasticsearch.Net/Elasticsearch.Net.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<Compile Include="Exceptions\ElasticsearchClientException.cs" />
8686
<Compile Include="Exceptions\ResolveException.cs" />
8787
<Compile Include="Exceptions\UnexpectedElasticsearchClientException.cs" />
88-
<Compile Include="Extensions\ExceptionExtensions.cs" />
8988
<Compile Include="Extensions\Extensions.cs" />
9089
<Compile Include="Extensions\Fluent.cs" />
9190
<Compile Include="Extensions\FormattableString.cs" />

‎src/Elasticsearch.Net/Extensions/ExceptionExtensions.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Elasticsearch.Net/Extensions/FormattableString.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
//TODO needs IFDEF?
2-
3-
#if NET45
1+
#if NET45
42
namespace System.Runtime.CompilerServices
53
{
64
internal class FormattableStringFactory

‎src/Elasticsearch.Net/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyDescriptionAttribute("Elasticsearch.Net - official low level elasticsearch client")]
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
9-
[assembly: AssemblyVersionAttribute("2.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("2.0.5")]
11-
[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
9+
[assembly: AssemblyVersionAttribute("5.0.0")]
10+
[assembly: AssemblyFileVersionAttribute("5.0.0")]
11+
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
14-
internal const string Version = "2.0.0";
14+
internal const string Version = "5.0.0";
1515
}
1616
}

‎src/Elasticsearch.Net/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/elastic/elasticsearch-net"
2525
},
2626
"copyright": "2014-2016 Elasticsearch BV",
27-
"version": "2.0.5",
28-
"releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases",
27+
"version": "5.0.0-alpha1",
28+
"releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases/tag/5.0.0-alpha1",
2929
"compilationOptions": {
3030
"warningsAsErrors": false
3131
},

‎src/Nest/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyDescriptionAttribute("NEST - official high level elasticsearch client")]
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
9-
[assembly: AssemblyVersionAttribute("2.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("2.0.5")]
11-
[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
9+
[assembly: AssemblyVersionAttribute("5.0.0")]
10+
[assembly: AssemblyFileVersionAttribute("5.0.0")]
11+
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
14-
internal const string Version = "2.0.0";
14+
internal const string Version = "5.0.0";
1515
}
1616
}

‎src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Nest
55
{
6-
public abstract class FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>
6+
public abstract class FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>
77
: QueryDescriptorBase<TDescriptor, TInterface>, IFieldNameQuery
88
where TDescriptor : FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>, TInterface
99
where TInterface : class, IFieldNameQuery

‎src/Nest/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/elastic/elasticsearch-net"
2525
},
2626
"copyright": "2014-2016 Elasticsearch BV",
27-
"releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases",
28-
"version": "2.0.5",
27+
"releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases/tag/5.0.0-alpha1",
28+
"version": "5.0.0-alpha1",
2929
"compilationOptions": {
3030
"warningsAsErrors": false
3131
},

‎src/Profiling/Program.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,43 @@
66

77
namespace Profiling
88
{
9-
class Program
10-
{
11-
static void Main(string[] args)
12-
{
13-
// TODO move the tests.yml to a more general location and Add Existing Item -> Add Link?
14-
TestClient.Configuration = new ProfilingTestConfiguration();
9+
class Program
10+
{
11+
static void Main(string[] args)
12+
{
13+
// TODO move the tests.yml to a more general location and Add Existing Item -> Add Link?
14+
TestClient.Configuration = new ProfilingTestConfiguration();
1515

16-
using (var cluster = new ProfilingCluster())
17-
{
18-
var client = cluster.Client();
19-
var output = new ColoredConsoleWriter();
16+
using (var cluster = new ProfilingCluster())
17+
{
18+
var client = cluster.Client();
19+
var output = new ColoredConsoleWriter();
2020

21-
using (Snapshot.Create())
22-
{
21+
using (Snapshot.Create())
22+
{
2323
MainAsync(client, output).Wait();
2424
}
25-
}
26-
}
25+
}
26+
}
2727

28-
private static async Task MainAsync(IElasticClient client, ColoredConsoleWriter output)
29-
{
30-
var asyncOperations = new List<IAsyncProfiledOperation>
31-
{
28+
private static async Task MainAsync(IElasticClient client, ColoredConsoleWriter output)
29+
{
30+
var asyncOperations = new List<IAsyncProfiledOperation>
31+
{
3232
new AliasAsyncOperation(),
3333
new AliasExistsAsyncOperation(),
3434
new AnalyzeAsyncOperation(),
3535
new BulkAsyncOperation(),
36-
new IndexAsyncOperation(),
36+
new IndexAsyncOperation(),
3737
new SearchAsyncOperation(),
3838
new CatAsyncOperation(),
3939
new GetMappingAsyncOperation()
40-
};
40+
};
4141

42-
foreach (var asyncOperation in asyncOperations)
43-
{
44-
await asyncOperation.RunAsync(client, output).ConfigureAwait(false);
45-
}
46-
}
47-
}
42+
foreach (var asyncOperation in asyncOperations)
43+
{
44+
await asyncOperation.RunAsync(client, output).ConfigureAwait(false);
45+
}
46+
}
47+
}
4848
}

‎src/Profiling/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
[assembly: AssemblyDescriptionAttribute("")]
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
9-
[assembly: AssemblyVersionAttribute("2.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("2.0.5")]
11-
[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
9+
[assembly: AssemblyVersionAttribute("5.0.0")]
10+
[assembly: AssemblyFileVersionAttribute("5.0.0")]
11+
[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
14-
internal const string Version = "2.0.0";
14+
internal const string Version = "5.0.0";
1515
}
1616
}

0 commit comments

Comments
 (0)