Move master over to 5.x version numbers

Mpdreamz · Mpdreamz · commit 068ebde71d8c · 2016-04-28T15:26:35.000+02:00
diff --git a/src/Benchmarking/Properties/AssemblyInfo.cs b/src/Benchmarking/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyDescriptionAttribute("")]
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
-[assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.5")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.0";
+        internal const string Version = "5.0.0";
     }
 }
diff --git a/src/Benchmarking/project.json b/src/Benchmarking/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.5",
+  "version": "5.0.0-alpha1",
   "compilationOptions": {
     "warningsAsErrors": false,
     "define": [ "LINQ", "NDESK_OPTIONS" ],
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiEndpoint.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiEndpoint.cs
@@ -129,7 +129,6 @@ public IEnumerable<CsharpMethod> CsharpMethods
 								case "enum":
 									return this.PascalCase(p.Name) + p.Name;
 								case "number":
-									// TODO should we support long or some numeric type here?
 									return "string " + p.Name;
 								default:
 									return p.Type + " " + p.Name;
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyDescriptionAttribute("")]
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
-[assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.5")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.0";
+        internal const string Version = "5.0.0";
     }
 }
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/project.json b/src/CodeGeneration/CodeGeneration.LowLevelClient/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.5",
+  "version": "5.0.0-alpha1",
   "compilationOptions": {
     "warningsAsErrors": false,
     "emitEntryPoint": true
diff --git a/src/CodeGeneration/Nest.Litterateur/Properties/AssemblyInfo.cs b/src/CodeGeneration/Nest.Litterateur/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyDescriptionAttribute("")]
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
-[assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.5")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.0";
+        internal const string Version = "5.0.0";
     }
 }
diff --git a/src/CodeGeneration/Nest.Litterateur/project.json b/src/CodeGeneration/Nest.Litterateur/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.5",
+  "version": "5.0.0-alpha1",
   "compilationOptions": {
     "warningsAsErrors": false,
     "emitEntryPoint": true
diff --git a/src/Elasticsearch.Net/Elasticsearch.Net.csproj b/src/Elasticsearch.Net/Elasticsearch.Net.csproj
@@ -85,7 +85,6 @@
     <Compile Include="Exceptions\ElasticsearchClientException.cs" />
     <Compile Include="Exceptions\ResolveException.cs" />
     <Compile Include="Exceptions\UnexpectedElasticsearchClientException.cs" />
-    <Compile Include="Extensions\ExceptionExtensions.cs" />
     <Compile Include="Extensions\Extensions.cs" />
     <Compile Include="Extensions\Fluent.cs" />
     <Compile Include="Extensions\FormattableString.cs" />
diff --git a/src/Elasticsearch.Net/Extensions/ExceptionExtensions.cs b/src/Elasticsearch.Net/Extensions/ExceptionExtensions.cs
diff --git a/src/Elasticsearch.Net/Extensions/FormattableString.cs b/src/Elasticsearch.Net/Extensions/FormattableString.cs
@@ -1,6 +1,4 @@
-﻿//TODO needs IFDEF?
-
-#if NET45
+﻿#if NET45
 namespace System.Runtime.CompilerServices
 {
 	internal class FormattableStringFactory
diff --git a/src/Elasticsearch.Net/Properties/AssemblyInfo.cs b/src/Elasticsearch.Net/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyDescriptionAttribute("Elasticsearch.Net - official low level elasticsearch client")]
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
-[assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.5")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.0";
+        internal const string Version = "5.0.0";
     }
 }
diff --git a/src/Elasticsearch.Net/project.json b/src/Elasticsearch.Net/project.json
@@ -24,8 +24,8 @@
     "url": "https://github.com/elastic/elasticsearch-net"
   },
   "copyright": "2014-2016 Elasticsearch BV",
-  "version": "2.0.5",
-  "releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases",
+  "version": "5.0.0-alpha1",
+  "releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases/tag/5.0.0-alpha1",
   "compilationOptions": {
     "warningsAsErrors": false
   },
diff --git a/src/Nest/Properties/AssemblyInfo.cs b/src/Nest/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyDescriptionAttribute("NEST - official high level elasticsearch client")]
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
-[assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.5")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.0";
+        internal const string Version = "5.0.0";
     }
 }
diff --git a/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs b/src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryDescriptorBase.cs
@@ -3,7 +3,7 @@
 
 namespace Nest
 {
-	public abstract class FieldNameQueryDescriptorBase<TDescriptor, TInterface, T> 
+	public abstract class FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>
 		: QueryDescriptorBase<TDescriptor, TInterface>, IFieldNameQuery
 		where TDescriptor : FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>, TInterface
 		where TInterface : class, IFieldNameQuery
diff --git a/src/Nest/project.json b/src/Nest/project.json
@@ -24,8 +24,8 @@
     "url": "https://github.com/elastic/elasticsearch-net"
   },
   "copyright": "2014-2016 Elasticsearch BV",
-  "releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases",
-  "version": "2.0.5",
+  "releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases/tag/5.0.0-alpha1",
+  "version": "5.0.0-alpha1",
   "compilationOptions": {
     "warningsAsErrors": false
   },
diff --git a/src/Profiling/Program.cs b/src/Profiling/Program.cs
@@ -6,43 +6,43 @@
 
 namespace Profiling
 {
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            // TODO move the tests.yml to a more general location and Add Existing Item -> Add Link?
-            TestClient.Configuration = new ProfilingTestConfiguration();
+	class Program
+	{
+		static void Main(string[] args)
+		{
+			// TODO move the tests.yml to a more general location and Add Existing Item -> Add Link?
+			TestClient.Configuration = new ProfilingTestConfiguration();
 
-            using (var cluster = new ProfilingCluster())
-            {
-                var client = cluster.Client();
-                var output = new ColoredConsoleWriter();
+			using (var cluster = new ProfilingCluster())
+			{
+				var client = cluster.Client();
+				var output = new ColoredConsoleWriter();
 
-	            using (Snapshot.Create())
-	            {
+				using (Snapshot.Create())
+				{
 					MainAsync(client, output).Wait();
 				}
-            }
-        }
+			}
+		}
 
-	    private static async Task MainAsync(IElasticClient client, ColoredConsoleWriter output)
-        {
-	        var asyncOperations = new List<IAsyncProfiledOperation>
-	        {
+		private static async Task MainAsync(IElasticClient client, ColoredConsoleWriter output)
+		{
+			var asyncOperations = new List<IAsyncProfiledOperation>
+			{
 				new AliasAsyncOperation(),
 				new AliasExistsAsyncOperation(),
 				new AnalyzeAsyncOperation(),
 				new BulkAsyncOperation(),
-		        new IndexAsyncOperation(),
+				new IndexAsyncOperation(),
 				new SearchAsyncOperation(),
 				new CatAsyncOperation(),
 				new GetMappingAsyncOperation()
-	        };
+			};
 
-	        foreach (var asyncOperation in asyncOperations)
-	        {
-		        await asyncOperation.RunAsync(client, output).ConfigureAwait(false);
-	        }
-        }
-    }
+			foreach (var asyncOperation in asyncOperations)
+			{
+				await asyncOperation.RunAsync(client, output).ConfigureAwait(false);
+			}
+		}
+	}
 }
diff --git a/src/Profiling/Properties/AssemblyInfo.cs b/src/Profiling/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyDescriptionAttribute("")]
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
-[assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.5")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.5")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0-alpha1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.0";
+        internal const string Version = "5.0.0";
     }
 }
diff --git a/src/Tests/CodeStandards/ElasticClient.doc.cs b/src/Tests/CodeStandards/ElasticClient.doc.cs
diff --git a/src/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs b/src/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs
diff --git a/src/Tests/Properties/AssemblyInfo.cs b/src/Tests/Properties/AssemblyInfo.cs
diff --git a/src/Tests/QueryDsl/BoolDsl/BoolApiTests.cs b/src/Tests/QueryDsl/BoolDsl/BoolApiTests.cs
diff --git a/src/Tests/project.json b/src/Tests/project.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2.0.5",`
	`2`	`+ "version": "5.0.0-alpha1",`
`3`	`3`	`"compilationOptions": {`
`4`	`4`	`"warningsAsErrors": false,`
`5`	`5`	`"define": [ "LINQ", "NDESK_OPTIONS" ],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-//TODO needs IFDEF?`
`2`		`-`
`3`		`-#if NET45`
	`1`	`+#if NET45`
`4`	`2`	`namespace System.Runtime.CompilerServices`
`5`	`3`	`{`
`6`	`4`	`internal class FormattableStringFactory`