Fix/old connection random (#3391)

* FEATURE_HTTP_WEB_REQUEST is outdated both netstandard2x and net4x support it, rely on DOTNETCORE pragma only

* update .editorconfig to make sure props and targets are formatted like xml and csproj

* Move away from Directory.build.props for a more explicit inclusion approach, reformatted Solution items and moved scripts out of Solution items

* Remove random old connection usage and add explict net461 testing back

* Remove Tests\Directory.build.props it set a TESTINGNUGETPACKAGE pragma which was never used

* cleanup namespaces on full .net HttpConnection alias class

* Obsolete HttpWebRequestConnection on CoreFX since it does not reuse HttpClient instances

* Revert "Remove Tests\Directory.build.props it set a TESTINGNUGETPACKAGE pragma which was never used"

This reverts commit da2d826.

* Remove setting of the TESTINGNUGETPACKAGE constant, not used anywher

* Comment looping up for Directory.build.props for now

* Add root Directory.build.props (for now only sets LangVersion to latest)

Author: Mpdreamz

.editorconfig

@@ -16,7 +16,7 @@ indent_size = 4
 indent_style = space
 indent_size = 4
 
-[*.{md,markdown,json,js,csproj,fsproj,targets}]
+[*.{md,markdown,json,js,csproj,fsproj,targets,targets,props}]
 indent_style = space
 indent_size = 2
 

build/scripts/scripts.fsproj

@@ -61,6 +61,12 @@
     <None Include="Commandline.fsx" />
     <None Include="Targets.fsx" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\paket.bat"><Link>paket.bat</Link></Content>
+    <Content Include="..\..\paket.dependencies"><Link>paket.bat</Link></Content>
+    <Content Include="..\..\build.sh"><Link>paket.bat</Link></Content>
+    <Content Include="..\..\build.bat"><Link>paket.bat</Link></Content>
+  </ItemGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>

src/Artifacts.build.props

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Library.build.props" />
+  <!--
+   Sets up the properties for assemblies we want to publish to a separate output folder (outside of src) during our build process.
+   e.g ApiGenerator we'd like to keep private but we do want to publish it to build/_output during our FAKE build
+  -->
+  <PropertyGroup>
+    <OutputPath Condition="'$(OutputPathBaseDir)' != ''">$(OutputPathBaseDir)\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+</Project>

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -17,5 +18,4 @@
     <PackageReference Include="RazorLight.Unofficial" Version="2.0.0-beta1.1" />
     <!--<PackageReference Include="RazorLight" Version="2.0.0-beta1" />-->
   </ItemGroup>
-  <Import Project="..\..\outputpath.props" />
 </Project>

src/CodeGeneration/DocGenerator/Buildalyzer/ProjectAnalyzer.cs

@@ -119,6 +119,8 @@ public Project Load()
 			}
 		}
 
+
+
 		// Tweaks the project file a bit to ensure a succesfull build
 		private static XDocument TweakProjectDocument(XDocument projectDocument, string projectFolder)
 		{
@@ -128,10 +130,12 @@ private static XDocument TweakProjectDocument(XDocument projectDocument, string
 				if (att == null) continue;
 
 				var project = att.Value;
-				if (project.EndsWith("Clients.Common.targets"))
-					att.Value = Path.GetFullPath(Path.Combine(projectFolder, att.Value));
-				else if (project.EndsWith("outputpath.props"))
-					att.Value = Path.GetFullPath(Path.Combine(projectFolder, att.Value));
+
+				if (!ResolveKnownPropsPath(projectFolder, project, att, "PublishArtifacts.build.props"))
+				{
+					ResolveKnownPropsPath(projectFolder, project, att, "Artifacts.build.props");
+				}
+				ResolveKnownPropsPath(projectFolder, project, att, "Library.build.props");
 			}
 			// Add SkipGetTargetFrameworkProperties to every ProjectReference
 			foreach (XElement projectReference in projectDocument.GetDescendants("ProjectReference").ToArray())
@@ -149,6 +153,17 @@ private static XDocument TweakProjectDocument(XDocument projectDocument, string
 			return projectDocument;
 		}
 
+		private static bool ResolveKnownPropsPath(string projectFolder, string project, XAttribute att, string buildPropFile)
+		{
+			if (!project.Contains(buildPropFile)) return false;
+			var dir = new DirectoryInfo(projectFolder).Parent;
+			while (dir != null && dir.Name != "src")
+				dir = dir.Parent;
+			if (dir == null) return true;
+			att.Value = Path.GetFullPath(Path.Combine(dir.FullName, buildPropFile));
+			return false;
+		}
+
 		private ProjectCollection CreateProjectCollection()
 		{
 			ProjectCollection projectCollection = new ProjectCollection(_globalProperties);

src/CodeGeneration/DocGenerator/DocGenerator.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -17,5 +18,4 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.3.2" />
     <PackageReference Include="NuDoq" Version="1.2.5" />
   </ItemGroup>
-  <Import Project="..\..\outputpath.props" />
 </Project>

src/Directory.build.props

@@ -1,27 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<!-- Default Version numbers -->
-		<CurrentVersion>6.0.0</CurrentVersion>
-		<CurrentAssemblyVersion>6.0.0</CurrentAssemblyVersion>
-		<CurrentAssemblyFileVersion>6.0.0</CurrentAssemblyFileVersion>
-		<!-- Version and Informational reflect actual version -->
-		<Version>$(CurrentVersion)</Version>
-		<InformationalVersion>$(CurrentVersion)</InformationalVersion>
-		<!-- Assembly version is sticky to MAJOR.0.0.0 to avoid binding redirects because we strong name our assemblies -->
-		<AssemblyVersion>$(CurrentAssemblyVersion)</AssemblyVersion>
-		<!-- File version reflects actual version number without prelease since that not allowed in its struct -->
-		<FileVersion>$(CurrentAssemblyFileVersion)</FileVersion>
-
-		<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
-		<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
-		<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.1'">$(DefineConstants);DOTNETCORE</DefineConstants>
-
-		<RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri>
-		<Authors>Elasticsearch BV</Authors>
-		<Copyright>Elasticsearch BV</Copyright>
-		<PackageProjectUrl>https://github.com/elastic/elasticsearch-net</PackageProjectUrl>
-		<PackageLicenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</PackageLicenseUrl>
-		<ReleaseNotes>See https://github.com/elastic/elasticsearch-net/releases</ReleaseNotes>
-		<PackageIconUrl>https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png</PackageIconUrl>
+    <LangVersion>Latest</LangVersion>
 	</PropertyGroup>
 </Project>

src/Elasticsearch.Net/Connection/CertificateValidations.cs

@@ -57,7 +57,7 @@ public static Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> Au
 
 		private static X509Certificate2 to2(X509Certificate certificate)
 		{
-			#if !FEATURE_HTTPWEBREQUEST
+			#if DOTNETCORE
 				return new X509Certificate2(certificate.Export(X509ContentType.Cert));
 			#else
 				return new X509Certificate2(certificate);

src/Elasticsearch.Net/Connection/ClientCertificate.cs

@@ -36,8 +36,8 @@ THE SOFTWARE.
 
 namespace Elasticsearch.Net
 {
-//.NET removed the setter for PrivateKey for X509Certificate, you'll have to manually convert to pfx/p12 or add the key to the machine store
-#if FEATURE_HTTPWEBREQUEST
+//.NET core removed the setter for PrivateKey for X509Certificate, you'll have to manually convert to pfx/p12 or add the key to the machine store
+#if !DOTNETCORE
 
 	public class ClientCertificate
 	{

src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs

@@ -1,4 +1,4 @@
-#if !FEATURE_HTTPWEBREQUEST
+#if DOTNETCORE
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -29,6 +29,8 @@ internal class WebProxy : IWebProxy
 		public bool IsBypassed(Uri host) => host.IsLoopback;
 	}
 
+
+	/// <summary> The default IConnection implementation. Uses <see cref="HttpClient"/>.</summary>
 	public class HttpConnection : IConnection
 	{
 		private readonly object _lock = new object();