Bump some more versions

elastic · Feb 27, 2024 · 9c0e050 · 9c0e050
1 parent a57840f
commit 9c0e050
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 20 deletions.
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -19,15 +19,15 @@
   </PropertyGroup>
 
   <ItemGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)Tests$'))">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 
-    <PackageReference Include="JunitXml.TestLogger" Version="3.0.114" PrivateAssets="All" />
+    <PackageReference Include="JunitXml.TestLogger" Version="3.1.12" PrivateAssets="All" />
     <PackageReference Include="Nullean.VsTest.Pretty.TestLogger" Version="0.3.0" PrivateAssets="All" />
 
     <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/test/Elastic.Apm.Tests.Utilities/Elastic.Apm.Tests.Utilities.csproj b/test/Elastic.Apm.Tests.Utilities/Elastic.Apm.Tests.Utilities.csproj
@@ -35,9 +35,9 @@
     <ItemGroup>
       <PackageReference Include="Proc" Version="0.6.2" />
       <PackageReference Include="FluentAssertions" Version="5.6.0" />
-      <PackageReference Include="Moq" Version="4.12.0" />
+      <PackageReference Include="Moq" Version="4.20.70" />
       <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
-      <PackageReference Include="xunit" Version="2.4.1" />
+      <PackageReference Include="xunit" Version="2.7.0" />
     </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestBase.cs b/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestBase.cs
@@ -63,7 +63,7 @@ private void AssertMetaData(MetadataDto metaData)
 		metaData.Service.Runtime.Name.Should().Be(Context.RuntimeName);
 		metaData.Service.Framework.Name.Should().Be("Azure Functions");
 		metaData.Service.Framework.Version.Should().Be("4");
-		// TODO - removing this assertion as we can no longer seem to set this value without causing a host error
+		// TODO - temporarily removing this assertion as we can no longer seem to set this value without causing a host error
 		//metaData.Service.Node.ConfiguredName.Should().Be("20367ea8-70b9-41b4-a552-b2a826b3aa0b");
 	}
 

diff --git a/test/azure/applications/Elastic.AzureFunctionApp.InProcess/local.settings.json b/test/azure/applications/Elastic.AzureFunctionApp.InProcess/local.settings.json
@@ -6,6 +6,8 @@
     "FUNCTIONS_EXTENSION_VERSION": "4",
     "WEBSITE_OWNER_NAME": "abcd1234-abcd-acdc-1234-112233445566+testfaas_group-CentralUSwebspace-Linux",
     "WEBSITE_SITE_NAME": "testfaas"
+    // Include this breaks on the latest version of func - Excluding it for now.
+    //"WEBSITE_INSTANCE_ID": "20367ea8-70b9-41b4-a552-b2a826b3aa0b"
   },
   "Host": {
     "LocalHttpPort": 17073

diff --git a/...e/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj b/...e/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj
@@ -8,9 +8,13 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
+    <!-- 
+    The versions below are NOT the latest but anything newer breaks when attempting to run func
+    See: https://github.com/Azure/azure-functions-core-tools/issues/3594
+    -->
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.20.0"/>
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.1"/>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13"/>
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0"/>
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/test/azure/applications/Elastic.AzureFunctionApp.Isolated/local.settings.json b/test/azure/applications/Elastic.AzureFunctionApp.Isolated/local.settings.json
@@ -5,6 +5,8 @@
     "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
     "FUNCTIONS_EXTENSION_VERSION": "4",
     "WEBSITE_OWNER_NAME": "abcd1234-abcd-acdc-1234-112233445566+testfaas_group-CentralUSwebspace-Linux",
-    "WEBSITE_SITE_NAME": "testfaas"
+    "WEBSITE_SITE_NAME": "testfaas",
+    // Include this breaks on the latest version of func - Excluding it for now.
+    //"WEBSITE_INSTANCE_ID": "20367ea8-70b9-41b4-a552-b2a826b3aa0b"
   }
 }
diff --git a/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
     <PackageReference Include="Elasticsearch.Net.VirtualizedCluster" Version="7.6.1" />
     <PackageReference Include="Testcontainers.Elasticsearch" Version="3.4.0" />

diff --git a/...rumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj b/...rumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj
@@ -10,14 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="coverlet.collector" Version="1.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     <PackageReference Include="TestEnvironment.Docker" Version="1.2.2" />
     <PackageReference Include="TestEnvironment.Docker.Containers.Mssql" Version="1.0.3" />

diff --git a/...ations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj b/...ations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="StackExchange.Redis" Version="2.7.20" />
     <PackageReference Include="Proc" Version="0.6.2" />
     <PackageReference Include="Testcontainers.Redis" Version="3.7.0" />

diff --git a/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj b/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Google.Protobuf" Version="3.25.3" />
     <PackageReference Include="Grpc.Net.ClientFactory" Version="2.61.0" />
     <PackageReference Include="Grpc.Tools" Version="2.62.0">

diff --git a/...tegrations/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj b/...tegrations/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj
@@ -3,7 +3,7 @@
       <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0"/>
   </ItemGroup>

diff --git a/test/integrations/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj b/test/integrations/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />

diff --git a/...grations/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj b/...grations/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...grations/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj b/...grations/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
   </ItemGroup>
 
   <ItemGroup>