From 3b7a967e08df05b17bf576bb86f583dfb1811a66 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Tue, 22 Oct 2024 12:19:49 +0200 Subject: [PATCH] Move to nuget central package management --- Directory.Build.props | 5 +- Directory.Packages.props | 154 ++++++++++++++++++ ElasticApmAgent.sln.DotSettings | 5 +- .../Elastic.Apm.Benchmarks.csproj | 6 +- .../Elastic.Apm.Profiling.csproj | 2 +- build/build.fsproj | 26 +-- ...Elastic.Apm.Azure.ServiceBus.Sample.csproj | 4 +- .../ElasticsearchSample.csproj | 6 +- .../HttpListenerSample.csproj | 2 +- .../Sample.Microsoft.Data.SqlClient.csproj | 5 +- .../StackExchangeRedisSample.csproj | 4 +- sample/WebApiExample/WebApiExample.csproj | 4 +- .../WorkerServiceSample.csproj | 2 +- src/Directory.Build.props | 2 +- .../Elastic.Apm.Specification.csproj | 4 +- src/Elastic.Apm/Elastic.Apm.csproj | 22 +-- .../Elastic.Apm.Azure.Functions.csproj | 8 +- .../Elastic.Apm.Elasticsearch.csproj | 2 +- .../Elastic.Apm.EntityFramework6.csproj | 8 +- .../Elastic.Apm.EntityFrameworkCore.csproj | 8 +- .../Elastic.Apm.MongoDb.csproj | 2 +- .../Elastic.Apm.StackExchange.Redis.csproj | 2 +- .../Elastic.Apm.AspNetCore.csproj | 14 +- .../Elastic.Apm.Extensions.Hosting.csproj | 20 +-- .../Elastic.Apm.Extensions.Logging.csproj | 8 +- ....Apm.Profiler.IntegrationsGenerator.csproj | 4 +- .../Elastic.Apm.Profiler.Managed.csproj | 4 +- .../Elastic.Apm.StartupHook.Loader.csproj | 2 +- .../ElasticApmAgentStartupHook.csproj | 2 +- test/Directory.Build.props | 19 +-- .../Elastic.Apm.Feature.Tests.csproj | 6 +- .../Elastic.Apm.Tests.Utilities.csproj | 10 +- .../Elastic.Apm.Tests.csproj | 4 +- .../Elastic.Apm.Azure.CosmosDb.Tests.csproj | 8 +- .../Elastic.Apm.Azure.ServiceBus.Tests.csproj | 8 +- .../Elastic.Apm.Azure.Storage.Tests.csproj | 12 +- .../Elastic.AzureFunctionApp.InProcess.csproj | 2 +- .../Elastic.AzureFunctionApp.Isolated.csproj | 6 +- .../AspNetFullFrameworkSampleApp.csproj | 26 +-- ...astic.Apm.AspNetFullFramework.Tests.csproj | 10 +- .../Elastic.Apm.Elasticsearch.Tests.csproj | 8 +- ...astic.Apm.EntityFrameworkCore.Tests.csproj | 8 +- .../Elastic.Apm.MongoDb.Tests.csproj | 4 +- .../Elastic.Apm.SqlClient.Tests.csproj | 11 +- ...astic.Apm.StackExchange.Redis.Tests.csproj | 8 +- ...Elastic.Clients.Elasticsearch.Tests.csproj | 4 +- .../Elastic.Apm.Grpc.Tests.csproj | 13 +- .../GrpcClientSample/GrpcClientSample.csproj | 9 +- .../GrpcServiceSample.csproj | 2 +- ...Elastic.Apm.AspNetCore.Static.Tests.csproj | 6 +- .../Elastic.Apm.AspNetCore.Tests.csproj | 8 +- ...lastic.Apm.Extensions.Hosting.Tests.csproj | 2 +- ...lastic.Apm.Extensions.Logging.Tests.csproj | 2 +- .../HostingTestApp/HostingTestApp.csproj | 2 +- .../SampleAspNetCoreApp.csproj | 26 +-- .../SampleConsoleNetCoreApp/Program.cs | 2 +- .../SampleConsoleNetCoreApp.csproj | 2 +- .../Elastic.Apm.Profiler.Managed.Tests.csproj | 18 +- .../KafkaSample/KafkaSample.csproj | 4 +- .../MySqlDataSample/MySqlDataSample.csproj | 3 +- .../NpgsqlSample/NpgsqlSample.csproj | 2 +- .../OracleManagedDataAccessCoreSample.csproj | 3 +- .../OracleManagedDataAccessSample.csproj | 3 +- .../applications/RabbitMqSample/Program.cs | 12 -- .../RabbitMqSample/RabbitMqSample.csproj | 4 +- .../SatelliteAssemblySample.csproj | 2 +- .../Elastic.Apm.StartupHook.Tests.csproj | 2 +- 67 files changed, 365 insertions(+), 253 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index 36feb4a9a..b9c67200b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,6 +22,7 @@ but dotnet pack expects to pack it e.g. Microsoft.NET.Sdk.Web test and sample projects. --> false false + true @@ -29,8 +30,4 @@ canary.0 0.1 - - - - \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..2af552d91 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,154 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ElasticApmAgent.sln.DotSettings b/ElasticApmAgent.sln.DotSettings index 14fff26b1..7e2279db6 100644 --- a/ElasticApmAgent.sln.DotSettings +++ b/ElasticApmAgent.sln.DotSettings @@ -277,7 +277,7 @@ See the LICENSE file in the project root for more information </Entry.Match> <Entry.SortBy> <Kind Is="Member" /> - <Name Is="Enter Pattern Here" /> + <Name /> </Entry.SortBy> </Entry> <Entry DisplayName="Readonly Fields"> @@ -295,7 +295,7 @@ See the LICENSE file in the project root for more information <Entry.SortBy> <Access /> <Readonly /> - <Name Is="Enter Pattern Here" /> + <Name /> </Entry.SortBy> </Entry> <Entry DisplayName="Constructors"> @@ -570,6 +570,7 @@ See the LICENSE file in the project root for more information True True True + True True True False diff --git a/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj b/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj index 5c8794dad..332e83070 100644 --- a/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj +++ b/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj b/benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj index 7b61bfd5f..ff4861898 100644 --- a/benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj +++ b/benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj @@ -9,7 +9,7 @@ - + diff --git a/build/build.fsproj b/build/build.fsproj index ec4305f39..1bbcbc798 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -24,21 +24,23 @@ - - - + + + - - - - - - + + + + + + - + - - + + + + diff --git a/sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj b/sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj index 431a8af51..c4498cfa4 100644 --- a/sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj +++ b/sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/sample/ElasticsearchSample/ElasticsearchSample.csproj b/sample/ElasticsearchSample/ElasticsearchSample.csproj index 3ddc470ac..6fddcc8af 100644 --- a/sample/ElasticsearchSample/ElasticsearchSample.csproj +++ b/sample/ElasticsearchSample/ElasticsearchSample.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/sample/HttpListenerSample/HttpListenerSample.csproj b/sample/HttpListenerSample/HttpListenerSample.csproj index 9d1152725..8b6bbc6d7 100644 --- a/sample/HttpListenerSample/HttpListenerSample.csproj +++ b/sample/HttpListenerSample/HttpListenerSample.csproj @@ -10,7 +10,7 @@ - + diff --git a/sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj b/sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj index 37d35037a..58f4c64d9 100644 --- a/sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj +++ b/sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj @@ -13,9 +13,8 @@ - - - + + diff --git a/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj b/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj index 4fe4a49a1..e5519371e 100644 --- a/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj +++ b/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/sample/WebApiExample/WebApiExample.csproj b/sample/WebApiExample/WebApiExample.csproj index 325a13544..3252084e8 100644 --- a/sample/WebApiExample/WebApiExample.csproj +++ b/sample/WebApiExample/WebApiExample.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/sample/WorkerServiceSample/WorkerServiceSample.csproj b/sample/WorkerServiceSample/WorkerServiceSample.csproj index 7d9d055a6..b1c0cd783 100644 --- a/sample/WorkerServiceSample/WorkerServiceSample.csproj +++ b/sample/WorkerServiceSample/WorkerServiceSample.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index bd2017b18..2f23a478c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -33,6 +33,6 @@ . - + \ No newline at end of file diff --git a/src/Elastic.Apm.Specification/Elastic.Apm.Specification.csproj b/src/Elastic.Apm.Specification/Elastic.Apm.Specification.csproj index f9b12bf93..2cdfedea2 100644 --- a/src/Elastic.Apm.Specification/Elastic.Apm.Specification.csproj +++ b/src/Elastic.Apm.Specification/Elastic.Apm.Specification.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Elastic.Apm/Elastic.Apm.csproj b/src/Elastic.Apm/Elastic.Apm.csproj index 10345a958..ef7b4ae93 100644 --- a/src/Elastic.Apm/Elastic.Apm.csproj +++ b/src/Elastic.Apm/Elastic.Apm.csproj @@ -75,36 +75,36 @@ - + - + - - + + - - + + - + - - + + - + - + diff --git a/src/azure/Elastic.Apm.Azure.Functions/Elastic.Apm.Azure.Functions.csproj b/src/azure/Elastic.Apm.Azure.Functions/Elastic.Apm.Azure.Functions.csproj index 00b344092..d00bf90ba 100644 --- a/src/azure/Elastic.Apm.Azure.Functions/Elastic.Apm.Azure.Functions.csproj +++ b/src/azure/Elastic.Apm.Azure.Functions/Elastic.Apm.Azure.Functions.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/src/instrumentations/Elastic.Apm.Elasticsearch/Elastic.Apm.Elasticsearch.csproj b/src/instrumentations/Elastic.Apm.Elasticsearch/Elastic.Apm.Elasticsearch.csproj index 20b0a4c32..3ceb21104 100644 --- a/src/instrumentations/Elastic.Apm.Elasticsearch/Elastic.Apm.Elasticsearch.csproj +++ b/src/instrumentations/Elastic.Apm.Elasticsearch/Elastic.Apm.Elasticsearch.csproj @@ -10,7 +10,7 @@ true - + diff --git a/src/instrumentations/Elastic.Apm.EntityFramework6/Elastic.Apm.EntityFramework6.csproj b/src/instrumentations/Elastic.Apm.EntityFramework6/Elastic.Apm.EntityFramework6.csproj index 81470557b..4205c04c1 100644 --- a/src/instrumentations/Elastic.Apm.EntityFramework6/Elastic.Apm.EntityFramework6.csproj +++ b/src/instrumentations/Elastic.Apm.EntityFramework6/Elastic.Apm.EntityFramework6.csproj @@ -9,14 +9,10 @@ true - - all - + - - all - + diff --git a/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj b/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj index 9bfb5b292..cbedad1a4 100644 --- a/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj +++ b/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj @@ -9,14 +9,10 @@ true - - all - + - - all - + diff --git a/src/instrumentations/Elastic.Apm.MongoDb/Elastic.Apm.MongoDb.csproj b/src/instrumentations/Elastic.Apm.MongoDb/Elastic.Apm.MongoDb.csproj index 775bb6e84..30994d4bb 100644 --- a/src/instrumentations/Elastic.Apm.MongoDb/Elastic.Apm.MongoDb.csproj +++ b/src/instrumentations/Elastic.Apm.MongoDb/Elastic.Apm.MongoDb.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/instrumentations/Elastic.Apm.StackExchange.Redis/Elastic.Apm.StackExchange.Redis.csproj b/src/instrumentations/Elastic.Apm.StackExchange.Redis/Elastic.Apm.StackExchange.Redis.csproj index 407c2318d..b9ea39d5e 100644 --- a/src/instrumentations/Elastic.Apm.StackExchange.Redis/Elastic.Apm.StackExchange.Redis.csproj +++ b/src/instrumentations/Elastic.Apm.StackExchange.Redis/Elastic.Apm.StackExchange.Redis.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj b/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj index cfcf7f297..a947368a6 100644 --- a/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj +++ b/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj @@ -16,13 +16,13 @@ - - - - - - - + + + + + + + diff --git a/src/integrations/Elastic.Apm.Extensions.Hosting/Elastic.Apm.Extensions.Hosting.csproj b/src/integrations/Elastic.Apm.Extensions.Hosting/Elastic.Apm.Extensions.Hosting.csproj index 8725f6c15..a3ca5d3c5 100644 --- a/src/integrations/Elastic.Apm.Extensions.Hosting/Elastic.Apm.Extensions.Hosting.csproj +++ b/src/integrations/Elastic.Apm.Extensions.Hosting/Elastic.Apm.Extensions.Hosting.csproj @@ -23,21 +23,17 @@ - - - - - all - + + + + - - - - - all - + + + + diff --git a/src/integrations/Elastic.Apm.Extensions.Logging/Elastic.Apm.Extensions.Logging.csproj b/src/integrations/Elastic.Apm.Extensions.Logging/Elastic.Apm.Extensions.Logging.csproj index 16707baf0..88cd762a6 100644 --- a/src/integrations/Elastic.Apm.Extensions.Logging/Elastic.Apm.Extensions.Logging.csproj +++ b/src/integrations/Elastic.Apm.Extensions.Logging/Elastic.Apm.Extensions.Logging.csproj @@ -20,15 +20,11 @@ - - all - + - - all - + diff --git a/src/profiler/Elastic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj b/src/profiler/Elastic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj index 6e8cec7ad..7b9dbb773 100644 --- a/src/profiler/Elastic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj +++ b/src/profiler/Elastic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/profiler/Elastic.Apm.Profiler.Managed/Elastic.Apm.Profiler.Managed.csproj b/src/profiler/Elastic.Apm.Profiler.Managed/Elastic.Apm.Profiler.Managed.csproj index cbe3fc9e8..e93487e05 100644 --- a/src/profiler/Elastic.Apm.Profiler.Managed/Elastic.Apm.Profiler.Managed.csproj +++ b/src/profiler/Elastic.Apm.Profiler.Managed/Elastic.Apm.Profiler.Managed.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/src/startuphook/Elastic.Apm.StartupHook.Loader/Elastic.Apm.StartupHook.Loader.csproj b/src/startuphook/Elastic.Apm.StartupHook.Loader/Elastic.Apm.StartupHook.Loader.csproj index 60984f437..c04e0e3d4 100644 --- a/src/startuphook/Elastic.Apm.StartupHook.Loader/Elastic.Apm.StartupHook.Loader.csproj +++ b/src/startuphook/Elastic.Apm.StartupHook.Loader/Elastic.Apm.StartupHook.Loader.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/startuphook/ElasticApmAgentStartupHook/ElasticApmAgentStartupHook.csproj b/src/startuphook/ElasticApmAgentStartupHook/ElasticApmAgentStartupHook.csproj index f75da942b..48eec369e 100644 --- a/src/startuphook/ElasticApmAgentStartupHook/ElasticApmAgentStartupHook.csproj +++ b/src/startuphook/ElasticApmAgentStartupHook/ElasticApmAgentStartupHook.csproj @@ -11,6 +11,6 @@ - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 03a58c389..2ccf826a6 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -19,18 +19,15 @@ - + - - - + + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + \ No newline at end of file diff --git a/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj b/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj index ba0e4f1e9..eab125a06 100644 --- a/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj +++ b/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + 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 30f0746d1..f6792c4a1 100644 --- a/test/Elastic.Apm.Tests.Utilities/Elastic.Apm.Tests.Utilities.csproj +++ b/test/Elastic.Apm.Tests.Utilities/Elastic.Apm.Tests.Utilities.csproj @@ -34,11 +34,11 @@ - - - - - + + + + + diff --git a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj index ec857243d..9aae67096 100644 --- a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj +++ b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj index 1dcc62ed6..548e45940 100644 --- a/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj +++ b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj index 247a0e56a..91993cdee 100644 --- a/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj +++ b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj b/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj index ac1e939cc..b9c002692 100644 --- a/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj +++ b/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj @@ -7,12 +7,12 @@ - - - - - - + + + + + + diff --git a/test/azure/applications/Elastic.AzureFunctionApp.InProcess/Elastic.AzureFunctionApp.InProcess.csproj b/test/azure/applications/Elastic.AzureFunctionApp.InProcess/Elastic.AzureFunctionApp.InProcess.csproj index 640172471..8bb50ce7e 100644 --- a/test/azure/applications/Elastic.AzureFunctionApp.InProcess/Elastic.AzureFunctionApp.InProcess.csproj +++ b/test/azure/applications/Elastic.AzureFunctionApp.InProcess/Elastic.AzureFunctionApp.InProcess.csproj @@ -8,7 +8,7 @@ false - + 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 5d928890c..0523ea9ab 100644 --- a/test/azure/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj +++ b/test/azure/applications/Elastic.AzureFunctionApp.Isolated/Elastic.AzureFunctionApp.Isolated.csproj @@ -12,9 +12,9 @@ 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 --> - - - + + + diff --git a/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj b/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj index d6a6b71a4..fa30e279b 100644 --- a/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj +++ b/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj @@ -84,19 +84,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/test/iis/Elastic.Apm.AspNetFullFramework.Tests/Elastic.Apm.AspNetFullFramework.Tests.csproj b/test/iis/Elastic.Apm.AspNetFullFramework.Tests/Elastic.Apm.AspNetFullFramework.Tests.csproj index acd5a9fc1..724da16b1 100644 --- a/test/iis/Elastic.Apm.AspNetFullFramework.Tests/Elastic.Apm.AspNetFullFramework.Tests.csproj +++ b/test/iis/Elastic.Apm.AspNetFullFramework.Tests/Elastic.Apm.AspNetFullFramework.Tests.csproj @@ -7,11 +7,11 @@ NU1702 - - - - - + + + + + TargetFramework=net462 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 d63d5e98c..42bde9d01 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,10 +6,10 @@ - - - - + + + + diff --git a/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj index cc735d362..c646b4d7a 100644 --- a/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj b/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj index 5af0c3ce3..edc9bd3ce 100644 --- a/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj b/test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj index 7c2ac0981..3f54b9a97 100644 --- a/test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj @@ -6,15 +6,16 @@ - - - + + + - + + - + 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 0d8e9c702..5acad44f8 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,10 +6,10 @@ - - - - + + + + diff --git a/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj index 9c689be86..5dcdb4532 100644 --- a/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj +++ b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj @@ -7,8 +7,8 @@ - - + + 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 b6f7490f2..022fc2d4f 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,14 +6,11 @@ - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + diff --git a/test/instrumentations/grpc/GrpcClientSample/GrpcClientSample.csproj b/test/instrumentations/grpc/GrpcClientSample/GrpcClientSample.csproj index 41fa62526..2fca45848 100644 --- a/test/instrumentations/grpc/GrpcClientSample/GrpcClientSample.csproj +++ b/test/instrumentations/grpc/GrpcClientSample/GrpcClientSample.csproj @@ -6,12 +6,9 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + diff --git a/test/instrumentations/grpc/GrpcServiceSample/GrpcServiceSample.csproj b/test/instrumentations/grpc/GrpcServiceSample/GrpcServiceSample.csproj index 395682a05..0db83dbd2 100644 --- a/test/instrumentations/grpc/GrpcServiceSample/GrpcServiceSample.csproj +++ b/test/instrumentations/grpc/GrpcServiceSample/GrpcServiceSample.csproj @@ -9,7 +9,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 a8f8afd26..0a69f097f 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,9 +3,9 @@ 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 e86422f51..664509ac1 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,10 +11,10 @@ - - - - + + + + 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 d7340831f..9aed9da54 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 @@ -11,7 +11,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 2dcd2d9b8..cbfb24f0b 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 @@ -12,7 +12,7 @@ - + diff --git a/test/integrations/applications/HostingTestApp/HostingTestApp.csproj b/test/integrations/applications/HostingTestApp/HostingTestApp.csproj index bff7b18bc..db9baea24 100644 --- a/test/integrations/applications/HostingTestApp/HostingTestApp.csproj +++ b/test/integrations/applications/HostingTestApp/HostingTestApp.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj b/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj index 5881da018..09e04e82c 100644 --- a/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj +++ b/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj @@ -6,23 +6,23 @@ AnyCPU - + - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/test/integrations/applications/SampleConsoleNetCoreApp/Program.cs b/test/integrations/applications/SampleConsoleNetCoreApp/Program.cs index 4c982a12e..1748cf5bf 100644 --- a/test/integrations/applications/SampleConsoleNetCoreApp/Program.cs +++ b/test/integrations/applications/SampleConsoleNetCoreApp/Program.cs @@ -25,7 +25,7 @@ private static IHostBuilder CreateHostBuilder(string[] args) => .ConfigureLogging((_, logging) => { logging.ClearProviders(); - logging.AddConsole(options => options.IncludeScopes = true); + logging.AddSimpleConsole(options => options.IncludeScopes = true); }); } } diff --git a/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj b/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj index d3e588ae1..2000ec119 100644 --- a/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj +++ b/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj index 5950a9c41..af086bd6d 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj @@ -14,15 +14,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/test/profiler/applications/KafkaSample/KafkaSample.csproj b/test/profiler/applications/KafkaSample/KafkaSample.csproj index a2f3c7cdf..3f2b25136 100644 --- a/test/profiler/applications/KafkaSample/KafkaSample.csproj +++ b/test/profiler/applications/KafkaSample/KafkaSample.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj b/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj index 05cc325a2..35ffd8a2f 100644 --- a/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj +++ b/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj @@ -1,13 +1,12 @@ - 8.0.32.1 Exe net462;net6.0;net8.0 - + diff --git a/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj b/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj index 8078c09ab..4222ac1a7 100644 --- a/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj +++ b/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj index c4f0d1974..e795de6d9 100644 --- a/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj +++ b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj @@ -1,14 +1,13 @@ - 3.21.90 Exe net6.0;net8.0 - + diff --git a/test/profiler/applications/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj b/test/profiler/applications/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj index 6c12440f9..f063f5ace 100644 --- a/test/profiler/applications/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj +++ b/test/profiler/applications/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj @@ -1,13 +1,12 @@ - 21.13.0 Exe net462 - + diff --git a/test/profiler/applications/RabbitMqSample/Program.cs b/test/profiler/applications/RabbitMqSample/Program.cs index b43023712..f31c86022 100644 --- a/test/profiler/applications/RabbitMqSample/Program.cs +++ b/test/profiler/applications/RabbitMqSample/Program.cs @@ -96,11 +96,7 @@ private static void PublishAndGet(string name, string exchange, string queue, st Console.WriteLine($"[{name}] BasicPublish - Sent message: {message}"); var result = channel.BasicGet(queue, true); -#if RABBITMQ_6_0 var resultMessage = Encoding.UTF8.GetString(result.Body.ToArray()); -#else - var resultMessage = Encoding.UTF8.GetString(result.Body); -#endif Console.WriteLine($"[{name}] BasicGet - Received message: {resultMessage}"); // ReSharper restore AccessToDisposedClosure }); @@ -135,11 +131,7 @@ private static void PublishAndGetDefault() Console.WriteLine($"[PublishAndGetDefault] BasicPublish - Sent message: {message}"); var result = channel.BasicGet(defaultQueueName, true); -#if RABBITMQ_6_0 var resultMessage = Encoding.UTF8.GetString(result.Body.ToArray()); -#else - var resultMessage = Encoding.UTF8.GetString(result.Body); -#endif Console.WriteLine($"[PublishAndGetDefault] BasicGet - Received message: {resultMessage}"); }); @@ -203,11 +195,7 @@ private static void Receive() var transaction = Agent.Tracer.CurrentTransaction; var span = transaction?.StartSpan("Consume message", ApiConstants.TypeMessaging); -#if RABBITMQ_6_0 var body = ea.Body.ToArray(); -#else - var body = ea.Body; -#endif var message = Encoding.UTF8.GetString(body); Console.WriteLine("[Receive] - [x] Received {0}", message); diff --git a/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj b/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj index 83c2d77db..5a824b41a 100644 --- a/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj +++ b/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj @@ -1,14 +1,12 @@ - 6.8.1 - $(DefineConstants);RABBITMQ_6_0 Exe net8.0 - + diff --git a/test/profiler/applications/SatelliteAssemblySample/SatelliteAssemblySample.csproj b/test/profiler/applications/SatelliteAssemblySample/SatelliteAssemblySample.csproj index 16fd2a942..8c8215dc6 100644 --- a/test/profiler/applications/SatelliteAssemblySample/SatelliteAssemblySample.csproj +++ b/test/profiler/applications/SatelliteAssemblySample/SatelliteAssemblySample.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/startuphook/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj b/test/startuphook/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj index fd960b3ae..809140a35 100644 --- a/test/startuphook/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj +++ b/test/startuphook/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj @@ -5,7 +5,7 @@ - +