diff --git a/.github/workflows/bootstrap/action.yml b/.github/workflows/bootstrap/action.yml index 6dd6532b3..d5b4b52d5 100644 --- a/.github/workflows/bootstrap/action.yml +++ b/.github/workflows/bootstrap/action.yml @@ -45,13 +45,13 @@ runs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x 8.0.x - id: dotnet shell: bash run: | dotnet --list-sdks + dotnet --version dotnet tool restore AGENT_VERSION=$(dotnet minver -t=v -p=canary.0 -v=e) echo "Version Number: ${AGENT_VERSION}" diff --git a/.github/workflows/install-dependencies/action.yml b/.github/workflows/install-dependencies/action.yml index df05f3bde..0b4f65c99 100644 --- a/.github/workflows/install-dependencies/action.yml +++ b/.github/workflows/install-dependencies/action.yml @@ -59,15 +59,15 @@ if: "${{ inputs.azure == 'true' && runner.os == 'Linux' }}" shell: bash run: | - wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb + wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb sudo dpkg -i packages-microsoft-prod.deb sudo apt-get update - sudo apt-get install azure-functions-core-tools-4 + sudo apt-get install azure-functions-core-tools-4=4.0.6280-1 - name: 'Windows: Azure functions core tools' if: "${{ inputs.azure == 'true' && runner.os == 'Windows' }}" shell: cmd - run: choco install azure-functions-core-tools -y --no-progress -r --version 4.0.4829 + run: choco install azure-functions-core-tools -y --no-progress -r --version 4.0.6280 # TEST CONTAINERS CLOUD # If no PR event or if a PR event that's caused by a non-fork and non dependabot actor diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs index af344d962..37a02ea77 100644 --- a/build/scripts/Build.fs +++ b/build/scripts/Build.fs @@ -277,7 +277,7 @@ module Build = // assemblies compiled against 6.0 version of System.Diagnostics.DiagnosticSource !! (Paths.BuildOutput (sprintf "Elastic.Apm.StartupHook.Loader_%i.0.0/netstandard2.0" oldDiagnosticSourceVersion.Major)) - ++ (Paths.BuildOutput (sprintf "Elastic.Apm_%i.0.0/net6.0" diagnosticSourceVersion6.Major)) + ++ (Paths.BuildOutput (sprintf "Elastic.Apm_%i.0.0/net8.0" diagnosticSourceVersion6.Major)) |> Seq.filter Path.isDirectory |> Seq.map DirectoryInfo |> Seq.iter (copyDllsAndPdbs (agentDir.CreateSubdirectory(sprintf "%i.0.0" diagnosticSourceVersion6.Major))) diff --git a/src/Elastic.Apm/Elastic.Apm.csproj b/src/Elastic.Apm/Elastic.Apm.csproj index ef7b4ae93..361acc507 100644 --- a/src/Elastic.Apm/Elastic.Apm.csproj +++ b/src/Elastic.Apm/Elastic.Apm.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net462;net472;net6.0 + netstandard2.0;net462;net472;net8.0 true @@ -103,7 +103,7 @@ - + diff --git a/src/azure/Elastic.Apm.Azure.ServiceBus/Elastic.Apm.Azure.ServiceBus.csproj b/src/azure/Elastic.Apm.Azure.ServiceBus/Elastic.Apm.Azure.ServiceBus.csproj index 391eebd8a..f703a4abc 100644 --- a/src/azure/Elastic.Apm.Azure.ServiceBus/Elastic.Apm.Azure.ServiceBus.csproj +++ b/src/azure/Elastic.Apm.Azure.ServiceBus/Elastic.Apm.Azure.ServiceBus.csproj @@ -1,7 +1,7 @@ - netstandard2.0; net6.0 + netstandard2.0;net8.0 Elastic.Apm.Azure.ServiceBus Elastic.Apm.Azure.ServiceBus Elastic.Apm.Azure.ServiceBus diff --git a/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj b/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj index cbedad1a4..46bf44606 100644 --- a/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj +++ b/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + netstandard2.0;net8.0 Elastic.Apm.EntityFrameworkCore Elastic.Apm.EntityFrameworkCore Elastic.Apm.EntityFrameworkCore @@ -11,7 +11,7 @@ - + diff --git a/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj b/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj index 245a1fe50..54566d7eb 100644 --- a/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj +++ b/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj @@ -5,7 +5,7 @@ Elastic.Apm.AspNetCore Elastic APM for ASP.NET Core. This package contains auto instrumentation for ASP.NET Core. See: https://github.com/elastic/apm-agent-dotnet/tree/main/docs apm, monitoring, elastic, elasticapm, analytics, aspnetcore - netstandard2.0;netstandard2.1;net6.0 + netstandard2.0;netstandard2.1;net8.0 true @@ -23,7 +23,7 @@ - + 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 96cd9a6e0..97eb49fb4 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 @@ -4,7 +4,7 @@ Elastic.Apm.Extensions.Hosting Elastic APM .NET Agent. This package offers integration with Microsoft.Extensions.Hosting.IHostBuilder for agent registration apm, monitoring, elastic, elasticapm, analytics, netcore - netstandard2.0;net6.0 + netstandard2.0;net8.0 true @@ -29,11 +29,11 @@ - - - - - + + + + + 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 88cd762a6..0c9255e35 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 @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 Elastic.Apm.Extensions.Logging Elastic.Apm.Extensions.Logging Elastic.Apm.Extensions.Logging @@ -19,8 +19,8 @@ - - + + diff --git a/src/integrations/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj b/src/integrations/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj index 1d1ba10d2..583242880 100644 --- a/src/integrations/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj +++ b/src/integrations/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net8.0 Elastic.Apm.NetCoreAll Elastic.Apm.NetCoreAll Elastic APM .NET agent. This is a convenient package that automatically pulls in ASP.NET Core, and Entity Framework Core auto instrumentation with the Elastic APM .NET Agent. If your application uses the Microsoft.AspNetCore.All package the easiest way to reference the Elastic APM project is to use this package. If you only need specific functionalities (e.g. EF Core monitoring, or ASP.NET Core without EF Core monitoring, etc) you can reference specific Elastic.Apm packages. See: https://github.com/elastic/apm-agent-dotnet/tree/main/docs diff --git a/src/profiler/Elastic.Apm.Profiler.Managed.Core/Elastic.Apm.Profiler.Managed.Core.csproj b/src/profiler/Elastic.Apm.Profiler.Managed.Core/Elastic.Apm.Profiler.Managed.Core.csproj index cc9b62bf3..ac11a7546 100644 --- a/src/profiler/Elastic.Apm.Profiler.Managed.Core/Elastic.Apm.Profiler.Managed.Core.csproj +++ b/src/profiler/Elastic.Apm.Profiler.Managed.Core/Elastic.Apm.Profiler.Managed.Core.csproj @@ -1,7 +1,7 @@ - net462;netstandard2.0;net6.0 + net462;netstandard2.0;net8.0 false diff --git a/test/azure/applications/Elastic.Apm.AzureFunctionApp.Core/Elastic.Apm.AzureFunctionApp.Core.csproj b/test/azure/applications/Elastic.Apm.AzureFunctionApp.Core/Elastic.Apm.AzureFunctionApp.Core.csproj index 7728c0570..5850f50c5 100644 --- a/test/azure/applications/Elastic.Apm.AzureFunctionApp.Core/Elastic.Apm.AzureFunctionApp.Core.csproj +++ b/test/azure/applications/Elastic.Apm.AzureFunctionApp.Core/Elastic.Apm.AzureFunctionApp.Core.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0 + net8.0 enable enable false diff --git a/test/azure/applications/Elastic.AzureFunctionApp.InProcess/local.settings.json b/test/azure/applications/Elastic.AzureFunctionApp.InProcess/local.settings.json index 320edb1e3..fd2cd88b4 100644 --- a/test/azure/applications/Elastic.AzureFunctionApp.InProcess/local.settings.json +++ b/test/azure/applications/Elastic.AzureFunctionApp.InProcess/local.settings.json @@ -5,7 +5,8 @@ "FUNCTIONS_WORKER_RUNTIME": "dotnet", "FUNCTIONS_EXTENSION_VERSION": "4", "WEBSITE_OWNER_NAME": "abcd1234-abcd-acdc-1234-112233445566+testfaas_group-CentralUSwebspace-Linux", - "WEBSITE_SITE_NAME": "testfaas" + "WEBSITE_SITE_NAME": "testfaas", + "FUNCTIONS_INPROC_NET8_ENABLED": "1" // 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/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj b/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj index 09e04e82c..758744247 100644 --- a/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj +++ b/test/integrations/applications/SampleAspNetCoreApp/SampleAspNetCoreApp.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0 + net8.0 false AnyCPU @@ -16,14 +16,6 @@ - - - - - - - - diff --git a/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj b/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj index 2000ec119..cf1be170e 100644 --- a/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj +++ b/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net8.0 + net8.0 diff --git a/test/integrations/applications/WebApiSample/WebApiSample.csproj b/test/integrations/applications/WebApiSample/WebApiSample.csproj index 64c89df05..1c3b77682 100644 --- a/test/integrations/applications/WebApiSample/WebApiSample.csproj +++ b/test/integrations/applications/WebApiSample/WebApiSample.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0 + net8.0 false diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs index 01379b4ac..5da7a6574 100644 --- a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs @@ -20,7 +20,6 @@ public IEnumerator GetEnumerator() { // TODO: Add x64/x86 options. macOS and Linux do not support x86 yield return new object[] { "net8.0" }; - yield return new object[] { "net6.0" }; } IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); diff --git a/test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj b/test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj index cced4bb1e..9d1026735 100644 --- a/test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj +++ b/test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj @@ -1,7 +1,7 @@ - net462;net6.0;net8.0 + net462;net8.0 diff --git a/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj b/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj index 35ffd8a2f..8f69d0010 100644 --- a/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj +++ b/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj @@ -2,7 +2,7 @@ Exe - net462;net6.0;net8.0 + net462;net8.0 diff --git a/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj b/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj index 627143054..7b43bb7ac 100644 --- a/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj +++ b/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj @@ -3,7 +3,7 @@ 5.0.18 Exe - net462;net6.0;net8.0 + net462;net8.0 diff --git a/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj index e795de6d9..3d4993ad8 100644 --- a/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj +++ b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net8.0 + net8.0 diff --git a/test/profiler/applications/SqlClientSample/SqlClientSample.csproj b/test/profiler/applications/SqlClientSample/SqlClientSample.csproj index 72841a793..0de2ff849 100644 --- a/test/profiler/applications/SqlClientSample/SqlClientSample.csproj +++ b/test/profiler/applications/SqlClientSample/SqlClientSample.csproj @@ -3,7 +3,7 @@ 4.8.6 Exe - net462;net6.0;net8.0 + net462;net8.0 diff --git a/test/profiler/applications/SqliteSample/SqliteSample.csproj b/test/profiler/applications/SqliteSample/SqliteSample.csproj index 1169e0dde..2fed60f08 100644 --- a/test/profiler/applications/SqliteSample/SqliteSample.csproj +++ b/test/profiler/applications/SqliteSample/SqliteSample.csproj @@ -3,7 +3,7 @@ 8.0.2 Exe - net462;net6.0;net8.0 + net462;net8.0 x64 diff --git a/test/startuphook/Elastic.Apm.StartupHook.Sample/Elastic.Apm.StartupHook.Sample.csproj b/test/startuphook/Elastic.Apm.StartupHook.Sample/Elastic.Apm.StartupHook.Sample.csproj index b7bbc052d..ccd7e8ece 100644 --- a/test/startuphook/Elastic.Apm.StartupHook.Sample/Elastic.Apm.StartupHook.Sample.csproj +++ b/test/startuphook/Elastic.Apm.StartupHook.Sample/Elastic.Apm.StartupHook.Sample.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0 + net8.0 false diff --git a/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md b/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md index 6d97f0c46..bd7f9c567 100644 --- a/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md +++ b/test/startuphook/Elastic.Apm.StartupHook.Sample/README.md @@ -3,7 +3,6 @@ This sample application is a default ASP.NET (Core) application configured to run with -- `net6.0` - `net8.0` target frameworks that can be used to try out the [Elastic APM diff --git a/test/startuphook/Elastic.Apm.StartupHook.Tests/StartupHookTests.cs b/test/startuphook/Elastic.Apm.StartupHook.Tests/StartupHookTests.cs index 4b2c2b733..4e0b2fe62 100644 --- a/test/startuphook/Elastic.Apm.StartupHook.Tests/StartupHookTests.cs +++ b/test/startuphook/Elastic.Apm.StartupHook.Tests/StartupHookTests.cs @@ -27,7 +27,6 @@ public class StartupHookTests // NOTE: We test the two latest supported LTS releases. private static IEnumerable<(string TargetFramework, string RuntimeName, string Version, string ShortVersion)> GetDotNetFrameworkVersionInfos() { - yield return ("net6.0", ".NET 6", "6.0.0.0", "60"); yield return ("net8.0", ".NET 8", "8.0.0.0", "80"); }