update packages and core tests projects

Mpdreamz · Mpdreamz · commit b42901f902de · 2020-05-25T17:41:12.000+02:00
(cherry picked from commit 0f800bb) (cherry picked from commit 52eb7cd)
diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
@@ -38,7 +38,7 @@
     <PackageReference Include="FSharp.Core" Version="4.7.0" />
     
     <PackageReference Include="Bullseye" Version="3.3.0" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20200306T203119" />
+    <PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.1.0-canary.0.244" />
     
     <PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
     <PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />
diff --git a/nuget.config b/nuget.config
@@ -1,10 +1,8 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
-		<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
 		<add key="Elastic Abstractions CI" value="https://ci.appveyor.com/nuget/elasticsearch-net-abstractions" />
 		<add key="Versioned Clients" value="https://ci.appveyor.com/nuget/elasticsearch-net" />
-		<add key="AssemblyRewriter" value="https://ci.appveyor.com/nuget/assemblyrewriter" />
-		<add key="AssemblyDiffer" value="https://ci.appveyor.com/nuget/assemblydiffer" />
+		<add key="github" value="https://nuget.pkg.github.com/elastic/index.json" />
 	</packageSources>
 </configuration>
diff --git a/tests/Tests.Benchmarking/BenchmarkProgram.cs b/tests/Tests.Benchmarking/BenchmarkProgram.cs
@@ -1,18 +1,20 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 ﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Running;
-using Elastic.BenchmarkDotNetExporter;
-using LibGit2Sharp;
+using Elastic.CommonSchema.BenchmarkDotNetExporter;
 
 namespace Tests.Benchmarking
 {
diff --git a/tests/Tests.Benchmarking/Tests.Benchmarking.csproj b/tests/Tests.Benchmarking/Tests.Benchmarking.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
-    <PackageReference Include="Elastic.BenchmarkDotNetExporter" Version="0.1.0-ci20191209T135928" />
+    <PackageReference Include="Elastic.CommonSchema.BenchmarkDotNetExporter" Version="1.5.0" />
     <PackageReference Include="LibGit2Sharp" Version="0.26.0-preview-0062" />
     <PackageReference Include="NEST.v7" Version="7.5.0-ci20191031T180108" />
   </ItemGroup>
diff --git a/tests/Tests.ClusterLauncher/ClusterLaunchProgram.cs b/tests/Tests.ClusterLauncher/ClusterLaunchProgram.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Elastic.Managed;
-using Elastic.Managed.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Managed;
 using FluentAssertions.Common;
 using Tests.Configuration;
 using Tests.Core.ManagedElasticsearch.Clusters;
diff --git a/tests/Tests.Configuration/TestConfigurationBase.cs b/tests/Tests.Configuration/TestConfigurationBase.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using Elastic.Stack.Artifacts;
+using Elastic.Stack.ArtifactsApi;
 
 namespace Tests.Configuration
 {
diff --git a/tests/Tests.Configuration/Tests.Configuration.csproj b/tests/Tests.Configuration/Tests.Configuration.csproj
@@ -3,6 +3,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20200306T203119" />
+    <PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.1.0-canary.0.244" />
   </ItemGroup>
 </Project>
diff --git a/tests/Tests.Core/Extensions/EphemeralClusterExtensions.cs b/tests/Tests.Core/Extensions/EphemeralClusterExtensions.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Security.Cryptography.X509Certificates;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit;
-using Elasticsearch.Net;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit;
+ using Elasticsearch.Net;
 using Nest;
 using Tests.Core.Client.Settings;
 
diff --git a/tests/Tests.Core/ManagedElasticsearch/ClusterTestClassBase.cs b/tests/Tests.Core/ManagedElasticsearch/ClusterTestClassBase.cs
@@ -1,5 +1,9 @@
-﻿using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 
diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs
@@ -1,8 +1,8 @@
 ﻿using System.IO;
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Plugins;
-using Elastic.Stack.Artifacts.Products;
-using Elastic.Xunit;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Plugins;
+using Elastic.Elasticsearch.Xunit;
+using Elastic.Stack.ArtifactsApi.Products;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Configuration;
diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs
@@ -1,5 +1,8 @@
-using Elastic.Managed.Ephemeral.Plugins;
-using static Elastic.Stack.Artifacts.Products.ElasticsearchPlugin;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using static Elastic.Stack.ArtifactsApi.Products.ElasticsearchPlugin;
 
 namespace Tests.Core.ManagedElasticsearch.Clusters
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/ReadOnlyCluster.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/ReadOnlyCluster.cs
@@ -1,5 +1,5 @@
 ﻿using Tests.Core.ManagedElasticsearch.NodeSeeders;
-using static Elastic.Stack.Artifacts.Products.ElasticsearchPlugin;
+using static Elastic.Stack.ArtifactsApi.Products.ElasticsearchPlugin;
 
 namespace Tests.Core.ManagedElasticsearch.Clusters
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/WatcherStateCluster.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/WatcherStateCluster.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using Elastic.Managed.Configuration;
+ using Elastic.Elasticsearch.Managed.Configuration;
 
 namespace Tests.Core.ManagedElasticsearch.Clusters
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs
@@ -1,11 +1,12 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using System.Collections.Generic;
-using Elastic.Managed.Configuration;
-using Elastic.Managed.Ephemeral.Plugins;
-using Elastic.Stack.Artifacts;
-using Elastic.Stack.Artifacts.Products;
+using Elastic.Stack.ArtifactsApi.Products;
 using Tests.Core.Client;
 using Tests.Core.ManagedElasticsearch.NodeSeeders;
-using static Elastic.Stack.Artifacts.Products.ElasticsearchPlugin;
+using static Elastic.Stack.ArtifactsApi.Products.ElasticsearchPlugin;
 
 namespace Tests.Core.ManagedElasticsearch.Clusters
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.IO;
-using Elastic.Managed.Ephemeral;
-using Elastic.Stack.Artifacts.Products;
-using Elastic.Xunit;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit;
+using Elastic.Stack.ArtifactsApi.Products;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.Extensions;
diff --git a/tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureNativeSecurityRealmEnabledInElasticsearchYaml.cs b/tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureNativeSecurityRealmEnabledInElasticsearchYaml.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Elastic.Managed.ConsoleWriters;
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Managed.ConsoleWriters;
 
 namespace Tests.Core.ManagedElasticsearch.Tasks
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationInElasticsearchYaml.cs b/tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationInElasticsearchYaml.cs
@@ -1,8 +1,8 @@
 using System.IO;
 using System.Linq;
-using Elastic.Managed.ConsoleWriters;
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Managed.ConsoleWriters;
 
 namespace Tests.Core.ManagedElasticsearch.Tasks
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationSecretsInKeystore.cs b/tests/Tests.Core/ManagedElasticsearch/Tasks/EnsureWatcherActionConfigurationSecretsInKeystore.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using System.IO;
-using System.Linq;
-using Elastic.Managed.ConsoleWriters;
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Tasks;
-using ProcNet;
-using ProcNet.Std;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Managed.ConsoleWriters;
 
 namespace Tests.Core.ManagedElasticsearch.Tasks
 {
diff --git a/tests/Tests.Core/ManagedElasticsearch/Tasks/WriteAnalysisFiles.cs b/tests/Tests.Core/ManagedElasticsearch/Tasks/WriteAnalysisFiles.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
-using Elastic.Managed.ConsoleWriters;
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Managed.ConsoleWriters;
 using Tests.Core.ManagedElasticsearch.Clusters;
 
 namespace Tests.Core.ManagedElasticsearch.Tasks
diff --git a/tests/Tests.Core/Tests.Core.csproj b/tests/Tests.Core/Tests.Core.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="coverlet.collector" Version="1.1.0" />
-    <PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20200306T203119" />
+    <PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.1.0-canary.0.244" />
     <PackageReference Include="FluentAssertions" Version="5.7.0" />
     
     <PackageReference Include="DiffPlex" Version="1.4.1" />
diff --git a/tests/Tests.Core/Xunit/IntegrationOnlyAttribute.cs b/tests/Tests.Core/Xunit/IntegrationOnlyAttribute.cs
@@ -1,4 +1,8 @@
-﻿using Elastic.Xunit.XunitPlumbing;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Tests.Configuration;
 
 namespace Tests.Core.Xunit
diff --git a/tests/Tests.Core/Xunit/JsonNetSerializerOnlyAttribute.cs b/tests/Tests.Core/Xunit/JsonNetSerializerOnlyAttribute.cs
@@ -1,4 +1,8 @@
-using Elastic.Xunit.XunitPlumbing;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Tests.Core.Client;
 
 namespace Tests.Core.Xunit
diff --git a/tests/Tests.Core/Xunit/NeedsTypedKeysAttribute.cs b/tests/Tests.Core/Xunit/NeedsTypedKeysAttribute.cs
@@ -1,4 +1,8 @@
-﻿using Elastic.Xunit.XunitPlumbing;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Tests.Configuration;
 
 namespace Tests.Core.Xunit
diff --git a/tests/Tests.Core/Xunit/NestXunitRunOptions.cs b/tests/Tests.Core/Xunit/NestXunitRunOptions.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Elastic.Xunit;
+using Elastic.Elasticsearch.Xunit;
 using Tests.Configuration;
 using Tests.Core.VsTest;
 
diff --git a/tests/Tests.Core/Xunit/ProjectReferenceOnlyAttribute.cs b/tests/Tests.Core/Xunit/ProjectReferenceOnlyAttribute.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Tests.Core.Client;
 
 namespace Tests.Core.Xunit
diff --git a/tests/Tests.Core/Xunit/SkipOnCiAttribute.cs b/tests/Tests.Core/Xunit/SkipOnCiAttribute.cs
@@ -1,6 +1,9 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 ﻿using System;
-using System.Threading;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 
 namespace Tests.Core.Xunit
 {
diff --git a/tests/Tests.Domain/Tests.Domain.csproj b/tests/Tests.Domain/Tests.Domain.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bogus" Version="22.1.2" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20200306T203119" />
+    <PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.1.0-canary.0.244" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <ProjectReference Include="$(SolutionRoot)\tests\Tests.Configuration\Tests.Configuration.csproj" />
   </ItemGroup>
diff --git a/tests/Tests/Aggregations/AggregationUsageTestBase.cs b/tests/Tests/Aggregations/AggregationUsageTestBase.cs
@@ -1,4 +1,8 @@
-﻿using System;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+ using System;
 using System.Threading.Tasks;
 using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using Elastic.Stack.Artifacts;`
	`2`	`+using Elastic.Stack.ArtifactsApi;`
`3`	`3`
`4`	`4`	`namespace Tests.Configuration`
`5`	`5`	`{`