From f1d55cc5b1ebcdfd6aabb6d400601acde0ec2cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 5 Oct 2023 09:01:09 +0200
Subject: [PATCH 01/28] .NET8 support

---
 .github/workflows/build-container.yml              |  4 ++--
 .github/workflows/build.yml                        |  8 ++++----
 .github/workflows/ci.yml                           |  2 +-
 .github/workflows/release-publish.yml              | 14 +++++++-------
 build/Extensions/DepsJsonExtensions.cs             |  1 +
 build/TargetFramework.cs                           |  1 +
 build/_build.csproj                                |  2 +-
 .../AspNetCoreMvc/Examples.AspNetCoreMvc.csproj    |  2 +-
 examples/playground/README.md                      |  8 ++++----
 examples/playground/run.sh                         |  2 +-
 ...metry.AutoInstrumentation.AdditionalDeps.csproj |  2 +-
 test/Directory.Build.props                         |  2 +-
 ...ry.AutoInstrumentation.StartupHook.Tests.csproj |  2 +-
 .../OpenTelemetry.AutoInstrumentation.Tests.csproj |  2 +-
 .../TransientDependenciesTests.cs                  |  4 ++--
 .../integrations/Integrations.props                |  2 +-
 .../TestApplication.CustomSdk.csproj               |  2 +-
 ...ication.EntityFrameworkCore.Pomelo.MySql.csproj |  2 +-
 .../TestApplication.EntityFrameworkCore.csproj     |  2 +-
 .../TestApplication.GraphQL.csproj                 |  2 +-
 .../TestApplication.Http.csproj                    |  2 +-
 .../TestApplication.Logs.csproj                    |  2 +-
 .../TestApplication.NServiceBus.csproj             |  2 +-
 .../TestApplication.Quartz.csproj                  |  2 +-
 .../TestApplication.Razor.csproj                   |  2 +-
 .../TestApplication.Wcf.Client.DotNet.csproj       |  2 +-
 .../nuget-packages/Directory.Build.props           |  2 +-
 .../DependencyListGenerator.csproj                 |  2 +-
 .../LibraryVersionsGenerator.csproj                |  2 +-
 29 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 381e120c76..b5954f23fc 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -35,10 +35,10 @@ jobs:
         docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" ./docker
         docker run --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project --rm mybuildimage /bin/sh -c '
           set -e
-          dotnet publish -f net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net8.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
           export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
           . ./instrument.sh
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net7.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
             test "$(ls -A /var/log/opentelemetry/dotnet )"
         '
     - name: Publish Linux build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a32f1dffe..628e1c9a4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,10 +57,10 @@ jobs:
         shell: bash
         run: |
           set -e
-          dotnet publish -f net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net8.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
           export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
           . ./instrument.sh
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net7.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
             test "$(ls -A '${{ matrix.log-dir }}' )"
       - name: Test the PowerShell module instructions from README.md
         if: ${{ runner.os == 'Windows' }}
@@ -70,12 +70,12 @@ jobs:
           Import-Module "${PWD}/bin/installation-scripts/OpenTelemetry.DotNet.Auto.psm1"
           [System.Environment]::SetEnvironmentVariable("OTEL_DOTNET_AUTO_INSTALL_DIR", "${PWD}/bin/tracer-home", [System.EnvironmentVariableTarget]::Machine)
           Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net7.0/TestApplication.Smoke.exe
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/TestApplication.Smoke.exe
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
           Remove-Item $log_path
           Unregister-OpenTelemetryForCurrentSession
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net7.0/TestApplication.Smoke.exe
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/TestApplication.Smoke.exe
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
       - name: Upload binaries
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d200afec63..23e3396c56 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-tfm: [ net7.0, net6.0, net462 ]
+        test-tfm: [ net8.0, net7.0, net6.0, net462 ]
         machine: [ windows-2022, ubuntu-20.04, macos-11 ]
         exclude:
           - test-tfm: net462
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index b0cb0b2313..ae11ada148 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -19,7 +19,7 @@ jobs:
           mkdir testapp
           cd testapp
           dotnet new console
-          dotnet publish -f net7.0 -c Release
+          dotnet publish -f net8.0 -c Release
           $module_url = "https://github.com/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/OpenTelemetry.DotNet.Auto.psm1"
           $dl_path = Join-Path $env:temp "OpenTelemetry.DotNet.Auto.psm1"
           $log_path = "C:\ProgramData\OpenTelemetry .NET AutoInstrumentation\logs\*"
@@ -28,12 +28,12 @@ jobs:
           Install-OpenTelemetryCore
           $install_dir = Get-OpenTelemetryInstallDirectory
           Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
-          ./bin/Release/net7.0/publish/testapp
+          ./bin/Release/net8.0/publish/testapp
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
           Remove-Item $log_path
           Unregister-OpenTelemetryForCurrentSession
-          ./bin/Release/net7.0/publish/testapp
+          ./bin/Release/net8.0/publish/testapp
           if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
           if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
           Uninstall-OpenTelemetryCore
@@ -69,13 +69,13 @@ jobs:
           mkdir testapp
           cd testapp
           dotnet new console
-          dotnet publish -f net7.0 -c Release
+          dotnet publish -f net8.0 -c Release
           curl -sSfL https://github.com/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/otel-dotnet-auto-install.sh -O
           sh ./otel-dotnet-auto-install.sh
             test "$(ls -A "$HOME/.otel-dotnet-auto")"
           curl -sSfL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
           . ./instrument.sh
-          ./bin/Release/net7.0/publish/testapp
+          ./bin/Release/net8.0/publish/testapp
             test "$(ls -A '${{ matrix.log-dir }}' )"
 
   shell-scripts-container:
@@ -95,12 +95,12 @@ jobs:
             mkdir testapp
             cd testapp
             dotnet new console
-            dotnet publish -f net7.0 -c Release
+            dotnet publish -f net8.0 -c Release
             curl -sSfL https://github.com/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/otel-dotnet-auto-install.sh -O
             sh ./otel-dotnet-auto-install.sh
               test "$(ls -A "$HOME/.otel-dotnet-auto")"
             curl -sSfL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
             . ./instrument.sh
-            ./bin/Release/net7.0/publish/testapp
+            ./bin/Release/net8.0/publish/testapp
               test "$(ls -A /var/log/opentelemetry/dotnet )"
           '
diff --git a/build/Extensions/DepsJsonExtensions.cs b/build/Extensions/DepsJsonExtensions.cs
index badcde7816..1d5816ca69 100644
--- a/build/Extensions/DepsJsonExtensions.cs
+++ b/build/Extensions/DepsJsonExtensions.cs
@@ -15,6 +15,7 @@ public static string GetFolderRuntimeName(this JsonObject depsJson)
         {
             ".NETCoreApp,Version=v6.0" => "net6.0",
             ".NETCoreApp,Version=v7.0" => "net7.0",
+            ".NETCoreApp,Version=v8.0" => "net8.0",
             _ => throw new ArgumentOutOfRangeException(nameof(runtimeName), runtimeName,
                 "This value is not supported. You have probably introduced new .NET version to AutoInstrumentation")
         };
diff --git a/build/TargetFramework.cs b/build/TargetFramework.cs
index 40cf5cb197..e210f2b1d9 100644
--- a/build/TargetFramework.cs
+++ b/build/TargetFramework.cs
@@ -13,6 +13,7 @@ public class TargetFramework : Enumeration
     public static readonly TargetFramework NETCore3_1 = new() { Value = "netcoreapp3.1" };
     public static readonly TargetFramework NET6_0 = new() { Value = "net6.0" };
     public static readonly TargetFramework NET7_0 = new() { Value = "net7.0" };
+    public static readonly TargetFramework NET8_0 = new() { Value = "net8.0" };
 
     public static readonly TargetFramework[] NetFramework = {
         NET462
diff --git a/build/_build.csproj b/build/_build.csproj
index df661b9314..e0b2ea940c 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\</NukeRootDirectory>
diff --git a/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj b/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj
index 92e5d09ef0..9eae0cce0b 100644
--- a/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj
+++ b/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <RootNamespace>Examples.AspNetCoreMvc</RootNamespace>
   </PropertyGroup>
 
diff --git a/examples/playground/README.md b/examples/playground/README.md
index f3bc48a001..97ffdc38c5 100644
--- a/examples/playground/README.md
+++ b/examples/playground/README.md
@@ -22,9 +22,9 @@ and run the playground application with auto instrumentation.
 ./examples/playground/run.sh
 ```
 
-| Env var         | Description                                               | Default  |
-|-----------------|-----------------------------------------------------------|----------|
-| `CONFIGURATION` | Build configuration. Possible values: `Debug`, `Release`. | `Debug`  |
-| `DOTNET`        | .NET version. Possible values: `net7.0`, `net6.0`.        | `net7.0` |
+| Env var         | Description                                                  | Default  |
+|-----------------|--------------------------------------------------------------|----------|
+| `CONFIGURATION` | Build configuration. Possible values: `Debug`, `Release`.    | `Debug`  |
+| `DOTNET`        | .NET version. Possible values: `net8.0`, `net7.0`, `net6.0`. | `net8.0` |
 
 The application should be hosted on <http://localhost:5000/`>.
diff --git a/examples/playground/run.sh b/examples/playground/run.sh
index 3e19d81795..903077e312 100644
--- a/examples/playground/run.sh
+++ b/examples/playground/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux
 
-DOTNET=${DOTNET:-net7.0}
+DOTNET=${DOTNET:-net8.0}
 CONFIGURATION=${CONFIGURATION:-Debug}
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj
index 334af7d37a..f903abde3e 100644
--- a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj
+++ b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="CallComposeStore" AfterTargets="Publish">
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 83bddffc52..d679c7021d 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <DefineConstants Condition="'$(BuildingInsideVisualStudio)'=='true'">$(DefineConstants);DEFAULT_TEST_PACKAGE_VERSIONS</DefineConstants>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp3.0) -->
diff --git a/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj b/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj
index 04b3438a73..101e3fe9d2 100644
--- a/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj
+++ b/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/OpenTelemetry.AutoInstrumentation.Tests/OpenTelemetry.AutoInstrumentation.Tests.csproj b/test/OpenTelemetry.AutoInstrumentation.Tests/OpenTelemetry.AutoInstrumentation.Tests.csproj
index 296e92bb83..f67c0fd62f 100644
--- a/test/OpenTelemetry.AutoInstrumentation.Tests/OpenTelemetry.AutoInstrumentation.Tests.csproj
+++ b/test/OpenTelemetry.AutoInstrumentation.Tests/OpenTelemetry.AutoInstrumentation.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\OpenTelemetry.AutoInstrumentation\OpenTelemetry.AutoInstrumentation.csproj" />
-    <ProjectReference Include="..\..\tools\DependencyListGenerator\DependencyListGenerator.csproj" Condition=" '$(TargetFramework)' == 'net7.0' " />
+    <ProjectReference Include="..\..\tools\DependencyListGenerator\DependencyListGenerator.csproj" Condition=" '$(TargetFramework)' == 'net8.0' " />
   </ItemGroup>
 
 </Project>
diff --git a/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs b/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs
index b95259e866..948315fe56 100644
--- a/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs
+++ b/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs
@@ -14,9 +14,9 @@
 // limitations under the License.
 // </copyright>
 
-// This test is defined in NET7.0 because the tool is written in .NET 7.0
+// This test is defined in NET8.0 because the tool is written in .NET 8.0
 // The actual test is testing .NET 462 context.
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
 
 using System.Reflection;
 using System.Runtime.InteropServices;
diff --git a/test/test-applications/integrations/Integrations.props b/test/test-applications/integrations/Integrations.props
index abbe5751c2..3bbc475da3 100644
--- a/test/test-applications/integrations/Integrations.props
+++ b/test/test-applications/integrations/Integrations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
diff --git a/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj b/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj
index c483511333..9c1b962203 100644
--- a/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj
+++ b/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
diff --git a/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj b/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj
index f64c89c08f..591fa5e3f0 100644
--- a/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj
+++ b/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj b/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj
index dc19e7b442..84d9954769 100644
--- a/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj
+++ b/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj b/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
index 40595c4052..b132916882 100644
--- a/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
+++ b/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
index c2c51e7efc..9de915f986 100644
--- a/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
+++ b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
   
 </Project>
diff --git a/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj b/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj
index 51663a15b7..1b512612b6 100644
--- a/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj
+++ b/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj b/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj
index fe39c985b4..d8bbebb718 100644
--- a/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj
+++ b/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
   </PropertyGroup>
 
diff --git a/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj b/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj
index a9c2902ff0..ed99cdcd23 100644
--- a/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj
+++ b/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <DefineConstants Condition="'$(LibraryVersion)'=='' or '$(LibraryVersion)'>='3.7.0'">$(DefineConstants);QUARTZ_3_7_0_OR_GREATER</DefineConstants>
   </PropertyGroup>
diff --git a/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj b/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj
index 51663a15b7..1b512612b6 100644
--- a/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj
+++ b/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj b/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj
index 63916fbd0d..a905a7dad3 100644
--- a/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj
+++ b/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/nuget-packages/Directory.Build.props b/test/test-applications/nuget-packages/Directory.Build.props
index 68109858aa..da2be821e8 100644
--- a/test/test-applications/nuget-packages/Directory.Build.props
+++ b/test/test-applications/nuget-packages/Directory.Build.props
@@ -5,7 +5,7 @@
 
   <PropertyGroup>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <Nullable>enable</Nullable>
diff --git a/tools/DependencyListGenerator/DependencyListGenerator.csproj b/tools/DependencyListGenerator/DependencyListGenerator.csproj
index b3cdeb3719..811d46b4d1 100644
--- a/tools/DependencyListGenerator/DependencyListGenerator.csproj
+++ b/tools/DependencyListGenerator/DependencyListGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj b/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
index 0e914e3aac..e009253e47 100644
--- a/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
+++ b/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From a5ea566c4a0035515c370554614bd2e22518e5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 5 Oct 2023 11:12:36 +0200
Subject: [PATCH 02/28] fixes

---
 build/LibraryVersions.g.cs                                  | 3 +--
 build/_build.csproj                                         | 5 +++++
 src/Directory.Build.props                                   | 6 ++++++
 test/IntegrationTests/LibraryVersions.g.cs                  | 3 +--
 tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs | 5 +++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs
index d2db28889a..6a5b7e9b5d 100644
--- a/build/LibraryVersions.g.cs
+++ b/build/LibraryVersions.g.cs
@@ -86,8 +86,7 @@ public static class LibraryVersion
             "TestApplication.MongoDB",
             new List<PackageBuildInfo>
             {
-                new("2.13.3"),
-                new("2.15.0"),
+                new("2.19.0"),
                 new("2.21.0"),
             }
         },
diff --git a/build/_build.csproj b/build/_build.csproj
index e0b2ea940c..306a55fc59 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -9,6 +9,11 @@
     <NukeScriptDirectory>..\</NukeScriptDirectory>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
     <ImplicitUsings>enable</ImplicitUsings>
+    <!--
+      https://learn.microsoft.com/en-us/dotnet/core/compatibility/serialization/7.0/binaryformatter-apis-produce-errors#recommended-action
+      It can be removed when nuke fix https://github.com/nuke-build/nuke/issues/818. Probably by https://github.com/nuke-build/nuke/pull/1247
+    -->
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c530e3400d..c05b498a0a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -26,6 +26,12 @@
     <Authors>OpenTelemetry Authors</Authors>
     <!-- No warning on empty NuGet version suffix even if using pre-release dependencies -->
     <NoWarn>$(NoWarn);NU5104</NoWarn>
+    <!--
+       No warn to mitigate following warnings for transitive dependencies:
+       error NU1902: Warning As Error: Package 'SharpCompress' 0.23.0 has a known moderate severity vulnerability, https://github.com/advisories/GHSA-jp7f-grcv-6mjf
+       error NU1904: Warning As Error: Package 'System.Drawing.Common' 4.7.0 has a known critical severity vulnerability, https://github.com/advisories/GHSA-rxg9-xrhp-64gj
+    -->
+    <NoWarn>$(NoWarn);NU1902;NU1904</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs
index 4d04d3b7b2..bbcd34620a 100644
--- a/test/IntegrationTests/LibraryVersions.g.cs
+++ b/test/IntegrationTests/LibraryVersions.g.cs
@@ -93,8 +93,7 @@ public static class LibraryVersion
 #if DEFAULT_TEST_PACKAGE_VERSIONS
         new object[] { string.Empty }
 #else
-        new object[] { "2.13.3" },
-        new object[] { "2.15.0" },
+        new object[] { "2.19.0" },
         new object[] { "2.21.0" },
 #endif
     };
diff --git a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs
index b6b5caf33f..c986460487 100644
--- a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs
+++ b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs
@@ -121,8 +121,9 @@ internal static class PackageVersionDefinitions
             TestApplicationName = "TestApplication.MongoDB",
             Versions = new List<PackageVersion>
             {
-                new("2.13.3"),
-                new("2.15.0"),
+                // new("2.13.3"), - high vulnarability https://github.com/advisories/GHSA-7j9m-j397-g4wx, <= 2.18.0 test should be skipped
+                // new("2.15.0"), - high vulnarability https://github.com/advisories/GHSA-7j9m-j397-g4wx, <= 2.18.0 test should be skipped
+                new("2.19.0"),
                 new("*")
             }
         },

From ed3c78a88a84dd4843f2184b288683513582d192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 5 Oct 2023 11:12:58 +0200
Subject: [PATCH 03/28] CI

---
 .github/workflows/build-nuget-packages.yml                  | 1 +
 .github/workflows/build.yml                                 | 1 +
 .github/workflows/ci.yml                                    | 4 ++++
 .github/workflows/dotnet-format.yml                         | 4 ++--
 .github/workflows/release-publish.yml                       | 1 +
 .github/workflows/verify-test.yml                           | 1 +
 docker/alpine.dockerfile                                    | 4 ++--
 docker/debian.dockerfile                                    | 6 +++---
 test/IntegrationTests/AspNetTests.cs                        | 1 +
 test/IntegrationTests/Helpers/HealthzHelper.cs              | 3 +++
 test/IntegrationTests/IntegrationTests.csproj               | 4 ++--
 test/IntegrationTests/SmokeTests.cs                         | 1 +
 .../TestApplication.GrpcNetClient.csproj                    | 3 ++-
 13 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
index 3f500e816f..5a8ee9583a 100644
--- a/.github/workflows/build-nuget-packages.yml
+++ b/.github/workflows/build-nuget-packages.yml
@@ -31,6 +31,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
 
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 628e1c9a4e..73e9c262c5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,6 +29,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23e3396c56..61daaa5b83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -96,6 +97,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -127,6 +129,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -201,6 +204,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 67a02bc555..2043fa4e42 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -22,10 +22,10 @@ jobs:
     - name: check out code
       uses: actions/checkout@v4.1.0
 
-    - name: Setup .NET 7.0
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.401
+        dotnet-version: 8.0.100-rc.1.23455.8
 
     - name: dotnet format
       run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index ae11ada148..6b4de1fdb8 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -57,6 +57,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory
diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml
index cc91f28131..e081190545 100644
--- a/.github/workflows/verify-test.yml
+++ b/.github/workflows/verify-test.yml
@@ -32,6 +32,7 @@ jobs:
           dotnet-version: | 
             6.0.414
             7.0.401
+            8.0.100-rc.1.23455.8
       - run: ./build.cmd BuildTracer ManagedTests --containers ${{ matrix.containers }} --test-project "${{ github.event.inputs.testProject }}" --test-name '"${{ github.event.inputs.testName }}"' --test-count ${{ github.event.inputs.count }}
       - name: Upload logs
         uses: actions/upload-artifact@v3.1.3
diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile
index ba9c67aea5..6df95798f2 100644
--- a/docker/alpine.dockerfile
+++ b/docker/alpine.dockerfile
@@ -1,5 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.401-alpine3.18
-
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.1-alpine3.18
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache --update \
@@ -23,6 +22,7 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
     && echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964  dotnet-install.sh" | sha256sum -c \
     && chmod +x ./dotnet-install.sh \
     && ./dotnet-install.sh -v 6.0.414 --install-dir /usr/share/dotnet --no-path \
+    && ./dotnet-install.sh -v 7.0.401 --install-dir /usr/share/dotnet --no-path \
     && rm dotnet-install.sh
 
 WORKDIR /project
diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile
index 7603897851..4bd74afde4 100644
--- a/docker/debian.dockerfile
+++ b/docker/debian.dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.401-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.1-bookworm-slim
 
-RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
+RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
     dpkg -i packages-microsoft-prod.deb && \
     rm packages-microsoft-prod.deb && \
     apt-get update && \
-    apt-get install -y dotnet-sdk-6.0
+    apt-get install -y dotnet-sdk-6.0 dotnet-sdk-7.0
 
 WORKDIR /project
diff --git a/test/IntegrationTests/AspNetTests.cs b/test/IntegrationTests/AspNetTests.cs
index 66426b4678..6c124d62ca 100644
--- a/test/IntegrationTests/AspNetTests.cs
+++ b/test/IntegrationTests/AspNetTests.cs
@@ -15,6 +15,7 @@
 // </copyright>
 
 #if NETFRAMEWORK
+using System.Net.Http;
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Containers;
 using FluentAssertions;
diff --git a/test/IntegrationTests/Helpers/HealthzHelper.cs b/test/IntegrationTests/Helpers/HealthzHelper.cs
index cae500f789..511e41f1e4 100644
--- a/test/IntegrationTests/Helpers/HealthzHelper.cs
+++ b/test/IntegrationTests/Helpers/HealthzHelper.cs
@@ -15,6 +15,9 @@
 // </copyright>
 
 using System.Net;
+#if NETFRAMEWORK
+using System.Net.Http;
+#endif
 using Xunit.Abstractions;
 
 namespace IntegrationTests.Helpers;
diff --git a/test/IntegrationTests/IntegrationTests.csproj b/test/IntegrationTests/IntegrationTests.csproj
index 1ad67d10ec..b6ac167b77 100644
--- a/test/IntegrationTests/IntegrationTests.csproj
+++ b/test/IntegrationTests/IntegrationTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AddTestStrongNameAssemblyKeyOnNetFramework>true</AddTestStrongNameAssemblyKeyOnNetFramework>
     <!-- No warn is needed for autogenerated code by protobuf: CS8981 - The type name only contains lower-cased ascii characters. -->
-    <NoWarn Condition="'$(TargetFramework)' == 'net7.0'">CS8981</NoWarn>
+    <NoWarn Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0'">CS8981</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
@@ -28,7 +28,7 @@
     <PackageReference Include="xunit.abstractions" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" />
   </ItemGroup>
diff --git a/test/IntegrationTests/SmokeTests.cs b/test/IntegrationTests/SmokeTests.cs
index 169feedd8f..dd73a6962c 100644
--- a/test/IntegrationTests/SmokeTests.cs
+++ b/test/IntegrationTests/SmokeTests.cs
@@ -23,6 +23,7 @@
 
 #if NETFRAMEWORK
 using System.Net;
+using System.Net.Http;
 using FluentAssertions.Extensions;
 using IntegrationTests.Helpers.Compatibility;
 #endif
diff --git a/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj b/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj
index fa732781db..b96c52af32 100644
--- a/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj
+++ b/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- No warn is needed for autogenerated code by protobuf: CS8981 - The type name only contains lower-cased ascii characters. -->
-    <NoWarn Condition="'$(TargetFramework)' == 'net7.0'">CS8981</NoWarn>
+    <NoWarn Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0'">CS8981</NoWarn>
+
   </PropertyGroup>
 
   <ItemGroup>

From 837f3377b811835f5c826f3533ae9c680f65104b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 5 Oct 2023 12:19:28 +0200
Subject: [PATCH 04/28] global Json

---
 global.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 global.json

diff --git a/global.json b/global.json
new file mode 100644
index 0000000000..0485f51484
--- /dev/null
+++ b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.100-rc.1.23455.8",
+    "allowPrerelease": true,
+    "rollForward": "latestMajor"
+  }
+}
\ No newline at end of file

From 4fdf849232b022dd6106652e25184e91526434df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 5 Oct 2023 12:22:33 +0200
Subject: [PATCH 05/28] add .NET8 to testing frameworks

---
 build/Build.Steps.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
index 167fa94edf..fe8670a821 100644
--- a/build/Build.Steps.cs
+++ b/build/Build.Steps.cs
@@ -48,9 +48,7 @@ partial class Build
     };
 
     private static readonly IEnumerable<TargetFramework> TestFrameworks = TargetFrameworks
-        .Concat(new[] {
-            TargetFramework.NET7_0
-        });
+        .Concat(TargetFramework.NET7_0, TargetFramework.NET8_0);
 
     Target CreateRequiredDirectories => _ => _
         .Unlisted()
@@ -99,8 +97,8 @@ DotNetRestoreSettings Restore(DotNetRestoreSettings s) =>
             {
                 // Projects using `packages.config` can't be restored via "dotnet restore", use a NuGet Task to restore these projects.
                 var legacyRestoreProjects = Solution.GetNativeProjects()
-                    .Concat(new[] { Solution.GetProjectByName(Projects.Tests.Applications.AspNet) })
-                    .Concat(new[] { Solution.GetProjectByName(Projects.Tests.Applications.WcfIis) });
+                    .Concat(Solution.GetProjectByName(Projects.Tests.Applications.AspNet))
+                    .Concat(Solution.GetProjectByName(Projects.Tests.Applications.WcfIis));
 
                 RestoreLegacyNuGetPackagesConfig(legacyRestoreProjects);
             }

From 8f7e0c14a423a03b38c3ebc462f82e2991b4f1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 5 Oct 2023 12:37:03 +0200
Subject: [PATCH 06/28] Additional store for .NET8

---
 build/Build.Steps.cs                          |  1 +
 ...ibutionStructure_alpine-linux.verified.txt | 25 ++++++++++++++++++-
 ...s.DistributionStructure_linux.verified.txt | 25 ++++++++++++++++++-
 ...sts.DistributionStructure_osx.verified.txt | 25 ++++++++++++++++++-
 ...DistributionStructure_windows.verified.txt | 23 +++++++++++++++++
 5 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
index fe8670a821..4b6ada1305 100644
--- a/build/Build.Steps.cs
+++ b/build/Build.Steps.cs
@@ -536,6 +536,7 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) =>
                         // but have a later runtime move the libraries under the original tfm folder
                         // to the latest one.
                         depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET7_0, architectureStores);
+                        depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET8_0, architectureStores);
                     }
 
                     // Write the updated deps.json file.
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
index f24f1c57da..fd96feea3c 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -1,6 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-musl-x64/OpenTelemetry.AutoInstrumentation.Native.so,
@@ -68,6 +69,17 @@
   /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
   /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
   /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
@@ -90,5 +102,16 @@
   /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
   /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
+  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
 ]
\ No newline at end of file
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
index 8a958eefdc..771afaf8b0 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -1,6 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-x64/OpenTelemetry.AutoInstrumentation.Native.so,
@@ -68,6 +69,17 @@
   /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
   /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
   /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
@@ -90,5 +102,16 @@
   /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
   /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
+  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
 ]
\ No newline at end of file
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
index be5bfb6166..d4594d0027 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -1,6 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /net/Google.Protobuf.dll,
@@ -68,6 +69,17 @@
   /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
   /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
   /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
@@ -90,5 +102,16 @@
   /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
   /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
+  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
 ]
\ No newline at end of file
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
index 3240b25727..5f60ec8ee4 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -1,6 +1,7 @@
 [
   \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \AdditionalDeps\shared\Microsoft.NETCore.App\7.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \LICENSE,
   \instrument.sh,
   \net\Google.Protobuf.dll,
@@ -215,6 +216,17 @@
   \store\x64\net7.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   \store\x64\net7.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
   \store\x64\net7.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
+  \store\x64\net8.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x64\net8.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x64\net8.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
+  \store\x64\net8.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x64\net8.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x64\net8.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x64\net8.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x64\net8.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
+  \store\x64\net8.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x64\net8.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
+  \store\x64\net8.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
   \store\x86\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
   \store\x86\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
   \store\x86\net6.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
@@ -238,6 +250,17 @@
   \store\x86\net7.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   \store\x86\net7.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
   \store\x86\net7.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
+  \store\x86\net8.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x86\net8.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x86\net8.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
+  \store\x86\net8.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x86\net8.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x86\net8.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x86\net8.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x86\net8.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
+  \store\x86\net8.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x86\net8.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
+  \store\x86\net8.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
   \win-x64\OpenTelemetry.AutoInstrumentation.Native.dll,
   \win-x86\OpenTelemetry.AutoInstrumentation.Native.dll
 ]
\ No newline at end of file

From dedd7e690f458228b6e62a9c502e6c71b6033d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Mon, 9 Oct 2023 13:50:00 +0200
Subject: [PATCH 07/28] Fix additional store

---
 build/Build.Steps.cs                          |  20 ++-
 ...ibutionStructure_alpine-linux.verified.txt | 138 +++++++++---------
 ...s.DistributionStructure_linux.verified.txt | 138 +++++++++---------
 ...sts.DistributionStructure_osx.verified.txt | 138 +++++++++---------
 ...DistributionStructure_windows.verified.txt | 138 +++++++++---------
 5 files changed, 292 insertions(+), 280 deletions(-)

diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
index 4b6ada1305..608387dab8 100644
--- a/build/Build.Steps.cs
+++ b/build/Build.Steps.cs
@@ -530,20 +530,32 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) =>
                     depsJson.RemoveDuplicatedLibraries(architectureStores);
                     depsJson.RemoveOpenTelemetryLibraries();
 
+                    // To allow roll forward for applications, like Roslyn, that target one tfm
+                    // but have a later runtime move the libraries under the original tfm folder
+                    // to the latest one.
                     if (folderRuntimeName == TargetFramework.NET6_0)
                     {
-                        // To allow roll forward for applications, like Roslyn, that target one tfm
-                        // but have a later runtime move the libraries under the original tfm folder
-                        // to the latest one.
-                        depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET7_0, architectureStores);
                         depsJson.RollFrameworkForward(TargetFramework.NET6_0, TargetFramework.NET8_0, architectureStores);
                     }
+                    else if (folderRuntimeName == TargetFramework.NET7_0 || folderRuntimeName == TargetFramework.NET8_0)
+                    {
+                        depsJson.RollFrameworkForward(TargetFramework.NET7_0, TargetFramework.NET8_0, architectureStores);
+                    }
 
                     // Write the updated deps.json file.
                     File.WriteAllText(file, depsJson.ToJsonString(new()
                     {
                         WriteIndented = true
                     }));
+
+                    // workaround for rc version
+                    if (file!.Parent!.Name.Contains("8.0.0"))
+                    {
+                        var newDirectory = file.Parent.Parent / "8.0.0-rc.1.23419.4";
+                        newDirectory.CreateOrCleanDirectory();
+                        file.Move(newDirectory / file.Name);
+                        file.Parent.DeleteDirectory();
+                    }
                 });
 
             // Cleanup Additional Deps Directory
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
index fd96feea3c..5a8679379f 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.1.23419.4/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-musl-x64/OpenTelemetry.AutoInstrumentation.Native.so,
@@ -46,72 +46,72 @@
   /net/System.ServiceModel.Primitives.dll,
   /net/System.ServiceModel.dll,
   /net/ruleEngine.json,
-  /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net6.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net6.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x64/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net7.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net6.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net6.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net7.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
+  /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net6.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net6.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net6.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net6.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
 ]
\ No newline at end of file
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
index 771afaf8b0..44e1b42233 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.1.23419.4/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-x64/OpenTelemetry.AutoInstrumentation.Native.so,
@@ -46,72 +46,72 @@
   /net/System.ServiceModel.Primitives.dll,
   /net/System.ServiceModel.dll,
   /net/ruleEngine.json,
-  /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net6.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net6.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x64/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net7.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net6.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net6.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net7.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
+  /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net6.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net6.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net6.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net6.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
 ]
\ No newline at end of file
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
index d4594d0027..9ee3e4d8d2 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.1.23419.4/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /net/Google.Protobuf.dll,
@@ -46,72 +46,72 @@
   /net/System.ServiceModel.dll,
   /net/ruleEngine.json,
   /osx-x64/OpenTelemetry.AutoInstrumentation.Native.dylib,
-  /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net6.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net6.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x64/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net7.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net6.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net6.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net7.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net7.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll
+  /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net6.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net6.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net7.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net7.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x64/net8.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x64/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x64/net8.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x64/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x64/net8.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x64/net8.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net6.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net6.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net6.0/system.diagnostics.diagnosticsource/7.0.2/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net7.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net7.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration.binder/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
+  /store/x86/net8.0/microsoft.extensions.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
+  /store/x86/net8.0/microsoft.extensions.logging.configuration/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
+  /store/x86/net8.0/microsoft.extensions.logging/7.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
+  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  /store/x86/net8.0/microsoft.extensions.options/7.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
+  /store/x86/net8.0/microsoft.extensions.primitives/7.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
 ]
\ No newline at end of file
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
index 5f60ec8ee4..ba0dd1e81e 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -1,7 +1,7 @@
 [
   \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \AdditionalDeps\shared\Microsoft.NETCore.App\7.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0-rc.1.23419.4\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \LICENSE,
   \instrument.sh,
   \net\Google.Protobuf.dll,
@@ -193,74 +193,74 @@
   \netfx\libgrpc_csharp_ext.x64.dylib,
   \netfx\libgrpc_csharp_ext.x64.so,
   \netfx\netstandard.dll,
-  \store\x64\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
-  \store\x64\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x64\net6.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
-  \store\x64\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  \store\x64\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
-  \store\x64\net6.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
-  \store\x64\net6.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
-  \store\x64\net6.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
-  \store\x64\net6.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  \store\x64\net6.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
-  \store\x64\net6.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
-  \store\x64\net6.0\system.diagnostics.diagnosticsource\7.0.2\lib\net7.0\System.Diagnostics.DiagnosticSource.dll,
-  \store\x64\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
-  \store\x64\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x64\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
-  \store\x64\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  \store\x64\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
-  \store\x64\net7.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
-  \store\x64\net7.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
-  \store\x64\net7.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
-  \store\x64\net7.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  \store\x64\net7.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
-  \store\x64\net7.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
-  \store\x64\net8.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
-  \store\x64\net8.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x64\net8.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
-  \store\x64\net8.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  \store\x64\net8.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
-  \store\x64\net8.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
-  \store\x64\net8.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
-  \store\x64\net8.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
-  \store\x64\net8.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  \store\x64\net8.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
-  \store\x64\net8.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
-  \store\x86\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
-  \store\x86\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x86\net6.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
-  \store\x86\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  \store\x86\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
-  \store\x86\net6.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
-  \store\x86\net6.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
-  \store\x86\net6.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
-  \store\x86\net6.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  \store\x86\net6.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
-  \store\x86\net6.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
-  \store\x86\net6.0\system.diagnostics.diagnosticsource\7.0.2\lib\net7.0\System.Diagnostics.DiagnosticSource.dll,
-  \store\x86\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
-  \store\x86\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x86\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
-  \store\x86\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  \store\x86\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
-  \store\x86\net7.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
-  \store\x86\net7.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
-  \store\x86\net7.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
-  \store\x86\net7.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  \store\x86\net7.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
-  \store\x86\net7.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
-  \store\x86\net8.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
-  \store\x86\net8.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x86\net8.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
-  \store\x86\net8.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  \store\x86\net8.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
-  \store\x86\net8.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net7.0\Microsoft.Extensions.Logging.Abstractions.dll,
-  \store\x86\net8.0\microsoft.extensions.logging.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.Configuration.dll,
-  \store\x86\net8.0\microsoft.extensions.logging\7.0.0\lib\net7.0\Microsoft.Extensions.Logging.dll,
-  \store\x86\net8.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net7.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  \store\x86\net8.0\microsoft.extensions.options\7.0.0\lib\net7.0\Microsoft.Extensions.Options.dll,
-  \store\x86\net8.0\microsoft.extensions.primitives\7.0.0\lib\net7.0\Microsoft.Extensions.Primitives.dll,
+  \store\x64\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x64\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x64\net6.0\microsoft.extensions.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.dll,
+  \store\x64\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x64\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x64\net6.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net8.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x64\net6.0\microsoft.extensions.logging.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x64\net6.0\microsoft.extensions.logging\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.dll,
+  \store\x64\net6.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net8.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x64\net6.0\microsoft.extensions.options\7.0.0\lib\net8.0\Microsoft.Extensions.Options.dll,
+  \store\x64\net6.0\microsoft.extensions.primitives\7.0.0\lib\net8.0\Microsoft.Extensions.Primitives.dll,
+  \store\x64\net6.0\system.diagnostics.diagnosticsource\7.0.2\lib\net8.0\System.Diagnostics.DiagnosticSource.dll,
+  \store\x64\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x64\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x64\net7.0\microsoft.extensions.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.dll,
+  \store\x64\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x64\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x64\net7.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net8.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x64\net7.0\microsoft.extensions.logging.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x64\net7.0\microsoft.extensions.logging\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.dll,
+  \store\x64\net7.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net8.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x64\net7.0\microsoft.extensions.options\7.0.0\lib\net8.0\Microsoft.Extensions.Options.dll,
+  \store\x64\net7.0\microsoft.extensions.primitives\7.0.0\lib\net8.0\Microsoft.Extensions.Primitives.dll,
+  \store\x64\net8.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x64\net8.0\microsoft.extensions.configuration.binder\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x64\net8.0\microsoft.extensions.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.dll,
+  \store\x64\net8.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x64\net8.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x64\net8.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net8.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x64\net8.0\microsoft.extensions.logging.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x64\net8.0\microsoft.extensions.logging\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.dll,
+  \store\x64\net8.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net8.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x64\net8.0\microsoft.extensions.options\7.0.0\lib\net8.0\Microsoft.Extensions.Options.dll,
+  \store\x64\net8.0\microsoft.extensions.primitives\7.0.0\lib\net8.0\Microsoft.Extensions.Primitives.dll,
+  \store\x86\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x86\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x86\net6.0\microsoft.extensions.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.dll,
+  \store\x86\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x86\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x86\net6.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net8.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x86\net6.0\microsoft.extensions.logging.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x86\net6.0\microsoft.extensions.logging\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.dll,
+  \store\x86\net6.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net8.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x86\net6.0\microsoft.extensions.options\7.0.0\lib\net8.0\Microsoft.Extensions.Options.dll,
+  \store\x86\net6.0\microsoft.extensions.primitives\7.0.0\lib\net8.0\Microsoft.Extensions.Primitives.dll,
+  \store\x86\net6.0\system.diagnostics.diagnosticsource\7.0.2\lib\net8.0\System.Diagnostics.DiagnosticSource.dll,
+  \store\x86\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x86\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x86\net7.0\microsoft.extensions.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.dll,
+  \store\x86\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x86\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x86\net7.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net8.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x86\net7.0\microsoft.extensions.logging.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x86\net7.0\microsoft.extensions.logging\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.dll,
+  \store\x86\net7.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net8.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x86\net7.0\microsoft.extensions.options\7.0.0\lib\net8.0\Microsoft.Extensions.Options.dll,
+  \store\x86\net7.0\microsoft.extensions.primitives\7.0.0\lib\net8.0\Microsoft.Extensions.Primitives.dll,
+  \store\x86\net8.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll,
+  \store\x86\net8.0\microsoft.extensions.configuration.binder\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Binder.dll,
+  \store\x86\net8.0\microsoft.extensions.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Configuration.dll,
+  \store\x86\net8.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
+  \store\x86\net8.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.dll,
+  \store\x86\net8.0\microsoft.extensions.logging.abstractions\7.0.1\lib\net8.0\Microsoft.Extensions.Logging.Abstractions.dll,
+  \store\x86\net8.0\microsoft.extensions.logging.configuration\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.Configuration.dll,
+  \store\x86\net8.0\microsoft.extensions.logging\7.0.0\lib\net8.0\Microsoft.Extensions.Logging.dll,
+  \store\x86\net8.0\microsoft.extensions.options.configurationextensions\7.0.0\lib\net8.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
+  \store\x86\net8.0\microsoft.extensions.options\7.0.0\lib\net8.0\Microsoft.Extensions.Options.dll,
+  \store\x86\net8.0\microsoft.extensions.primitives\7.0.0\lib\net8.0\Microsoft.Extensions.Primitives.dll,
   \win-x64\OpenTelemetry.AutoInstrumentation.Native.dll,
   \win-x86\OpenTelemetry.AutoInstrumentation.Native.dll
 ]
\ No newline at end of file

From 2949616df7feacaa75048491c21b88cf53583213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Tue, 10 Oct 2023 08:31:27 +0200
Subject: [PATCH 08/28] Fix logs instrumentation on .NET8

---
 .../InstrumentationDefinitions.g.cs                             | 2 +-
 .../Instrumentations/Logger/LoggingBuilderIntegration.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
index 438fcb3c49..4e024a0423 100644
--- a/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
+++ b/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
@@ -67,7 +67,7 @@ private static NativeCallTargetDefinition[] GetDefinitionsArray()
             // ILogger
             if (logSettings.EnabledInstrumentations.Contains(LogInstrumentation.ILogger))
             {
-                nativeCallTargetDefinitions.Add(new("Microsoft.Extensions.Logging", "Microsoft.Extensions.Logging.LoggingBuilder", ".ctor", new[] {"System.Void", "Microsoft.Extensions.DependencyInjection.IServiceCollection"}, 3, 1, 0, 7, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.Logger.LoggingBuilderIntegration"));
+                nativeCallTargetDefinitions.Add(new("Microsoft.Extensions.Logging", "Microsoft.Extensions.Logging.LoggingBuilder", ".ctor", new[] {"System.Void", "Microsoft.Extensions.DependencyInjection.IServiceCollection"}, 3, 1, 0, 8, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.Logger.LoggingBuilderIntegration"));
             }
         }
 
diff --git a/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs b/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs
index 7ac018df3c..13ebd4abf9 100644
--- a/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs
+++ b/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs
@@ -29,7 +29,7 @@ namespace OpenTelemetry.AutoInstrumentation.Instrumentations.Logger;
     returnTypeName: ClrNames.Void,
     parameterTypeNames: new[] { "Microsoft.Extensions.DependencyInjection.IServiceCollection" },
     minimumVersion: "3.1.0",
-    maximumVersion: "7.*.*",
+    maximumVersion: "8.*.*",
     integrationName: "ILogger",
     type: InstrumentationType.Log)]
 public static class LoggingBuilderIntegration

From 998a59fb085934e59c3a73879c6d8effe03344a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Tue, 10 Oct 2023 09:25:30 +0200
Subject: [PATCH 09/28] CentOS build-container test fix

---
 .github/workflows/build-container.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index b5954f23fc..b5cabb2a72 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -15,8 +15,10 @@ jobs:
         include:
           - base-image: alpine
             os-type: linux-musl
+            net-version: net8.0
           - base-image: centos
             os-type: linux-glibc
+            net-version: net7.0
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
@@ -35,10 +37,10 @@ jobs:
         docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" ./docker
         docker run --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project --rm mybuildimage /bin/sh -c '
           set -e
-          dotnet publish -f net8.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f ${{ matrix.net-version }} -c Release ./test/test-applications/integrations/TestApplication.Smoke
           export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
           . ./instrument.sh
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/${{ matrix.net-version }}/publish/TestApplication.Smoke
             test "$(ls -A /var/log/opentelemetry/dotnet )"
         '
     - name: Publish Linux build

From 8579d5817c56a7adf469beba72d70f37cec29828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Tue, 10 Oct 2023 09:51:47 +0200
Subject: [PATCH 10/28] Add wokaround for breaking change in DuckTyping

Co-authored-by: Andrew Lock <andrew.lock@datadoghq.com>
---
 .../DuckTyping/DuckType.Statics.cs                             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/OpenTelemetry.AutoInstrumentation/DuckTyping/DuckType.Statics.cs b/src/OpenTelemetry.AutoInstrumentation/DuckTyping/DuckType.Statics.cs
index 894600a365..d357e475da 100644
--- a/src/OpenTelemetry.AutoInstrumentation/DuckTyping/DuckType.Statics.cs
+++ b/src/OpenTelemetry.AutoInstrumentation/DuckTyping/DuckType.Statics.cs
@@ -63,7 +63,8 @@ static DuckType()
         _getTypeFromHandleMethodInfo = typeof(Type).GetMethod(nameof(Type.GetTypeFromHandle));
         _enumToObjectMethodInfo = typeof(Enum).GetMethod(nameof(Enum.ToObject), new[] { typeof(Type), typeof(object) });
         _duckTypeInstancePropertyInfo = typeof(IDuckType).GetProperty(nameof(IDuckType.Instance));
-        _methodBuilderGetToken = typeof(MethodBuilder).GetMethod("GetToken", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        _methodBuilderGetToken = typeof(MethodBuilder).GetMethod("GetToken", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
+                                 ?? typeof(MethodBuilder).GetProperty("MetadataToken", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)?.GetMethod;
         _ignoresAccessChecksToAttributeCtor = typeof(IgnoresAccessChecksToAttribute).GetConstructor(new[] { typeof(string) });
 
         _assemblyCount = 0;

From 4d6b7bb34d365b57f7aab49f733c6af5c0917945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Fri, 13 Oct 2023 07:22:15 +0200
Subject: [PATCH 11/28] Bump .NET 8 to rc.2

---
 .github/workflows/build-nuget-packages.yml                | 2 +-
 .github/workflows/build.yml                               | 2 +-
 .github/workflows/ci.yml                                  | 8 ++++----
 .github/workflows/dotnet-format.yml                       | 2 +-
 .github/workflows/release-publish.yml                     | 2 +-
 .github/workflows/verify-test.yml                         | 2 +-
 build/Build.Steps.cs                                      | 2 +-
 docker/alpine.dockerfile                                  | 2 +-
 docker/debian.dockerfile                                  | 2 +-
 global.json                                               | 2 +-
 ...dTests.DistributionStructure_alpine-linux.verified.txt | 2 +-
 .../BuildTests.DistributionStructure_linux.verified.txt   | 2 +-
 .../BuildTests.DistributionStructure_osx.verified.txt     | 2 +-
 .../BuildTests.DistributionStructure_windows.verified.txt | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
index f416972f4a..7af8cd799c 100644
--- a/.github/workflows/build-nuget-packages.yml
+++ b/.github/workflows/build-nuget-packages.yml
@@ -31,7 +31,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
 
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ef1d524b4..22edd9676e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32fb3f0200..cc7e73df48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -97,7 +97,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -129,7 +129,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -204,7 +204,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 2043fa4e42..6ec2ab7a8b 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.100-rc.1.23455.8
+        dotnet-version: 8.0.100-rc.2.23502.2
 
     - name: dotnet format
       run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 4eea5408a6..2039ead5d0 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -57,7 +57,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory
diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml
index ad178283de..5acb759feb 100644
--- a/.github/workflows/verify-test.yml
+++ b/.github/workflows/verify-test.yml
@@ -32,7 +32,7 @@ jobs:
           dotnet-version: | 
             6.0.415
             7.0.402
-            8.0.100-rc.1.23455.8
+            8.0.100-rc.2.23502.2
       - run: ./build.cmd BuildTracer ManagedTests --containers ${{ matrix.containers }} --test-project "${{ github.event.inputs.testProject }}" --test-name '"${{ github.event.inputs.testName }}"' --test-count ${{ github.event.inputs.count }}
       - name: Upload logs
         uses: actions/upload-artifact@v3.1.3
diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
index 608387dab8..3e24b3dfb0 100644
--- a/build/Build.Steps.cs
+++ b/build/Build.Steps.cs
@@ -551,7 +551,7 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) =>
                     // workaround for rc version
                     if (file!.Parent!.Name.Contains("8.0.0"))
                     {
-                        var newDirectory = file.Parent.Parent / "8.0.0-rc.1.23419.4";
+                        var newDirectory = file.Parent.Parent / "8.0.0-rc.2.23479.6";
                         newDirectory.CreateOrCleanDirectory();
                         file.Move(newDirectory / file.Name);
                         file.Parent.DeleteDirectory();
diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile
index 95b0794aed..70921f3f0c 100644
--- a/docker/alpine.dockerfile
+++ b/docker/alpine.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.1-alpine3.18
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.2-alpine3.18
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache --update \
diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile
index 4bd74afde4..e6f75fbdf9 100644
--- a/docker/debian.dockerfile
+++ b/docker/debian.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.1-bookworm-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.2-bookworm-slim
 
 RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
     dpkg -i packages-microsoft-prod.deb && \
diff --git a/global.json b/global.json
index 0485f51484..c603e9170e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.1.23455.8",
+    "version": "8.0.100-rc.2.23502.2",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   }
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
index 5a8679379f..03e19cb024 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.1.23419.4/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-musl-x64/OpenTelemetry.AutoInstrumentation.Native.so,
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
index 44e1b42233..3e8a218de3 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.1.23419.4/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-x64/OpenTelemetry.AutoInstrumentation.Native.so,
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
index 9ee3e4d8d2..b58034a879 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.1.23419.4/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /net/Google.Protobuf.dll,
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
index ba0dd1e81e..c297165f10 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -1,7 +1,7 @@
 [
   \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \AdditionalDeps\shared\Microsoft.NETCore.App\7.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0-rc.1.23419.4\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0-rc.2.23479.6\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \LICENSE,
   \instrument.sh,
   \net\Google.Protobuf.dll,

From 2942b82273254d9bff477bfffd82dc65f4fc0d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Fri, 13 Oct 2023 08:03:02 +0200
Subject: [PATCH 12/28] Cento Workflow

---
 .../build-centos-native-container.yml         | 34 +++++++++++++++++++
 .github/workflows/build-container.yml         |  3 --
 .github/workflows/build-nuget-packages.yml    |  6 ++--
 .github/workflows/build.yml                   | 11 ++++++
 .github/workflows/ci.yml                      | 16 +++++----
 .github/workflows/release.yml                 | 10 ++++--
 build/Build.NuGet.Steps.cs                    |  2 +-
 build/Build.cs                                |  7 ++++
 build/_build.csproj                           |  2 +-
 .../DependencyListGenerator.csproj            |  2 +-
 10 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/build-centos-native-container.yml

diff --git a/.github/workflows/build-centos-native-container.yml b/.github/workflows/build-centos-native-container.yml
new file mode 100644
index 0000000000..46aaf24bea
--- /dev/null
+++ b/.github/workflows/build-centos-native-container.yml
@@ -0,0 +1,34 @@
+name: Build on Centos Native Container
+
+on:
+  workflow_call:
+
+env:
+  NUGET_PACKAGES: ${{ github.workspace }}/packages
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+jobs:
+  build-centos-native-container:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+    steps:
+    - uses: actions/checkout@v4.1.0
+      with:
+        fetch-depth: 0 # fetching all, needed to correctly calculate version
+    - name: Build native library in Docker container
+      run: |
+        set -e
+        rm global.json
+        docker build -t mybuildimage -f "./docker/centos.dockerfile" ./docker
+        docker run -e OS_TYPE=linux-glibc --rm --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project mybuildimage \
+          /bin/sh -c 'git config --global --add safe.directory /project && ./build.sh BuildNativeWorkflow'
+
+    - name: Publish native library Linux build
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        name: bin-centos-native
+        path: bin/tracer-home
+      if: (${{ job.status }} != 'cancelled')
+      continue-on-error: true
\ No newline at end of file
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index b5cabb2a72..4b1de1ba2c 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -16,9 +16,6 @@ jobs:
           - base-image: alpine
             os-type: linux-musl
             net-version: net8.0
-          - base-image: centos
-            os-type: linux-glibc
-            net-version: net7.0
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
index 7af8cd799c..52d3fd9013 100644
--- a/.github/workflows/build-nuget-packages.yml
+++ b/.github/workflows/build-nuget-packages.yml
@@ -46,11 +46,11 @@ jobs:
           name: bin-windows-2022
           path: bin/ci-artifacts/bin-windows-2022
 
-      - name: Download CentOS Artifacts from build job
+      - name: Download ubuntu Artifacts from build job
         uses: actions/download-artifact@v3.0.2
         with:
-          name: bin-centos
-          path: bin/ci-artifacts/bin-centos
+          name: bin-ubuntu-20.04
+          path: bin/ci-artifacts/bin-ubuntu-20.04
 
       - name: Download Alpine Artifacts from build job
         uses: actions/download-artifact@v3.0.2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22edd9676e..12cdb147df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,17 @@ jobs:
 
       - run: ./build.cmd BuildWorkflow --no-restore ${{ steps.nuget-cache.outputs.cache-hit != 'true' }}
 
+      - name: Download native CentOS Artifacts from build job
+        if: ${{ matrix.machine == 'ubuntu-20.04' }}
+        uses: actions/download-artifact@v3.0.2
+        with:
+          name: bin-centos-native
+          path: bin/ci-artifacts/bin-centos-native
+      - name: Replace Ubuntu native code by Centos artifacts
+        run: |
+          rm ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
+          cp ./bin/ci-artifacts/bin-centos-native/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
+        if: ${{ matrix.machine == 'ubuntu-20.04' }}
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc7e73df48..e393bdb42d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,12 +12,16 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
 jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-
   build-container:
     uses: ./.github/workflows/build-container.yml
 
+  build-centos-native:
+    uses: ./.github/workflows/build-centos-native-container.yml
+
+  build:
+    needs: build-centos-native
+    uses: ./.github/workflows/build.yml
+
   build-nuget-packages:
     needs: [ build, build-container ]
     uses: ./.github/workflows/build-nuget-packages.yml
@@ -153,7 +157,7 @@ jobs:
           path: test-artifacts/
 
   test-build-container:
-    needs: build-container
+    needs: [build, build-container]
     strategy:
       fail-fast: false
       matrix:
@@ -162,10 +166,10 @@ jobs:
             build-source: alpine
             os-type: linux-musl
           - base-image: centos
-            build-source: centos
+            build-source: ubuntu-20.04
             os-type: linux-glibc
           - base-image: debian
-            build-source: centos
+            build-source: ubuntu-20.04
             os-type: linux-glibc
     runs-on: ubuntu-20.04
     timeout-minutes: 60
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 79d1a02161..33ef91b201 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,12 +10,16 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
 jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-
   build-container:
     uses: ./.github/workflows/build-container.yml
 
+  build-centos-native:
+    uses: ./.github/workflows/build-centos-native-container.yml
+
+  build:
+    needs: build-centos-native
+    uses: ./.github/workflows/build.yml
+
   build-nuget-packages:
     needs: [ build, build-container ]
     uses: ./.github/workflows/build-nuget-packages.yml
diff --git a/build/Build.NuGet.Steps.cs b/build/Build.NuGet.Steps.cs
index 6545aa6501..83a8626113 100644
--- a/build/Build.NuGet.Steps.cs
+++ b/build/Build.NuGet.Steps.cs
@@ -51,7 +51,7 @@ partial class Build
             var requiredArtifacts = new string[]
             {
                 "bin-alpine/linux-musl-x64",
-                "bin-centos/linux-x64",
+                "bin-ubuntu-20.04/linux-x64",
                 "bin-macos-11/osx-x64",
                 "bin-windows-2022/win-x64",
                 "bin-windows-2022/win-x86"
diff --git a/build/Build.cs b/build/Build.cs
index 74b16d1408..71b843e55d 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -89,6 +89,13 @@ void DeleteReparsePoints(string path)
         .DependsOn(BuildTracer)
         .DependsOn(CompileExamples);
 
+    Target BuildNativeWorkflow  => _ => _
+        .Description("Builds the native code project deliverables.")
+        .After(Clean)
+        .DependsOn(CreateRequiredDirectories)
+        .DependsOn(CompileNativeSrc)
+        .DependsOn(PublishNativeProfiler);
+
     Target TestWorkflow => _ => _
         .Description("Builds and run the tests against the local deliverables (except NuGet packages)")
         .After(BuildWorkflow)
diff --git a/build/_build.csproj b/build/_build.csproj
index 306a55fc59..514a7d62dc 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\</NukeRootDirectory>
diff --git a/tools/DependencyListGenerator/DependencyListGenerator.csproj b/tools/DependencyListGenerator/DependencyListGenerator.csproj
index 811d46b4d1..b3cdeb3719 100644
--- a/tools/DependencyListGenerator/DependencyListGenerator.csproj
+++ b/tools/DependencyListGenerator/DependencyListGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
   </PropertyGroup>

From e945df142fc9325a465a64ca836cba73154fbf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Fri, 13 Oct 2023 12:12:09 +0200
Subject: [PATCH 13/28] RuntimeIdentifiers mapping

---
 build/Build.NuGet.Steps.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/build/Build.NuGet.Steps.cs b/build/Build.NuGet.Steps.cs
index 83a8626113..c971f6aea0 100644
--- a/build/Build.NuGet.Steps.cs
+++ b/build/Build.NuGet.Steps.cs
@@ -149,13 +149,27 @@ partial class Build
         .Description("Builds the TestApplications.* used by the NuGetPackagesTests")
         .Executes(() =>
         {
+            string MapToNet8RuntimeIdentifiers(string oldRuntimeIdentifier)
+            {
+#if NET8_0_OR_GREATER
+#error Remove method when _build.cproj starts targeting .NET8+
+#endif
+                switch (oldRuntimeIdentifier)
+                {
+                    case "ubuntu.20.04-x64": return "linux-x64";
+                    case "osx.11.0-x64": return "osx-x64";
+                    case "win10-x64": return "win-x64";
+                }
+                throw new NotSupportedException($"{oldRuntimeIdentifier} is not supported. Extend MapToNet8RuntimeIdentifiers.");
+            }
+
             foreach (var packagesTestApplicationProject in Solution.GetNuGetPackagesTestApplications())
             {
                 // Unlike the integration apps these require a restore step.
                 DotNetBuild(s => s
                     .SetProjectFile(packagesTestApplicationProject)
                     .SetProperty("NuGetPackageVersion", VersionHelper.GetVersion())
-                    .SetRuntime(RuntimeInformation.RuntimeIdentifier)
+                    .SetRuntime(MapToNet8RuntimeIdentifiers(RuntimeInformation.RuntimeIdentifier))
                     .SetConfiguration(BuildConfiguration)
                     .SetPlatform(Platform));
             }

From 869a65dd69452ec885eef9c48cc07e0d9f2edf22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Mon, 16 Oct 2023 08:16:36 +0200
Subject: [PATCH 14/28] SelfContainted application - fix compilation

---
 .../nuget-packages/TestApplication.SelfContained/Program.cs   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/test-applications/nuget-packages/TestApplication.SelfContained/Program.cs b/test/test-applications/nuget-packages/TestApplication.SelfContained/Program.cs
index c847920af7..4696eb60a5 100644
--- a/test/test-applications/nuget-packages/TestApplication.SelfContained/Program.cs
+++ b/test/test-applications/nuget-packages/TestApplication.SelfContained/Program.cs
@@ -14,6 +14,10 @@
 // limitations under the License.
 // </copyright>
 
+#if NETFRAMEWORK
+using System.Net.Http;
+#endif
+
 var httpClient = new HttpClient();
 httpClient.Timeout = TimeSpan.FromSeconds(5);
 var response = await httpClient.GetAsync("http://example.com");

From 88c1b732f627f1ba3a0552f38e81f246cd414a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Mon, 16 Oct 2023 10:04:59 +0200
Subject: [PATCH 15/28] PR feedback - change reference condition

---
 test/IntegrationTests/IntegrationTests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/IntegrationTests/IntegrationTests.csproj b/test/IntegrationTests/IntegrationTests.csproj
index b6ac167b77..d9c759b447 100644
--- a/test/IntegrationTests/IntegrationTests.csproj
+++ b/test/IntegrationTests/IntegrationTests.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="xunit.abstractions" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" />
   </ItemGroup>

From 2aed10f9a6dcec958dd11c19a4fc5b07bd8db0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Mon, 16 Oct 2023 15:44:40 +0200
Subject: [PATCH 16/28] handle Centos tests

---
 .github/workflows/build-container.yml                |  5 ++---
 .github/workflows/ci.yml                             |  3 +++
 build/Build.NuGet.Steps.cs                           |  5 +++--
 build/Build.Steps.cs                                 |  6 +++++-
 build/_build.csproj                                  |  3 ++-
 docker/centos.dockerfile                             |  1 +
 .../AspNetCoreMvc/Examples.AspNetCoreMvc.csproj      |  3 ++-
 test/Directory.Build.props                           |  3 ++-
 ...etry.AutoInstrumentation.StartupHook.Tests.csproj |  3 ++-
 .../integrations/Integrations.props                  |  3 ++-
 .../TestApplication.CustomSdk.csproj                 |  3 ++-
 ...plication.EntityFrameworkCore.Pomelo.MySql.csproj |  3 ++-
 .../TestApplication.EntityFrameworkCore.csproj       |  3 ++-
 .../TestApplication.GraphQL.csproj                   |  3 ++-
 .../TestApplication.Http/TestApplication.Http.csproj |  3 ++-
 .../TestApplication.Logs/TestApplication.Logs.csproj |  3 ++-
 .../TestApplication.NServiceBus.csproj               |  3 ++-
 .../TestApplication.Quartz.csproj                    |  3 ++-
 .../Properties/launchSettings.json                   | 12 ++++++++++++
 .../TestApplication.Razor.csproj                     |  3 ++-
 .../TestApplication.Wcf.Client.DotNet.csproj         |  3 ++-
 .../nuget-packages/Directory.Build.props             |  3 ++-
 .../DependencyListGenerator.csproj                   |  3 ++-
 .../LibraryVersionsGenerator.csproj                  |  3 ++-
 24 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 4b1de1ba2c..542f645880 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -15,7 +15,6 @@ jobs:
         include:
           - base-image: alpine
             os-type: linux-musl
-            net-version: net8.0
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
@@ -34,10 +33,10 @@ jobs:
         docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" ./docker
         docker run --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project --rm mybuildimage /bin/sh -c '
           set -e
-          dotnet publish -f ${{ matrix.net-version }} -c Release ./test/test-applications/integrations/TestApplication.Smoke
+          dotnet publish -f net8.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
           export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
           . ./instrument.sh
-          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/${{ matrix.net-version }}/publish/TestApplication.Smoke
+          ./test/test-applications/integrations/bin/TestApplication.Smoke/Release/net8.0/publish/TestApplication.Smoke
             test "$(ls -A /var/log/opentelemetry/dotnet )"
         '
     - name: Publish Linux build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e393bdb42d..cf441bf081 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -182,6 +182,9 @@ jobs:
       with:
         name: bin-${{ matrix.build-source }}
         path: bin/tracer-home
+    - name: remove global.json workaround for Centos
+      if: ${{ matrix.base-image == 'centos' }}
+      run: rm global.json
     - name: Build in Docker container
       run: |
         set -e
diff --git a/build/Build.NuGet.Steps.cs b/build/Build.NuGet.Steps.cs
index c971f6aea0..16bf01e55c 100644
--- a/build/Build.NuGet.Steps.cs
+++ b/build/Build.NuGet.Steps.cs
@@ -152,8 +152,8 @@ partial class Build
             string MapToNet8RuntimeIdentifiers(string oldRuntimeIdentifier)
             {
 #if NET8_0_OR_GREATER
-#error Remove method when _build.cproj starts targeting .NET8+
-#endif
+                return oldRuntimeIdentifier;
+#else
                 switch (oldRuntimeIdentifier)
                 {
                     case "ubuntu.20.04-x64": return "linux-x64";
@@ -161,6 +161,7 @@ string MapToNet8RuntimeIdentifiers(string oldRuntimeIdentifier)
                     case "win10-x64": return "win-x64";
                 }
                 throw new NotSupportedException($"{oldRuntimeIdentifier} is not supported. Extend MapToNet8RuntimeIdentifiers.");
+#endif
             }
 
             foreach (var packagesTestApplicationProject in Solution.GetNuGetPackagesTestApplications())
diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
index 3e24b3dfb0..82846ea773 100644
--- a/build/Build.Steps.cs
+++ b/build/Build.Steps.cs
@@ -48,7 +48,11 @@ partial class Build
     };
 
     private static readonly IEnumerable<TargetFramework> TestFrameworks = TargetFrameworks
-        .Concat(TargetFramework.NET7_0, TargetFramework.NET8_0);
+        .Concat(TargetFramework.NET7_0
+#if  NET8_0_OR_GREATER
+            , TargetFramework.NET8_0
+#endif
+            );
 
     Target CreateRequiredDirectories => _ => _
         .Unlisted()
diff --git a/build/_build.csproj b/build/_build.csproj
index 514a7d62dc..864c4a7d9d 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework Condition=" '$(IsCentos)' == '' ">net8.0</TargetFramework>
+    <TargetFramework Condition=" '$(IsCentos)' != '' ">net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\</NukeRootDirectory>
diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile
index dfcc361945..8aa3c1f972 100644
--- a/docker/centos.dockerfile
+++ b/docker/centos.dockerfile
@@ -3,6 +3,7 @@ FROM ghcr.io/open-telemetry/opentelemetry-dotnet-instrumentation-centos7-build-i
 RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
 RUN yum -y install dotnet-sdk-6.0-6.0.415-1 dotnet-sdk-7.0-7.0.402-1
 
+ENV IsCentos=true
 WORKDIR /project
 COPY ./docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj b/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj
index 9eae0cce0b..565adb653d 100644
--- a/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj
+++ b/examples/playground/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     <RootNamespace>Examples.AspNetCoreMvc</RootNamespace>
   </PropertyGroup>
 
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index d679c7021d..6b3d8e54ae 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -5,7 +5,8 @@
   <PropertyGroup>
     <DefineConstants Condition="'$(BuildingInsideVisualStudio)'=='true'">$(DefineConstants);DEFAULT_TEST_PACKAGE_VERSIONS</DefineConstants>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp3.0) -->
diff --git a/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj b/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj
index 101e3fe9d2..7cf6d5d9ea 100644
--- a/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj
+++ b/test/OpenTelemetry.AutoInstrumentation.StartupHook.Tests/OpenTelemetry.AutoInstrumentation.StartupHook.Tests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/Integrations.props b/test/test-applications/integrations/Integrations.props
index 3bbc475da3..837a0e229d 100644
--- a/test/test-applications/integrations/Integrations.props
+++ b/test/test-applications/integrations/Integrations.props
@@ -1,7 +1,8 @@
 <Project>
   <PropertyGroup>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
diff --git a/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj b/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj
index 9c1b962203..5496bbf5e2 100644
--- a/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj
+++ b/test/test-applications/integrations/TestApplication.CustomSdk/TestApplication.CustomSdk.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
diff --git a/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj b/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj
index 591fa5e3f0..38a7417f98 100644
--- a/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj
+++ b/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj b/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj
index 84d9954769..b23d896569 100644
--- a/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj
+++ b/test/test-applications/integrations/TestApplication.EntityFrameworkCore/TestApplication.EntityFrameworkCore.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj b/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
index b132916882..2568b2a516 100644
--- a/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
+++ b/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
index 9de915f986..bf2bd03f13 100644
--- a/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
+++ b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   
 </Project>
diff --git a/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj b/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj
index 1b512612b6..e4c605f33e 100644
--- a/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj
+++ b/test/test-applications/integrations/TestApplication.Logs/TestApplication.Logs.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj b/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj
index d8bbebb718..8e20aa908d 100644
--- a/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj
+++ b/test/test-applications/integrations/TestApplication.NServiceBus/TestApplication.NServiceBus.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
   </PropertyGroup>
 
diff --git a/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj b/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj
index ed99cdcd23..5915064f9e 100644
--- a/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj
+++ b/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <DefineConstants Condition="'$(LibraryVersion)'=='' or '$(LibraryVersion)'>='3.7.0'">$(DefineConstants);QUARTZ_3_7_0_OR_GREATER</DefineConstants>
   </PropertyGroup>
diff --git a/test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json b/test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json
new file mode 100644
index 0000000000..e8b277ea4a
--- /dev/null
+++ b/test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "TestApplication.Razor": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:53389;http://localhost:53390"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj b/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj
index 1b512612b6..e4c605f33e 100644
--- a/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj
+++ b/test/test-applications/integrations/TestApplication.Razor/TestApplication.Razor.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj b/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj
index a905a7dad3..807de1ce7f 100644
--- a/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj
+++ b/test/test-applications/integrations/TestApplication.Wcf.Client.DotNet/TestApplication.Wcf.Client.DotNet.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/test-applications/nuget-packages/Directory.Build.props b/test/test-applications/nuget-packages/Directory.Build.props
index da2be821e8..e7c6b77e5f 100644
--- a/test/test-applications/nuget-packages/Directory.Build.props
+++ b/test/test-applications/nuget-packages/Directory.Build.props
@@ -5,7 +5,8 @@
 
   <PropertyGroup>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <Nullable>enable</Nullable>
diff --git a/tools/DependencyListGenerator/DependencyListGenerator.csproj b/tools/DependencyListGenerator/DependencyListGenerator.csproj
index b3cdeb3719..9e867165fa 100644
--- a/tools/DependencyListGenerator/DependencyListGenerator.csproj
+++ b/tools/DependencyListGenerator/DependencyListGenerator.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFramework Condition=" '$(IsCentos)' == '' ">net8.0</TargetFramework>
+    <TargetFramework Condition=" '$(IsCentos)' != '' ">net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj b/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
index e009253e47..8562c89c44 100644
--- a/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
+++ b/tools/LibraryVersionsGenerator/LibraryVersionsGenerator.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework Condition=" '$(IsCentos)' == '' ">net8.0</TargetFramework>
+    <TargetFramework Condition=" '$(IsCentos)' != '' ">net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From 2e39f28e5c8ff3e250fb485d3d4b71d9ee4adbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Tue, 17 Oct 2023 07:52:36 +0200
Subject: [PATCH 17/28] fix fotnet format

---
 build/Build.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Build.cs b/build/Build.cs
index 71b843e55d..1f72a98a4f 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -89,7 +89,7 @@ void DeleteReparsePoints(string path)
         .DependsOn(BuildTracer)
         .DependsOn(CompileExamples);
 
-    Target BuildNativeWorkflow  => _ => _
+    Target BuildNativeWorkflow => _ => _
         .Description("Builds the native code project deliverables.")
         .After(Clean)
         .DependsOn(CreateRequiredDirectories)

From bbd8a5033e1a1bd04105af551ab3fd6c7b811187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Tue, 17 Oct 2023 11:48:00 +0200
Subject: [PATCH 18/28] Changelog and docs

---
 CHANGELOG.md   | 1 +
 docs/README.md | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0445425997..fdc8ab4237 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Added
 
+- Add support for .NET 8.
 - Added support for `Elastic.Transport` traces instrumentation 0.4.16+.
   `Elastic.Clients.Elasticsearch` 8.10.0+ traces instrumentation is covered by
   `Elastic.Transport` traces instrumentation.
diff --git a/docs/README.md b/docs/README.md
index 6b6c07b32f..b0201a9b1f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -85,6 +85,7 @@ CI tests run against the following operating systems:
 
 - [Alpine](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/alpine.dockerfile)
 - [CentOS 7](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-build.dockerfile)
+  (.NET 8 is not supported)
 - [macOS Big Sur 11](https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md)
 - [Microsoft Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md)
 - [Ubuntu 20.04 LTS](https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md)
@@ -104,7 +105,7 @@ See [config.md#instrumented-libraries-and-frameworks](config.md#instrumented-lib
 Instrumenting [`self-contained`](https://learn.microsoft.com/en-us/dotnet/core/deploying/#publish-self-contained)
 applications is supported through [NuGet packages](./using-the-nuget-packages.md).
 Note that a `self-contained` application is
-automatically generated in .NET 7.0 whenever the `dotnet publish` or `dotnet build`
+automatically generated in .NET 7+ whenever the `dotnet publish` or `dotnet build`
 command is used with a Runtime Identifier (RID) parameter, for example when `-r`
 or `--runtime` is used when running the command.
 

From d2d0049d85e7d10e57ffe6d04b08c9f8558bf365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 18 Oct 2023 10:38:19 +0200
Subject: [PATCH 19/28] drop wrongly commited file

---
 .../Properties/launchSettings.json                   | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json

diff --git a/test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json b/test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json
deleted file mode 100644
index e8b277ea4a..0000000000
--- a/test/test-applications/integrations/TestApplication.Razor/Properties/launchSettings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "TestApplication.Razor": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:53389;http://localhost:53390"
-    }
-  }
-}
\ No newline at end of file

From bff68e5009342fcc0a1cf24bc9c5be264cee47d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 25 Oct 2023 16:34:37 +0200
Subject: [PATCH 20/28] Add .NET8 to TestApplication.Worker

---
 .../TestApplication.Worker/TestApplication.Worker.csproj         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test-applications/integrations/TestApplication.Worker/TestApplication.Worker.csproj b/test/test-applications/integrations/TestApplication.Worker/TestApplication.Worker.csproj
index 18a4f66b71..1a0d9c1323 100644
--- a/test/test-applications/integrations/TestApplication.Worker/TestApplication.Worker.csproj
+++ b/test/test-applications/integrations/TestApplication.Worker/TestApplication.Worker.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
       <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+      <TargetFrameworks Condition=" '$(IsCentos)' == '' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

From f9099ae04dfd8f7bab0a22caf75170a5fdcc4caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Thu, 26 Oct 2023 09:25:50 +0200
Subject: [PATCH 21/28] Fix minimal test api on .net8 on linux

---
 .../integrations/TestApplication.MinimalApi/Program.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-applications/integrations/TestApplication.MinimalApi/Program.cs b/test/test-applications/integrations/TestApplication.MinimalApi/Program.cs
index b4fc0cde04..7100aa3756 100644
--- a/test/test-applications/integrations/TestApplication.MinimalApi/Program.cs
+++ b/test/test-applications/integrations/TestApplication.MinimalApi/Program.cs
@@ -38,7 +38,7 @@
 
 var server = (IServer?)app.Services.GetService(typeof(IServer));
 var addressFeature = server?.Features.Get<IServerAddressesFeature>();
-var address = addressFeature?.Addresses.First();
+var address = addressFeature?.Addresses.First().Replace("[::]", "127.0.0.1");
 
 using var httpClient = new HttpClient();
 httpClient.GetAsync($"{address}/test").Wait();

From c9cb5134debcea49d15089b5fea9d77ea6f0f48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 06:44:32 +0100
Subject: [PATCH 22/28] remove global.json

---
 global.json | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 global.json

diff --git a/global.json b/global.json
deleted file mode 100644
index c603e9170e..0000000000
--- a/global.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.100-rc.2.23502.2",
-    "allowPrerelease": true,
-    "rollForward": "latestMajor"
-  }
-}
\ No newline at end of file

From e63278da4b21aa14320a6e7522d76b45564f5a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 06:55:36 +0100
Subject: [PATCH 23/28] Update .NET SDK to 8.0.100/7.0.404/6.0.417

---
 .github/workflows/build-nuget-packages.yml |  6 +++---
 .github/workflows/build.yml                |  6 +++---
 .github/workflows/ci.yml                   | 24 +++++++++++-----------
 .github/workflows/dotnet-format.yml        |  2 +-
 .github/workflows/release-publish.yml      | 10 ++++-----
 .github/workflows/verify-test.yml          |  6 +++---
 docker/alpine.dockerfile                   |  6 +++---
 docker/centos.dockerfile                   |  2 +-
 docker/debian.dockerfile                   |  2 +-
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
index 63db6b262f..325fb21ce5 100644
--- a/.github/workflows/build-nuget-packages.yml
+++ b/.github/workflows/build-nuget-packages.yml
@@ -29,9 +29,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
 
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d3f621c4eb..a995828aff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,9 +27,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2e6378fea..26dc39f537 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,9 +53,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -99,9 +99,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -131,9 +131,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
@@ -209,9 +209,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - name: Check for NuGet packages cache
         uses: actions/cache@v3.3.1
         id: nuget-cache
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 28c4b8afe0..32aac88f4f 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.100-rc.2.23502.2
+        dotnet-version: 8.0.100
 
     - name: dotnet format
       run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index eaf7d92bf8..e79257109c 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -11,8 +11,8 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
+            6.0.417
+            7.0.404
       - name: Test the PowerShell module instructions from README.md
         shell: powershell
         run: |
@@ -55,9 +55,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory
diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml
index 6b2f99ca89..ad4b2f4bc6 100644
--- a/.github/workflows/verify-test.yml
+++ b/.github/workflows/verify-test.yml
@@ -30,9 +30,9 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: | 
-            6.0.416
-            7.0.403
-            8.0.100-rc.2.23502.2
+            6.0.417
+            7.0.404
+            8.0.100
       - run: ./build.cmd BuildTracer ManagedTests --containers ${{ matrix.containers }} --test-project "${{ github.event.inputs.testProject }}" --test-name '"${{ github.event.inputs.testName }}"' --test-count ${{ github.event.inputs.count }}
       - name: Upload logs
         uses: actions/upload-artifact@v3.1.3
diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile
index 066a0ae00b..831d3977c3 100644
--- a/docker/alpine.dockerfile
+++ b/docker/alpine.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.2-alpine3.18
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-alpine3.18
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache --update \
@@ -21,8 +21,8 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
     && echo "SHA256: $(sha256sum dotnet-install.sh)" \
     && echo "4f699579f6171f04fb70829ad9cc5958e7db52e6da8da5df2db43ebba76a61d6  dotnet-install.sh" | sha256sum -c \
     && chmod +x ./dotnet-install.sh \
-    && ./dotnet-install.sh -v 6.0.416 --install-dir /usr/share/dotnet --no-path \
-    && ./dotnet-install.sh -v 7.0.403 --install-dir /usr/share/dotnet --no-path \
+    && ./dotnet-install.sh -v 6.0.417 --install-dir /usr/share/dotnet --no-path \
+    && ./dotnet-install.sh -v 7.0.404 --install-dir /usr/share/dotnet --no-path \
     && rm dotnet-install.sh
 
 WORKDIR /project
diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile
index 7e8bbd5cd3..2dfe3e9de1 100644
--- a/docker/centos.dockerfile
+++ b/docker/centos.dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/open-telemetry/opentelemetry-dotnet-instrumentation-centos7-build-image:main
 
 RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
-RUN yum -y install dotnet-sdk-6.0-6.0.416-1 dotnet-sdk-7.0-7.0.403-1
+RUN yum -y install dotnet-sdk-6.0-6.0.417-1 dotnet-sdk-7.0-7.0.404-1
 
 ENV IsCentos=true
 WORKDIR /project
diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile
index e6f75fbdf9..53195b99f6 100644
--- a/docker/debian.dockerfile
+++ b/docker/debian.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-rc.2-bookworm-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim
 
 RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
     dpkg -i packages-microsoft-prod.deb && \

From 2ba83ab84986cdd4f038198b077eaa89abcd7ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 06:55:59 +0100
Subject: [PATCH 24/28] Remove workaround for .NET8 rc version

---
 build/Build.Steps.cs                                     | 9 ---------
 ...Tests.DistributionStructure_alpine-linux.verified.txt | 2 +-
 .../BuildTests.DistributionStructure_linux.verified.txt  | 2 +-
 .../BuildTests.DistributionStructure_osx.verified.txt    | 2 +-
 ...BuildTests.DistributionStructure_windows.verified.txt | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
index 82846ea773..86b1c47139 100644
--- a/build/Build.Steps.cs
+++ b/build/Build.Steps.cs
@@ -551,15 +551,6 @@ DotNetBuildSettings BuildTestApplication(DotNetBuildSettings x) =>
                     {
                         WriteIndented = true
                     }));
-
-                    // workaround for rc version
-                    if (file!.Parent!.Name.Contains("8.0.0"))
-                    {
-                        var newDirectory = file.Parent.Parent / "8.0.0-rc.2.23479.6";
-                        newDirectory.CreateOrCleanDirectory();
-                        file.Move(newDirectory / file.Name);
-                        file.Parent.DeleteDirectory();
-                    }
                 });
 
             // Cleanup Additional Deps Directory
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
index 03e19cb024..817f8d2b5e 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-musl-x64/OpenTelemetry.AutoInstrumentation.Native.so,
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
index 3e8a218de3..6750878fa5 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /linux-x64/OpenTelemetry.AutoInstrumentation.Native.so,
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
index b58034a879..de05ffc2ba 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -1,7 +1,7 @@
 [
   /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0-rc.2.23479.6/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
   /net/Google.Protobuf.dll,
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
index c297165f10..9347c3ed52 100644
--- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
+++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -1,7 +1,7 @@
 [
   \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \AdditionalDeps\shared\Microsoft.NETCore.App\7.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
-  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0-rc.2.23479.6\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
+  \AdditionalDeps\shared\Microsoft.NETCore.App\8.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   \LICENSE,
   \instrument.sh,
   \net\Google.Protobuf.dll,

From da0e3c3f3cc3235e316a0354f4f90227d85bba5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 07:26:27 +0100
Subject: [PATCH 25/28] remove centos workaround related to global.json

---
 .github/workflows/build-centos-native-container.yml | 1 -
 .github/workflows/ci.yml                            | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/.github/workflows/build-centos-native-container.yml b/.github/workflows/build-centos-native-container.yml
index 46aaf24bea..fb38b7a896 100644
--- a/.github/workflows/build-centos-native-container.yml
+++ b/.github/workflows/build-centos-native-container.yml
@@ -20,7 +20,6 @@ jobs:
     - name: Build native library in Docker container
       run: |
         set -e
-        rm global.json
         docker build -t mybuildimage -f "./docker/centos.dockerfile" ./docker
         docker run -e OS_TYPE=linux-glibc --rm --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project mybuildimage \
           /bin/sh -c 'git config --global --add safe.directory /project && ./build.sh BuildNativeWorkflow'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26dc39f537..0892431f66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -182,9 +182,6 @@ jobs:
       with:
         name: bin-${{ matrix.build-source }}
         path: bin/tracer-home
-    - name: remove global.json workaround for Centos
-      if: ${{ matrix.base-image == 'centos' }}
-      run: rm global.json
     - name: Build in Docker container
       run: |
         set -e

From ec84e4f5a70151abc7771c2d78d944fd530e40ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 08:11:40 +0100
Subject: [PATCH 26/28] Typo fix

---
 .github/workflows/build-nuget-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
index 325fb21ce5..4f4b0dbacf 100644
--- a/.github/workflows/build-nuget-packages.yml
+++ b/.github/workflows/build-nuget-packages.yml
@@ -46,7 +46,7 @@ jobs:
           name: bin-windows-2022
           path: bin/ci-artifacts/bin-windows-2022
 
-      - name: Download ubuntu Artifacts from build job
+      - name: Download Ubuntu Artifacts from build job
         uses: actions/download-artifact@v3.0.2
         with:
           name: bin-ubuntu-20.04

From 12b9c09d5790493b3fe0c4c73fbdbbc0e5d0cc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 08:11:58 +0100
Subject: [PATCH 27/28] Add .NET8 installation

---
 .github/workflows/release-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index e79257109c..5e0073490b 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -13,6 +13,7 @@ jobs:
           dotnet-version: | 
             6.0.417
             7.0.404
+            8.0.100
       - name: Test the PowerShell module instructions from README.md
         shell: powershell
         run: |

From 0bb04f970075b784e3c739b30e3ec7c7efaff95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Wed, 15 Nov 2023 14:53:15 +0100
Subject: [PATCH 28/28] Move changelog entry to unreleased section

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f31e01b188..71a9c578ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Added
 
+- Add support for .NET 8.
 - Added support for [System.Data.SqlClient](https://www.nuget.org/packages/System.Data.SqlClient/)
   (NuGet package) traces instrumentation from `4.8.5`.
 - Ability to update installation via PS module (`OpenTelemetry.DotNet.Auto.psm1`).
@@ -46,7 +47,6 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Added
 
-- Add support for .NET 8.
 - Added support for `Elastic.Transport` traces instrumentation 0.4.16+.
   `Elastic.Clients.Elasticsearch` 8.10.0+ traces instrumentation is covered by
   `Elastic.Transport` traces instrumentation.