Support for .NET 7

.github/workflows/ci.yml

@@ -25,6 +25,7 @@ jobs:
         with:
           dotnet-version: | 
             6.0.x
+            7.0.x
       - run: ./build.cmd Workflow --containers ${{ matrix.containers }}
       - name: Upload logs
         uses: actions/[email protected]

.github/workflows/dotnet-format.yml

@@ -20,10 +20,10 @@ jobs:
     - name: check out code
       uses: actions/[email protected]
 
-    - name: Setup .NET 6.0
+    - name: Setup .NET 7.0
       uses: actions/[email protected]
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Install format tool
       run: dotnet tool install -g dotnet-format

.github/workflows/release.yml

@@ -18,6 +18,7 @@ jobs:
         with:
           dotnet-version: | 
             6.0.x
+            7.0.x
       - run: ./build.cmd
       - name: Upload binaries
         uses: actions/[email protected]

.github/workflows/verify-test.yml

@@ -31,6 +31,7 @@ jobs:
         with:
           dotnet-version: | 
             6.0.x
+            7.0.x
       - 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/[email protected]

CHANGELOG.md

@@ -30,6 +30,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Added
 
+- Add support for .NET 7.
 - Error message on the native log if bytecode instrumentation type is missing all
   instrumentation methods [#1499](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/issues/1499).
 - Plugins can overwrite OpenTelemetry dotnet SDK instrumentation and exporter options.

build/Build.Steps.cs

@@ -14,7 +14,6 @@
 using Nuke.Common.Tools.Npm;
 using Nuke.Common.Tools.NuGet;
 using Nuke.Common.Utilities.Collections;
-using static DotNetMSBuildTasks;
 using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
@@ -52,7 +51,10 @@ partial class Build
         TargetFramework.NET6_0
     };
 
-    private static readonly IEnumerable<TargetFramework> TestFrameworks = TargetFrameworks;
+    private static readonly IEnumerable<TargetFramework> TestFrameworks = TargetFrameworks
+        .Concat(new[] {
+            TargetFramework.NET7_0
+        });
 
     Target CreateRequiredDirectories => _ => _
         .Unlisted()
@@ -129,7 +131,7 @@ partial class Build
 
             DotNetMSBuild(x => x
                 .SetTargetPath(MsBuildProject)
-                .SetTargetPlatform(Platform)
+                .SetPlatform(Platform)
                 .SetConfiguration(BuildConfiguration)
                 .DisableRestore()
                 .SetTargets("BuildCsharpTest"));
@@ -333,22 +335,21 @@ partial class Build
                 return;
             }
 
-            IEnumerable<TargetFramework> frameworks = IsWin ? TestFrameworks : TestFrameworks.ExceptNetFramework();
+            var frameworks = IsWin ? TestFrameworks : TestFrameworks.ExceptNetFramework();
 
             for (int i = 0; i < TestCount; i++)
             {
-                DotNetTest(config => config
+                DotNetMSBuild(config => config
                     .SetConfiguration(BuildConfiguration)
-                    .SetTargetPlatform(Platform)
+                    .SetPlatform(Platform)
                     .SetFilter(AndFilter(TestNameFilter(), ContainersFilter()))
                     .SetBlameHangTimeout("5m")
                     .EnableTrxLogOutput(GetResultsDirectory(project))
-                    .SetProjectFile(project)
-                    .EnableNoRestore()
-                    .EnableNoBuild()
-                    .CombineWith(frameworks, (s, fx) => s
-                        .SetFramework(fx)
-                    ));
+                    .SetTargetPath(project)
+                    .DisableRestore()
+                    .SetTargets("VSTest")
+                    .SetProperty("VSTestNoBuild", true)
+                    );
             }
         });
 
@@ -488,6 +489,7 @@ string GetFolderRuntimeName(JsonDocument jsonDocument)
             var folderRuntimeName = runtimeName switch
             {
                 ".NETCoreApp,Version=v6.0" => "net6.0",
+                ".NETCoreApp,Version=v7.0" => "net7.0",
                 _ => throw new ArgumentOutOfRangeException(nameof(runtimeName), runtimeName,
                     "This value is not supported. You have probably introduced new .NET version to AutoInstrumentation")
             };

build/Extensions/DotNetSettingsExtensions.cs

@@ -11,8 +11,7 @@ public static DotNetPublishSettings SetTargetPlatformAnyCPU(this DotNetPublishSe
     public static DotNetTestSettings SetTargetPlatformAnyCPU(this DotNetTestSettings settings)
         => settings.SetTargetPlatform(MSBuildTargetPlatform.MSIL);
 
-    public static T SetTargetPlatformAnyCPU<T>(this T settings)
-        where T : MSBuildSettings
+    public static DotNetMSBuildSettings SetTargetPlatformAnyCPU(this DotNetMSBuildSettings settings)
         => settings.SetTargetPlatform(MSBuildTargetPlatform.MSIL);
 
     public static DotNetPublishSettings SetTargetPlatform(this DotNetPublishSettings settings, MSBuildTargetPlatform platform)
@@ -29,13 +28,39 @@ public static DotNetTestSettings SetTargetPlatform(this DotNetTestSettings setti
             : settings.SetProperty("Platform", GetTargetPlatform(platform));
     }
 
+    public static DotNetMSBuildSettings SetTargetPlatform(this DotNetMSBuildSettings settings, MSBuildTargetPlatform platform)
+    {
+        return platform is null
+            ? settings
+            : settings.SetProperty("Platform", GetTargetPlatform(platform));
+    }
+
     public static DotNetTestSettings EnableTrxLogOutput(this DotNetTestSettings settings, string resultsDirectory)
     {
         return settings
             .AddLoggers("trx")
             .SetResultsDirectory(resultsDirectory);
     }
 
+    public static DotNetMSBuildSettings EnableTrxLogOutput(this DotNetMSBuildSettings settings, string resultsDirectory)
+    {
+        return settings
+            .SetProperty("VSTestLogger", "trx")
+            .SetProperty("VSTestResultsDirectory", resultsDirectory);
+    }
+    public static DotNetMSBuildSettings SetBlameHangTimeout(this DotNetMSBuildSettings settings, string timeout)
+    {
+        return settings
+            .SetProperty("VSTestBlameHang", true)
+            .SetProperty("VSTestBlameHangTimeout", timeout);
+    }
+
+    public static DotNetMSBuildSettings SetFilter(this DotNetMSBuildSettings settings, string filter)
+    {
+        return settings
+            .SetProperty("VSTestTestCaseFilter", filter);
+    }
+
     private static string GetTargetPlatform(MSBuildTargetPlatform platform) =>
         platform == MSBuildTargetPlatform.MSIL ? "AnyCPU" : platform.ToString();
 }

build/TargetFramework.cs

@@ -11,6 +11,7 @@ public class TargetFramework : Enumeration
 {
     public static readonly TargetFramework NET462 = new() { Value = "net462" };
     public static readonly TargetFramework NET6_0 = new() { Value = "net6.0" };
+    public static readonly TargetFramework NET7_0 = new() { Value = "net7.0" };
 
     public static readonly TargetFramework[] NetFramework = {
         NET462

build/_build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\..</NukeRootDirectory>

docker/alpine.dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.16
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine3.16
 
 RUN apk update \
     && apk upgrade \
@@ -16,11 +16,9 @@ ENV IsAlpine=true
 ENV PROTOBUF_PROTOC=/usr/bin/protoc
 ENV gRPC_PluginFullPath=/usr/bin/grpc_csharp_plugin
 
-# Install older .NET SDKs using the install script
-# will be needed when we switch to 7.0
-# RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
-#    && chmod +x ./dotnet-install.sh \
-#    && ./dotnet-install.sh -c 3.1 --install-dir /usr/share/dotnet --no-path \
-#    && rm dotnet-install.sh
+RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
+   && chmod +x ./dotnet-install.sh \
+   && ./dotnet-install.sh -c 6.0 --install-dir /usr/share/dotnet --no-path \
+   && rm dotnet-install.sh
 
 WORKDIR /project

examples/AspNetCoreMvc/Examples.AspNetCoreMvc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <RootNamespace>Examples.AspNetCoreMvc</RootNamespace>
   </PropertyGroup>
 

examples/ConsoleApp.SelfBootstrap/Examples.ConsoleApp.SelfBootstrap.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">

examples/ConsoleApp/Examples.ConsoleApp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">

examples/CoreAppOldReference/Examples.CoreAppOldReference.csproj

@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>

examples/Vendor.Distro/Examples.Vendor.Distro.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.0;net462</TargetFrameworks>
     <Version>0.0.1</Version>
   </PropertyGroup>
 

integrations.json

@@ -68,7 +68,7 @@
           "minimum_major": 3,
           "minimum_minor": 1,
           "minimum_patch": 0,
-          "maximum_major": 6,
+          "maximum_major": 7,
           "maximum_minor": 65535,
           "maximum_patch": 65535
         },

src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="CallComposeStore" AfterTargets="Publish">

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 = "6.*.*",
+    MaximumVersion = "7.*.*",
     IntegrationName = "ILogger",
     Type = InstrumentationType.Log)]
 public class LoggingBuilderIntegration

test/Directory.Build.props

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- only run .NET Framework tests on Windows -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp3.0) -->