Merge branch '2.x' into fix/2.x-termvector-filters

Author: russcam

NuGet.config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="Temp DiffPlex Feed" value="https://www.myget.org/F/diffplex-temp/api/v3/index.json" />
+    <add key="Xunit myget" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
   </packageSources>
-</configuration>
+</configuration>

build.bat

@@ -23,6 +23,7 @@ SET VERSION=
 SET ESVERSIONS=
 SET SKIPTESTS=0
 SET APIKEY=
+SET APIKEYPROVIDED="<empty>"
 SET FEED="elasticsearch-net"
 
 IF /I "%1"=="skiptests" (
@@ -50,12 +51,15 @@ IF /I "%1%"=="integrate" (
 )
 
 IF /I "%1%"=="canary" (
-	IF NOT [%2]==[] IF NOT "%2"=="skiptests" set APIKEY="%2"
+	IF NOT [%2]==[] IF NOT "%2"=="skiptests" (
+		set APIKEY="%2"
+		SET APIKEYPROVIDED="<redacted>"
+	)
 	IF NOT [%3]==[] IF NOT "%3"=="skiptests" set FEED="%3"
 	IF /I "%4"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
 )
 
-ECHO starting build using target=%TARGET% version=%VERSION% esversions=%ESVERSIONS% skiptests=%SKIPTESTS% apiKey=%APIKEY% feed=%FEED%
+ECHO starting build using target=%TARGET% version=%VERSION% esversions=%ESVERSIONS% skiptests=%SKIPTESTS% apiKey=%APIKEYPROVIDED% feed=%FEED%
 "packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%"

build/scripts/Building.fsx

@@ -31,7 +31,18 @@ type Build() =
         |> Seq.iter(fun p ->
             let projectName = (p.Name |> directoryInfo).Name
             let link framework = 
-                GitLink.Exec ["."; "-u"; Paths.Repository; "-d"; (Paths.ProjectOutputFolder p framework); "-include"; projectName] 
+                //TC sets these so gitlink does not need to recreate
+                let branch = environVarOrNone "GITBRANCH"
+                let commit = environVarOrNone "GITCOMMIT"
+                let args = Seq.empty
+                           |> match branch with
+                              | Some b -> Seq.append ["-b"; b] 
+                              | None -> Seq.append Seq.empty
+                           |> match commit with
+                              | Some c -> Seq.append ["-s"; c] 
+                              | None -> Seq.append Seq.empty
+                           |> Seq.append ["."; "-u"; Paths.Repository; "-d"; (Paths.ProjectOutputFolder p framework); "-include"; projectName]
+                GitLink.Exec ["."; "-u"; Paths.Repository; "-d"; (Paths.ProjectOutputFolder p framework); "-include"; projectName]
                 |> ignore
             link DotNetFramework.Net45
             link DotNetFramework.Net46

build/scripts/Targets.fsx

@@ -74,7 +74,7 @@ Target "Canary" <| fun _ ->
 "QuickCompile"
   ==> "QuickTest"
 
-"QuickCompile"
+"BuildApp"
   ==> "Integrate"
 
 "Build"

build/scripts/Testing.fsx

@@ -34,4 +34,4 @@ module Tests =
 
         for esVersion in esVersions do
             setProcessEnvironVar "NEST_INTEGRATION_VERSION" esVersion
-            testProjectJson "none"
+            testDesktopClr "all"

paket.dependencies

@@ -11,7 +11,6 @@ nuget System.Collections.Immutable
 nuget System.Reflection.Metadata  1.2.0
 
 //tests
-nuget xunit 
 nuget FluentAssertions 
 nuget Bogus
 nuget DiffPlex 
@@ -28,11 +27,17 @@ source https://api.nuget.org/v3/index.json
 
 nuget AsciiDocNet
 
+source https://www.myget.org/F/xunit/
+nuget xunit 2.2.0-beta3-build3330
+nuget xunit.abstractions 2.0.1-rc2
+
 group build
 
     source https://www.nuget.org/api/v2
 
     nuget FAKE
     nuget FSharp.Data
     nuget GitLink prerelease
-    nuget xunit.runner.console
+
+    source https://www.myget.org/F/xunit/
+    nuget xunit.runner.console 2.2.0-beta3-build3330

paket.lock

@@ -35,6 +35,7 @@
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <Content Include="last_downloaded_version.txt" />
     <Content Include="razormachine.readme.txt">
       <Paket>True</Paket>
     </Content>
@@ -61,6 +62,7 @@
     <Compile Include="Domain\RestApiSpec.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="Overrides\Allow404\ApiEndpointsThatAllow404.cs" />
+    <Compile Include="Overrides\Descriptors\AnalyzeDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ClearCacheDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ClearCachedRealmsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ClearCachedRolesDescriptorOverrides.cs" />

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace ApiGenerator.Overrides.Descriptors
+{
+	public class AnalyzeDescriptorOverrides : DescriptorOverridesBase
+	{
+		public override IEnumerable<string> SkipQueryStringParams => new[]
+		{
+			"analyzer",
+			"char_filters",
+			"char_filter",
+			"field",
+			"filters",
+			"filter",
+			"text",
+			"tokenizer"
+		};
+	}
+}

src/CodeGeneration/ApiGenerator/Overrides/Descriptors/AnalyzeDescriptorOverrides.cs

@@ -22,7 +22,7 @@ namespace Elasticsearch.Net
 	///@method.Documentation
 	///</pre>
 	///</summary>
-	public class @method.QueryStringParamName : FluentRequestParameters<@method.QueryStringParamName>
+	public partial class @method.QueryStringParamName : FluentRequestParameters<@method.QueryStringParamName>
 	{
 		public override HttpMethod DefaultHttpMethod => HttpMethod.@method.HttpMethod;
 	@foreach (KeyValuePair<string, ApiQueryParameters> kv in method.Url.Params)