From 9c0e0506161946d8b5010618b2585529a8a0bb57 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 27 Feb 2024 17:47:32 +0100 Subject: [PATCH] Bump some more versions --- test/Directory.Build.props | 8 ++++---- .../Elastic.Apm.Tests.Utilities.csproj | 4 ++-- test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj | 2 +- .../AzureFunctionsTestBase.cs | 2 +- .../local.settings.json | 2 ++ .../Elastic.AzureFunctionApp.Isolated.csproj | 6 +++++- .../Elastic.AzureFunctionApp.Isolated/local.settings.json | 4 +++- .../Elastic.Apm.Elasticsearch.Tests.csproj | 2 +- .../Elastic.Apm.EntityFramework6.Tests.csproj | 6 +++--- .../Elastic.Apm.StackExchange.Redis.Tests.csproj | 2 +- .../Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj | 2 +- .../Elastic.Apm.AspNetCore.Static.Tests.csproj | 2 +- .../Elastic.Apm.AspNetCore.Tests.csproj | 2 +- .../Elastic.Apm.Extensions.Hosting.Tests.csproj | 2 +- .../Elastic.Apm.Extensions.Logging.Tests.csproj | 2 +- 15 files changed, 28 insertions(+), 20 deletions(-) diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 27f797bc5..e11794c80 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -19,15 +19,15 @@ - + - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Elastic.Apm.Tests.Utilities/Elastic.Apm.Tests.Utilities.csproj b/test/Elastic.Apm.Tests.Utilities/Elastic.Apm.Tests.Utilities.csproj index 0b3c33a0d..1d00e874c 100644 --- 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 @@ - + - + diff --git a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj index 43bf70a7a..ec857243d 100644 --- a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj +++ b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj @@ -28,7 +28,7 @@ - + diff --git a/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestBase.cs b/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestBase.cs index 394f8b090..034d66a42 100644 --- 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 index add4c24d9..320edb1e3 100644 --- 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/test/azure/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj b/test/azure/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj index c178a7baa..5d928890c 100644 --- a/test/azure/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj +++ b/test/azure/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj @@ -8,9 +8,13 @@ false + - + diff --git a/test/azure/applications/Elastic.AzureFunctionApp.Isolated/local.settings.json b/test/azure/applications/Elastic.AzureFunctionApp.Isolated/local.settings.json index c81a988c8..a210c313c 100644 --- 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" } } \ No newline at end of file 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 index 261aa2eec..d63d5e98c 100644 --- 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 @@ - + diff --git a/test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj b/test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj index 45eefd9c5..4bb499f48 100644 --- a/test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj @@ -10,14 +10,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj b/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj index c8746cf3f..0d8e9c702 100644 --- a/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj @@ -6,7 +6,7 @@ - + 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 index 4e93ad627..b6f7490f2 100644 --- 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 @@ - + diff --git a/test/integrations/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj b/test/integrations/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj index 54bd53954..a8f8afd26 100644 --- a/test/integrations/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj +++ b/test/integrations/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj @@ -3,7 +3,7 @@ net8.0 - + 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 index de4dfcacd..e86422f51 100644 --- 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 @@ - + diff --git a/test/integrations/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj b/test/integrations/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj index c87d71b2b..305f1f5b4 100644 --- a/test/integrations/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj +++ b/test/integrations/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/integrations/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj b/test/integrations/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj index 97ffc5368..4b38f6fb4 100644 --- a/test/integrations/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj +++ b/test/integrations/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj @@ -6,7 +6,7 @@ - +