Remove net 6.0 targets

elastic · Nov 25, 2024 · 76b12c8 · 76b12c8
1 parent c5abef6
commit 76b12c8
Show file tree

Hide file tree

Showing 26 changed files with 36 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net472;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
   <PropertyGroup>
@@ -103,7 +103,7 @@
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="System.Diagnostics.PerformanceCounter" />
   </ItemGroup>
 

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0; net6.0</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
       <AssemblyName>Elastic.Apm.Azure.ServiceBus</AssemblyName>
       <RootNamespace>Elastic.Apm.Azure.ServiceBus</RootNamespace>
       <PackageId>Elastic.Apm.Azure.ServiceBus</PackageId>

diff --git a/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj b/src/instrumentations/Elastic.Apm.EntityFrameworkCore/Elastic.Apm.EntityFrameworkCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <RootNamespace>Elastic.Apm.EntityFrameworkCore</RootNamespace>
     <AssemblyName>Elastic.Apm.EntityFrameworkCore</AssemblyName>
     <PackageId>Elastic.Apm.EntityFrameworkCore</PackageId>
@@ -11,7 +11,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="2.0.0" PrivateAssets="All" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj b/src/integrations/Elastic.Apm.AspNetCore/Elastic.Apm.AspNetCore.csproj
@@ -5,7 +5,7 @@
     <PackageId>Elastic.Apm.AspNetCore</PackageId>
     <Description>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</Description>
     <PackageTags>apm, monitoring, elastic, elasticapm, analytics, aspnetcore</PackageTags>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="2.2.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>

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
@@ -4,7 +4,7 @@
     <PackageId>Elastic.Apm.Extensions.Hosting</PackageId>
     <Description>Elastic APM .NET Agent. This package offers integration with Microsoft.Extensions.Hosting.IHostBuilder for agent registration</Description>
     <PackageTags>apm, monitoring, elastic, elasticapm, analytics, netcore</PackageTags>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
@@ -29,11 +29,11 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" VersionOverride="2.2.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" VersionOverride="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection " VersionOverride="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" VersionOverride="6.0.0" PrivateAssets="All" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" VersionOverride="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection " VersionOverride="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" VersionOverride="8.0.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <RootNamespace>Elastic.Apm.Extensions.Logging</RootNamespace>
     <AssemblyName>Elastic.Apm.Extensions.Logging</AssemblyName>
     <PackageId>Elastic.Apm.Extensions.Logging</PackageId>
@@ -19,8 +19,8 @@
     <InternalsVisibleTo Include="Elastic.Apm.Extensions.Hosting" Key="$(ExposedPublicKey)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" VersionOverride="6.0.0" PrivateAssets="All" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" VersionOverride="8.0.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/src/integrations/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj b/src/integrations/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <RootNamespace>Elastic.Apm.NetCoreAll</RootNamespace>
     <PackageId>Elastic.Apm.NetCoreAll</PackageId>
     <Description>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</Description>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
+      <TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
       <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/...e/applications/Elastic.Apm.AzureFunctionApp.Core/Elastic.Apm.AzureFunctionApp.Core.csproj b/...e/applications/Elastic.Apm.AzureFunctionApp.Core/Elastic.Apm.AzureFunctionApp.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -16,14 +16,6 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" VersionOverride="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" VersionOverride="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="6.0.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" VersionOverride="1.4.0" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Data\" />
     <Folder Include="Data\HistoricalData" />

diff --git a/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj b/test/integrations/applications/SampleConsoleNetCoreApp/SampleConsoleNetCoreApp.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/test/integrations/applications/WebApiSample/WebApiSample.csproj b/test/integrations/applications/WebApiSample/WebApiSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git 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<object[]> 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+      <TargetFrameworks>net462;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj b/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj b/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <NpgsqlVersion Condition="'$(NpgsqlVersion)'==''">5.0.18</NpgsqlVersion>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net462;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...r/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj b/...r/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 
   </PropertyGroup>
 

diff --git a/test/profiler/applications/SqlClientSample/SqlClientSample.csproj b/test/profiler/applications/SqlClientSample/SqlClientSample.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <SqlVersion Condition="'$(SqlVersion)'==''">4.8.6</SqlVersion>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/profiler/applications/SqliteSample/SqliteSample.csproj b/test/profiler/applications/SqliteSample/SqliteSample.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <SqliteVersion Condition="'$(SqliteVersion)'==''">8.0.2</SqliteVersion>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git 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
@@ -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");
 		}