Upgrade Elasticsearch.Net to 7.8.1 (#343)

* Fix missing Elastic.Managed and Elastic.Xunit packages Packages were renamed to Elastic.Elasticsearch.*. Old versions were removed from the Elastic Abstractions CI feed. Part of #340 fix. * Upgrade Elasticsearch.Net to 7.8.1 Fixes #340.
serilog-contrib · Jul 9, 2020 · cba4101 · cba4101
1 parent 836f651
commit cba4101
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 28 deletions.
diff --git a/src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj b/src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj
@@ -47,12 +47,12 @@
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
-    <PackageReference Include="Elasticsearch.Net" Version="7.0.0" />
+    <PackageReference Include="Elasticsearch.Net" Version="7.8.1" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
   </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+        <PackageReference Include="Microsoft.CSharp" Version="4.6.0" />
     </ItemGroup>
 
 </Project>
diff --git a/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Bootstrap/ClientTestClusterBase.cs b/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Bootstrap/ClientTestClusterBase.cs
@@ -1,7 +1,7 @@
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Plugins;
-using Elastic.Xunit;
-using Nest;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Plugins;
+using Elastic.Elasticsearch.Xunit;
+using Elastic.Stack.ArtifactsApi.Products;
 
 namespace Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap
 {

diff --git a/...Sinks.Elasticsearch.IntegrationTests/Bootstrap/SerilogSinkElasticsearchXunitRunOptions.cs b/...Sinks.Elasticsearch.IntegrationTests/Bootstrap/SerilogSinkElasticsearchXunitRunOptions.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using Elastic.Xunit;
+using Elastic.Elasticsearch.Xunit;
 
 namespace Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap
 {

diff --git a/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Bootstrap/XunitBootstrap.cs b/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Bootstrap/XunitBootstrap.cs
@@ -1,6 +1,6 @@
-using Elastic.Xunit;
+using Elastic.Elasticsearch.Xunit;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;
 using Xunit;
 
-[assembly: TestFramework("Elastic.Xunit.Sdk.ElasticTestFramework", "Elastic.Xunit")]
+[assembly: TestFramework("Elastic.Elasticsearch.Xunit.Sdk.ElasticTestFramework", "Elastic.Elasticsearch.Xunit")]
 [assembly: ElasticXunitConfiguration(typeof(SerilogSinkElasticsearchXunitRunOptions))]
diff --git a/....Sinks.Elasticsearch.IntegrationTests/Elasticsearch6/Bootstrap/Elasticsearch6XTestBase.cs b/....Sinks.Elasticsearch.IntegrationTests/Elasticsearch6/Bootstrap/Elasticsearch6XTestBase.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net6;
 using Nest6;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;

diff --git a/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch6/Elasticsearch6X.cs b/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch6/Elasticsearch6X.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Elasticsearch6.Bootstrap;

diff --git a/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch6/Elasticsearch6XUsing7X.cs b/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch6/Elasticsearch6XUsing7X.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Elasticsearch6.Bootstrap;

diff --git a/...g.Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Bootstrap/Elasticsearch7XCluster.cs b/...g.Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Bootstrap/Elasticsearch7XCluster.cs
@@ -8,7 +8,7 @@ public Elasticsearch7XCluster() : base(CreateConfiguration()) { }
 
 		private static ClientTestClusterConfiguration CreateConfiguration()
 		{
-			return new ClientTestClusterConfiguration("7.0.0")
+			return new ClientTestClusterConfiguration("7.8.0")
 			{
 				MaxConcurrency = 1
 			};

diff --git a/....Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Bootstrap/Elasticsearch7XTestBase.cs b/....Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Bootstrap/Elasticsearch7XTestBase.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;

diff --git a/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Elasticsearch7X.cs b/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Elasticsearch7X.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Elasticsearch7.Bootstrap;

diff --git a/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Elasticsearch7XUsing6X.cs b/test/Serilog.Sinks.Elasticsearch.IntegrationTests/Elasticsearch7/Elasticsearch7XUsing6X.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Bootstrap;
 using Serilog.Sinks.Elasticsearch.IntegrationTests.Elasticsearch7.Bootstrap;

diff --git a/....Sinks.Elasticsearch.IntegrationTests/Serilog.Sinks.Elasticsearch.IntegrationTests.csproj b/....Sinks.Elasticsearch.IntegrationTests/Serilog.Sinks.Elasticsearch.IntegrationTests.csproj
@@ -19,10 +19,10 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190708T081758" />
-    <PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20190708T081758" />
+    <PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.2.4" />
+    <PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.2.4" />
     <PackageReference Include="FluentAssertions" Version="5.7.0" />
-    <PackageReference Include="NEST" Version="7.0.0" />
+    <PackageReference Include="NEST" Version="7.8.1" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
   </ItemGroup>
 </Project>
diff --git a/test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj b/test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj
@@ -51,15 +51,15 @@
 
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-version" Version="1.1.2" />
-      
+
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
     <PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-3" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Elasticsearch.Net" Version="7.0.0" />
-    <PackageReference Include="NEST" Version="7.0.0" />
-    <PackageReference Include="NEST.JsonNetSerializer" Version="7.0.0" />
+    <PackageReference Include="Elasticsearch.Net" Version="7.8.1" />
+    <PackageReference Include="NEST" Version="7.8.1" />
+    <PackageReference Include="NEST.JsonNetSerializer" Version="7.8.1" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.2" />
     <PackageReference Include="FluentAssertions" Version="4.19.4" />
   </ItemGroup>
@@ -77,7 +77,7 @@
 
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+        <PackageReference Include="Microsoft.CSharp" Version="4.6.0" />
     </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">