Update to .NET 9 SDK and update some dependencies

elastic · Nov 19, 2024 · 90b51b5 · 90b51b5
1 parent a368bfc
commit 90b51b5
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 52 deletions.
diff --git a/.github/.github.csproj b/.github/.github.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <IsPackable>False</IsPackable>
     <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-
 </Project>
diff --git a/.github/workflows/bootstrap/action.yml b/.github/workflows/bootstrap/action.yml
@@ -45,8 +45,8 @@ runs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
+          9.0.x
 
     - id: dotnet
       shell: bash

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
-  <!-- Root Directory Build Properties -->
-  <PropertyGroup>
+
+  <PropertyGroup Label="Root Directory Build Properties">
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>NU1701,NU1503,NU1608,CS8002,</NoWarn>
@@ -23,9 +23,14 @@
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <IsPackable>false</IsPackable>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <LatestNetVersion>net9.0</LatestNetVersion>
+    <NetFrameworkMinimumSupportedVersion>net462</NetFrameworkMinimumSupportedVersion>
+    <NetMinimumSupportedVersion>net8.0</NetMinimumSupportedVersion>
+    <NetFrameworkMinimumSupportedVersion>net462</NetFrameworkMinimumSupportedVersion>
+    <NetStandardMinimumSupportedVersion>netstandard2.0</NetStandardMinimumSupportedVersion>
   </PropertyGroup>
-  <!-- MinVer Configuration -->
-  <PropertyGroup>
+
+  <PropertyGroup Label="MinVer Configuration">
     <MinVerTagPrefix>v</MinVerTagPrefix>
     <MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
     <MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,10 +2,9 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-
   <ItemGroup>
     <GlobalPackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
-    <GlobalPackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all"/>
+    <GlobalPackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all" />
   </ItemGroup>
   <!-- Community Packages -->
   <ItemGroup>
@@ -16,20 +15,20 @@
     <PackageVersion Include="Azure.Storage.Files.Shares" Version="12.7.0" />
     <PackageVersion Include="Azure.Storage.Queues" Version="12.11.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
-    <PackageVersion Include="Bullseye" Version="3.5.0" />
+    <PackageVersion Include="Bullseye" Version="3.8.0" />
     <PackageVersion Include="CommandLineParser" Version="2.6.0" />
     <PackageVersion Include="Confluent.Kafka" Version="1.9.3" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.12.0" />
     <PackageVersion Include="Elastic.CommonSchema.BenchmarkDotNetExporter" Version="1.5.0" />
     <PackageVersion Include="Elasticsearch.Net" Version="7.17.5" />
     <PackageVersion Include="Elasticsearch.Net.VirtualizedCluster" Version="7.6.1" />
     <PackageVersion Include="EntityFramework" Version="6.3.0" PrivateAssets="All" />
-    <PackageVersion Include="Fake.Core.Environment" Version="6.0.0" />
-    <PackageVersion Include="Fake.Core.SemVer" Version="6.0.0" />
-    <PackageVersion Include="Fake.DotNet.MsBuild" Version="6.0.0" />
-    <PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
-    <PackageVersion Include="Fake.IO.Zip" Version="6.0.0" />
-    <PackageVersion Include="Fake.Tools.Git" Version="6.0.0" />
+    <PackageVersion Include="Fake.Core.Environment" Version="6.1.3" />
+    <PackageVersion Include="Fake.Core.SemVer" Version="6.1.3" />
+    <PackageVersion Include="Fake.DotNet.MsBuild" Version="6.1.3" />
+    <PackageVersion Include="Fake.IO.FileSystem" Version="6.1.3" />
+    <PackageVersion Include="Fake.IO.Zip" Version="6.1.3" />
+    <PackageVersion Include="Fake.Tools.Git" Version="6.1.3" />
     <PackageVersion Include="FluentAssertions" Version="5.6.0" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
@@ -42,26 +41,27 @@
     <PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
     <PackageVersion Include="MongoDB.Driver.Core" Version="2.28.0" />
     <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
     <PackageVersion Include="MySql.Data" Version="8.0.32.1" />
     <PackageVersion Include="MySql.Data.EntityFrameworkCore" Version="8.0.22" />
     <PackageVersion Include="NEST" Version="7.17.5" />
     <PackageVersion Include="NJsonSchema" Version="10.2.2" />
     <PackageVersion Include="NLog" Version="4.6.8" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Nullean.VsTest.Pretty.TestLogger" Version="0.4.0" PrivateAssets="All" />
-    <PackageVersion Include="Octokit" Version="0.32.0" />
+    <PackageVersion Include="Octokit" Version="13.0.1" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
     <PackageVersion Include="Oracle.ManagedDataAccess" Version="21.13.0" />
-    <PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.90"/>
+    <PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
     <PackageVersion Include="Polly" Version="7.2.1" />
-    <PackageVersion Include="Proc" Version="0.6.2"/>
+    <PackageVersion Include="Proc" Version="0.8.2" />
     <PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
-    <PackageVersion Include="RichardSzalay.MockHttp" Version="6.0.0"/>
+    <PackageVersion Include="RichardSzalay.MockHttp" Version="6.0.0" />
     <PackageVersion Include="SQLite.CodeFirst" Version="1.5.3.29" />
     <PackageVersion Include="SharpZipLib" Version="1.3.3" />
-    <PackageVersion Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.5"/>
-    <PackageVersion Include="SpecFlow.xUnit" Version="3.5.5"/>
+    <PackageVersion Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.5" />
+    <PackageVersion Include="SpecFlow.xUnit" Version="3.5.5" />
     <PackageVersion Include="StackExchange.Redis" Version="2.7.20" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageVersion Include="Testcontainers.Elasticsearch" Version="3.7.0" />
@@ -77,7 +77,6 @@
     <PackageVersion Include="xunit" Version="2.7.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
-
   <!-- Microsoft/System packages -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
@@ -98,18 +97,17 @@
     <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.0.0" />
     <PackageVersion Include="Microsoft.Azure.DocumentDB.Core" Version="2.22.0" />
     <PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.0"/>
+    <PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.0" />
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Core" Version="1.6.0" />
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0"/>
-    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.1"/>
+    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.1" />
     <PackageVersion Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
     <PackageVersion Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" PrivateAssets="All"/>
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" PrivateAssets="All" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
-
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
@@ -118,7 +116,6 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-
     <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.1.1" />
@@ -127,14 +124,14 @@
     <PackageVersion Include="MicrosoftAspNetCore.Http" Version="2.1.22" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
     <PackageVersion Include="System.Data.SQLite" Version="1.0.112" />
-    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6"/>
+    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
     <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
     <PackageVersion Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
     <PackageVersion Include="System.Reflection.Metadata" Version="5.0.0" />
-    <PackageVersion Include="System.Runtime.Loader" Version="4.3.0"/>
+    <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>

diff --git a/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj b/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 

diff --git a/benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj b/benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsTestProject>false</IsTestProject>

diff --git a/build/build.fsproj b/build/build.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
     <IsPackable>false</IsPackable>
@@ -25,21 +25,17 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bullseye" />
-    <PackageReference Include="System.CommandLine" />
-
     <PackageReference Include="Fake.Core.Environment" />
     <PackageReference Include="Fake.Core.SemVer" />
     <PackageReference Include="Fake.DotNet.MsBuild" />
     <PackageReference Include="Fake.IO.FileSystem" />
     <PackageReference Include="Fake.IO.Zip" />
     <PackageReference Include="Fake.Tools.Git" />
-
+    <PackageReference Include="MSBuild.StructuredLogger" />
     <PackageReference Include="Newtonsoft.Json" />
-
     <PackageReference Include="Octokit" />
     <PackageReference Include="Proc" />
-
-
+    <PackageReference Include="System.CommandLine" />
   </ItemGroup>
 
 </Project>
diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs
@@ -182,7 +182,7 @@ module Build =
             @ (match logger with None -> [] | Some l -> [l])
             @ ["--"; "RunConfiguration.CollectSourceInformation=true"]
 
-        DotNet.ExecWithTimeout command (TimeSpan.FromMinutes 30)
+        DotNet.ExecWithTimeout command (TimeSpan.FromMinutes (30 : int64))
 
     /// Builds the CLR profiler and supporting .NET managed assemblies
     let BuildProfiler () =
@@ -225,7 +225,7 @@ module Build =
         if isWindows && not isCI then msBuild "Clean" aspNetFullFramework
 
     let CleanProfiler () =
-        Cargo.ExecWithTimeout ["make"; "clean"; "--disable-check-for-update"] (TimeSpan.FromMinutes 10)
+        Cargo.ExecWithTimeout ["make"; "clean"; "--disable-check-for-update"] (TimeSpan.FromMinutes (10 : int64))
 
     /// Restores all packages for the solution
     let ToolRestore () =

diff --git a/docs/docs.csproj b/docs/docs.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
 

diff --git a/sample/ApiSamples/ApiSamples.csproj b/sample/ApiSamples/ApiSamples.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj b/sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
       <OutputType>Exe</OutputType>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>$(LatestNetVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/sample/ElasticsearchSample/ElasticsearchSample.csproj b/sample/ElasticsearchSample/ElasticsearchSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <UserSecretsId>bfb02fcb-6aa5-47e7-9c9e-5fb512708949</UserSecretsId>
   </PropertyGroup>
 

diff --git a/sample/HttpListenerSample/HttpListenerSample.csproj b/sample/HttpListenerSample/HttpListenerSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj b/sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>$(LatestNetVersion)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj b/sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(LatestNetVersion)</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/sample/WebApiExample/WebApiExample.csproj b/sample/WebApiExample/WebApiExample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>$(LatestNetVersion)</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>

diff --git a/sample/WorkerServiceSample/WorkerServiceSample.csproj b/sample/WorkerServiceSample/WorkerServiceSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>dotnet-WorkerServiceSample-4a2affa2-a620-462a-87a0-e6e0f3f309fe</UserSecretsId>

diff --git a/...stic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj b/...stic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(LatestNetVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>