chore: Update agent projects to support and test .NET 8. (#2079)

newrelic · Dec 4, 2023 · b20ea3b · b20ea3b
1 parent a04873f
commit b20ea3b
Show file tree

Hide file tree

Showing 60 changed files with 299 additions and 131 deletions.
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
@@ -47,12 +47,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
-        with:
-          dotnet-version: 7.x
-          dotnet-quality: 'ga'
-
       - name: Restore NuGet Packages
         run: dotnet restore
 

diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Directory.Build.props b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..'))" />
+  <PropertyGroup>
+    <NuGetAudit>false</NuGetAudit>
+  </PropertyGroup>
+</Project>
diff --git a/src/NewRelic.Core/DotnetVersion.cs b/src/NewRelic.Core/DotnetVersion.cs
@@ -33,6 +33,7 @@ public enum DotnetCoreVersion
         net5,
         net6,
         net7,
+        net8,
         Other
     }
 
@@ -101,6 +102,11 @@ public static DotnetCoreVersion GetDotnetCoreVersion()
                 return DotnetCoreVersion.netcoreapp31;
             }
 
+            if (envVer.Major == 8)
+            {
+                return DotnetCoreVersion.net8;
+            }
+
             if (envVer.Major == 7)
             {
                 return DotnetCoreVersion.net7;
@@ -130,7 +136,7 @@ public static bool IsUnsupportedDotnetCoreVersion(DotnetCoreVersion version)
             // Newer versions of .net will be flagged as Other until we update our version checking logic.
             // So we can either check against a supported list, or an unsupported list, but the supported list
             // is smaller.
-            var supportedDotnetCoreVersions = new List<DotnetCoreVersion> { DotnetCoreVersion.net6, DotnetCoreVersion.net7, DotnetCoreVersion.Other };
+            var supportedDotnetCoreVersions = new List<DotnetCoreVersion> { DotnetCoreVersion.net6, DotnetCoreVersion.net7, DotnetCoreVersion.net8, DotnetCoreVersion.Other };
             return !supportedDotnetCoreVersions.Contains(version);
         }
 

diff --git a/...sts/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj b/...sts/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...sts/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj b/...sts/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...tionTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj b/...tionTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...ations/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj b/...ations/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...tionTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj b/...tionTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...tCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj b/...tCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...Tests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj b/...Tests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Program.cs
@@ -69,7 +69,7 @@ await context.Response.WriteAsync(JsonSerializer.Serialize(subscriptions,
 
             AppLifecycleManager.WaitForTestCompletion(_port);
 
-            ct.Cancel();
+            await ct.CancelAsync();
 
             await task;
         }

diff --git a/...sts/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj b/...sts/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj b/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...gent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj b/...gent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="2.6.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/Program.cs
@@ -11,7 +11,6 @@
 using ApplicationLifecycle;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.CodeAnalysis;
 
 namespace SerilogSumologicApplication
 {

diff --git a/...egrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj b/...egrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs
@@ -415,6 +415,12 @@ public NewRelicConfigModifier EnableAspNetCore6PlusBrowserInjection(bool enableB
             return this;
         }
 
+        public NewRelicConfigModifier DisableEventListenerSamplers()
+        {
+            CommonUtils.SetConfigAppSetting(_configFilePath, "NewRelic.EventListenerSamplersEnabled", "false", "urn:newrelic-config");
+            return this;
+        }
+
         public void EnableAuditLog(bool enableAuditLog)
         {
             CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(_configFilePath, new[] { "configuration", "log" }, "auditLog",

diff --git a/...egrationTests/IntegrationTestHelpers/RemoteServiceFixtures/ConsoleDynamicMethodFixture.cs b/...egrationTests/IntegrationTestHelpers/RemoteServiceFixtures/ConsoleDynamicMethodFixture.cs
@@ -95,6 +95,13 @@ public ConsoleDynamicMethodFixtureCore70() : base("net7.0")
         }
     }
 
+    public class ConsoleDynamicMethodFixtureCore80 : ConsoleDynamicMethodFixtureCoreSpecificVersion
+    {
+        public ConsoleDynamicMethodFixtureCore80() : base("net8.0")
+        {
+        }
+    }
+
     /// <summary>
     /// Use this fixture to test against the oldest supported .NET version.
     /// If you need to test against a feature that belongs to a specific .net core version, then consider
@@ -108,39 +115,13 @@ public ConsoleDynamicMethodFixtureCoreOldest()
         }
     }
 
-    /// <summary>
-    /// Use this fixture for High Security Mode tests
-    /// </summary>
-    public class ConsoleDynamicMethodFixtureCoreOldestHSM : ConsoleDynamicMethodFixtureCore60
-    {
-        public override string TestSettingCategory { get { return "HSM"; } }
-        public ConsoleDynamicMethodFixtureCoreOldestHSM()
-        {
-        }
-
-    }
-
-    /// <summary>
-    /// Use this fixture for Configurable Security Policy tests
-    /// </summary>
-    public class ConsoleDynamicMethodFixtureCoreOldestCSP : ConsoleDynamicMethodFixtureCore60
-    {
-        public override string TestSettingCategory { get { return "CSP"; } }
-        public ConsoleDynamicMethodFixtureCoreOldestCSP()
-        {
-        }
-
-    }
-
-
-
     /// <summary>
     /// Use this fixture if you don't care about which .net core version the test application should use.
     /// If you need to test against a feature that belongs to a specific .net core version, then consider
     /// using one of the existing specific version fixtures, or create a new specific version.
     /// When testing newer .net core preview releases, this targetFramework version should be updated.
     /// </summary>
-    public class ConsoleDynamicMethodFixtureCoreLatest : ConsoleDynamicMethodFixtureCore70
+    public class ConsoleDynamicMethodFixtureCoreLatest : ConsoleDynamicMethodFixtureCore80
     {
         public ConsoleDynamicMethodFixtureCoreLatest()
         {
@@ -150,7 +131,7 @@ public ConsoleDynamicMethodFixtureCoreLatest()
     /// <summary>
     /// Use this fixture for High Security Mode tests
     /// </summary>
-    public class ConsoleDynamicMethodFixtureCoreLatestHSM : ConsoleDynamicMethodFixtureCore70
+    public class ConsoleDynamicMethodFixtureCoreLatestHSM : ConsoleDynamicMethodFixtureCore80
     {
         public override string TestSettingCategory { get { return "HSM"; } }
         public ConsoleDynamicMethodFixtureCoreLatestHSM()
@@ -162,7 +143,7 @@ public ConsoleDynamicMethodFixtureCoreLatestHSM()
     /// <summary>
     /// Use this fixture for Configurable Security Policy tests
     /// </summary>
-    public class ConsoleDynamicMethodFixtureCoreLatestCSP : ConsoleDynamicMethodFixtureCore70
+    public class ConsoleDynamicMethodFixtureCoreLatestCSP : ConsoleDynamicMethodFixtureCore80
     {
         public override string TestSettingCategory { get { return "CSP"; } }
         public ConsoleDynamicMethodFixtureCoreLatestCSP()
@@ -180,7 +161,12 @@ public abstract class ConsoleDynamicMethodFixtureCoreSpecificVersion : ConsoleDy
         /// Use this .ctor to specify a specific .net core version to target.
         /// </summary>
         /// <param name="targetFramework">The netcoreapp target use when publishing and running the application. This parameter must match one of the targetFramework values defined in ConsoleMultiFunctionApplicationCore.csproj </param>
-        public ConsoleDynamicMethodFixtureCoreSpecificVersion(string targetFramework) : base(ApplicationDirectoryName, ExecutableName, targetFramework, true, DefaultTimeout)
+        public ConsoleDynamicMethodFixtureCoreSpecificVersion(string targetFramework) :
+            base(ApplicationDirectoryName,
+                ExecutableName,
+                targetFramework,
+                true,
+                DefaultTimeout)
         {
         }
     }
@@ -233,7 +219,14 @@ public ConsoleDynamicMethodFixture(string applicationDirectoryName, string execu
 
         public override void ShutdownRemoteApplication()
         {
-            RemoteApplication.WriteToStandardInput("exit");
+            try
+            {
+                RemoteApplication.WriteToStandardInput("exit");
+            }
+            catch (System.IO.IOException)
+            {
+                // Starting in .NET 8, writes to a closed pipe throw an IO exception. So we'll just eat it and continue.
+            }
 
             base.ShutdownRemoteApplication();
         }

diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs
@@ -79,7 +79,7 @@ public override void CopyToRemote()
         {
             if (IsCoreApp && _publishApp)
             {
-                PublishWithDotnetExe(string.IsNullOrWhiteSpace(_targetFramework) ? "net7.0" : _targetFramework);
+                PublishWithDotnetExe(string.IsNullOrWhiteSpace(_targetFramework) ? "net8.0" : _targetFramework);
                 CopyNewRelicHomeCoreClrDirectoryToRemote();
             }
             else if (_publishApp)

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AgentFeatures/InstrumentationLoaderTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/AgentFeatures/InstrumentationLoaderTests.cs
@@ -77,6 +77,7 @@ public InstrumentationLoaderTestsCore(RemoteServiceFixtures.ConsoleInstrumentati
 
                     configModifier.ForceTransactionTraces();
                     configModifier.SetLogLevel("finest");
+                    configModifier.DisableEventListenerSamplers(); // Required for .NET 8 to pass.
                 },
                 exerciseApplication: () =>
                 {

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Api/CustomSpanNameApiTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Api/CustomSpanNameApiTests.cs
@@ -48,6 +48,7 @@ public CustomSpanNameApiTests(TFixture fixture, ITestOutputHelper output) : base
                     var configPath = fixture.DestinationNewRelicConfigFilePath;
                     var configModifier = new NewRelicConfigModifier(configPath);
                     configModifier.ForceTransactionTraces();
+                    configModifier.DisableEventListenerSamplers(); // Required for .NET 8 to pass.
                 }
             );