Skip to content

Commit dd89e61

Browse files
stevejgordonstevejgordon
committed
Update to .NET 9 SDK and update some build dependencies
1 parent c5abef6 commit dd89e61

File tree

18 files changed

+49
-52
lines changed

18 files changed

+49
-52
lines changed

‎.github/.github.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
44
<IsPackable>False</IsPackable>
55
<ImplicitUsings>disable</ImplicitUsings>
66
</PropertyGroup>
7-
87
</Project>

‎.github/workflows/bootstrap/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ runs:
4545
uses: actions/setup-dotnet@v4
4646
with:
4747
dotnet-version: |
48-
6.0.x
4948
8.0.x
49+
9.0.x
5050
5151
- id: dotnet
5252
shell: bash

‎Directory.Build.props

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
2-
<!-- Root Directory Build Properties -->
3-
<PropertyGroup>
2+
3+
<PropertyGroup Label="Root Directory Build Properties">
44
<LangVersion>latest</LangVersion>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<NoWarn>NU1701,NU1503,NU1608,CS8002,</NoWarn>
@@ -23,9 +23,14 @@
2323
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
2424
<IsPackable>false</IsPackable>
2525
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
26+
<LatestNetVersion>net9.0</LatestNetVersion>
27+
<NetFrameworkMinimumSupportedVersion>net462</NetFrameworkMinimumSupportedVersion>
28+
<NetMinimumSupportedVersion>net8.0</NetMinimumSupportedVersion>
29+
<NetFrameworkMinimumSupportedVersion>net462</NetFrameworkMinimumSupportedVersion>
30+
<NetStandardMinimumSupportedVersion>netstandard2.0</NetStandardMinimumSupportedVersion>
2631
</PropertyGroup>
27-
<!-- MinVer Configuration -->
28-
<PropertyGroup>
32+
33+
<PropertyGroup Label="MinVer Configuration">
2934
<MinVerTagPrefix>v</MinVerTagPrefix>
3035
<MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
3136
<MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>

‎Directory.Packages.props

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5-
65
<ItemGroup>
76
<GlobalPackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
8-
<GlobalPackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all"/>
7+
<GlobalPackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all" />
98
</ItemGroup>
109
<!-- Community Packages -->
1110
<ItemGroup>
@@ -16,20 +15,20 @@
1615
<PackageVersion Include="Azure.Storage.Files.Shares" Version="12.7.0" />
1716
<PackageVersion Include="Azure.Storage.Queues" Version="12.11.0" />
1817
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
19-
<PackageVersion Include="Bullseye" Version="3.5.0" />
18+
<PackageVersion Include="Bullseye" Version="3.8.0" />
2019
<PackageVersion Include="CommandLineParser" Version="2.6.0" />
2120
<PackageVersion Include="Confluent.Kafka" Version="1.9.3" />
2221
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.12.0" />
2322
<PackageVersion Include="Elastic.CommonSchema.BenchmarkDotNetExporter" Version="1.5.0" />
2423
<PackageVersion Include="Elasticsearch.Net" Version="7.17.5" />
2524
<PackageVersion Include="Elasticsearch.Net.VirtualizedCluster" Version="7.6.1" />
2625
<PackageVersion Include="EntityFramework" Version="6.3.0" PrivateAssets="All" />
27-
<PackageVersion Include="Fake.Core.Environment" Version="6.0.0" />
28-
<PackageVersion Include="Fake.Core.SemVer" Version="6.0.0" />
29-
<PackageVersion Include="Fake.DotNet.MsBuild" Version="6.0.0" />
30-
<PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
31-
<PackageVersion Include="Fake.IO.Zip" Version="6.0.0" />
32-
<PackageVersion Include="Fake.Tools.Git" Version="6.0.0" />
26+
<PackageVersion Include="Fake.Core.Environment" Version="6.1.3" />
27+
<PackageVersion Include="Fake.Core.SemVer" Version="6.1.3" />
28+
<PackageVersion Include="Fake.DotNet.MsBuild" Version="6.1.3" />
29+
<PackageVersion Include="Fake.IO.FileSystem" Version="6.1.3" />
30+
<PackageVersion Include="Fake.IO.Zip" Version="6.1.3" />
31+
<PackageVersion Include="Fake.Tools.Git" Version="6.1.3" />
3332
<PackageVersion Include="FluentAssertions" Version="5.6.0" />
3433
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.11.4" />
3534
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
@@ -42,26 +41,27 @@
4241
<PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
4342
<PackageVersion Include="MongoDB.Driver.Core" Version="2.28.0" />
4443
<PackageVersion Include="Moq" Version="4.20.70" />
44+
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
4545
<PackageVersion Include="MySql.Data" Version="8.0.32.1" />
4646
<PackageVersion Include="MySql.Data.EntityFrameworkCore" Version="8.0.22" />
4747
<PackageVersion Include="NEST" Version="7.17.5" />
4848
<PackageVersion Include="NJsonSchema" Version="10.2.2" />
4949
<PackageVersion Include="NLog" Version="4.6.8" />
5050
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
5151
<PackageVersion Include="Nullean.VsTest.Pretty.TestLogger" Version="0.4.0" PrivateAssets="All" />
52-
<PackageVersion Include="Octokit" Version="0.32.0" />
52+
<PackageVersion Include="Octokit" Version="13.0.1" />
5353
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
5454
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
5555
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.13.0" />
56-
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.90"/>
56+
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
5757
<PackageVersion Include="Polly" Version="7.2.1" />
58-
<PackageVersion Include="Proc" Version="0.6.2"/>
58+
<PackageVersion Include="Proc" Version="0.8.2" />
5959
<PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
60-
<PackageVersion Include="RichardSzalay.MockHttp" Version="6.0.0"/>
60+
<PackageVersion Include="RichardSzalay.MockHttp" Version="6.0.0" />
6161
<PackageVersion Include="SQLite.CodeFirst" Version="1.5.3.29" />
6262
<PackageVersion Include="SharpZipLib" Version="1.3.3" />
63-
<PackageVersion Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.5"/>
64-
<PackageVersion Include="SpecFlow.xUnit" Version="3.5.5"/>
63+
<PackageVersion Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.5" />
64+
<PackageVersion Include="SpecFlow.xUnit" Version="3.5.5" />
6565
<PackageVersion Include="StackExchange.Redis" Version="2.7.20" />
6666
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
6767
<PackageVersion Include="Testcontainers.Elasticsearch" Version="3.7.0" />
@@ -77,7 +77,6 @@
7777
<PackageVersion Include="xunit" Version="2.7.0" />
7878
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
7979
</ItemGroup>
80-
8180
<!-- Microsoft/System packages -->
8281
<ItemGroup>
8382
<PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
@@ -98,18 +97,17 @@
9897
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.0.0" />
9998
<PackageVersion Include="Microsoft.Azure.DocumentDB.Core" Version="2.22.0" />
10099
<PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
101-
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.0"/>
100+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.20.0" />
102101
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Core" Version="1.6.0" />
103-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0"/>
104-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.1"/>
102+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
103+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.1" />
105104
<PackageVersion Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
106105
<PackageVersion Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
107106
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.5" />
108107
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
109-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" PrivateAssets="All"/>
108+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" PrivateAssets="All" />
110109
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
111110
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
112-
113111
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
114112
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
115113
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
@@ -118,7 +116,6 @@
118116
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
119117
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
120118
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
121-
122119
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
123120
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
124121
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.1.1" />
@@ -127,14 +124,14 @@
127124
<PackageVersion Include="MicrosoftAspNetCore.Http" Version="2.1.22" />
128125
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
129126
<PackageVersion Include="System.Data.SQLite" Version="1.0.112" />
130-
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6"/>
127+
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
131128
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
132129
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
133130
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
134131
<PackageVersion Include="System.Reflection.Emit" Version="4.3.0" />
135132
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
136133
<PackageVersion Include="System.Reflection.Metadata" Version="5.0.0" />
137-
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0"/>
134+
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
138135
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
139136
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
140137
</ItemGroup>

‎benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
<IsTestProject>false</IsTestProject>
77
</PropertyGroup>
88

‎benchmarks/Elastic.Apm.Profiling/Elastic.Apm.Profiling.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsTestProject>false</IsTestProject>

‎build/build.fsproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<NoWarn>$(NoWarn);NU1701</NoWarn>
66
<IsPackable>false</IsPackable>
@@ -25,21 +25,17 @@
2525
</ItemGroup>
2626
<ItemGroup>
2727
<PackageReference Include="Bullseye" />
28-
<PackageReference Include="System.CommandLine" />
29-
3028
<PackageReference Include="Fake.Core.Environment" />
3129
<PackageReference Include="Fake.Core.SemVer" />
3230
<PackageReference Include="Fake.DotNet.MsBuild" />
3331
<PackageReference Include="Fake.IO.FileSystem" />
3432
<PackageReference Include="Fake.IO.Zip" />
3533
<PackageReference Include="Fake.Tools.Git" />
36-
34+
<PackageReference Include="MSBuild.StructuredLogger" />
3735
<PackageReference Include="Newtonsoft.Json" />
38-
3936
<PackageReference Include="Octokit" />
4037
<PackageReference Include="Proc" />
41-
42-
38+
<PackageReference Include="System.CommandLine" />
4339
</ItemGroup>
4440

4541
</Project>

‎build/scripts/Build.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ module Build =
182182
@ (match logger with None -> [] | Some l -> [l])
183183
@ ["--"; "RunConfiguration.CollectSourceInformation=true"]
184184

185-
DotNet.ExecWithTimeout command (TimeSpan.FromMinutes 30)
185+
DotNet.ExecWithTimeout command (TimeSpan.FromMinutes (30 : int64))
186186

187187
/// Builds the CLR profiler and supporting .NET managed assemblies
188188
let BuildProfiler () =
@@ -225,7 +225,7 @@ module Build =
225225
if isWindows && not isCI then msBuild "Clean" aspNetFullFramework
226226

227227
let CleanProfiler () =
228-
Cargo.ExecWithTimeout ["make"; "clean"; "--disable-check-for-update"] (TimeSpan.FromMinutes 10)
228+
Cargo.ExecWithTimeout ["make"; "clean"; "--disable-check-for-update"] (TimeSpan.FromMinutes (10 : int64))
229229

230230
/// Restores all packages for the solution
231231
let ToolRestore () =

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

‎sample/ApiSamples/ApiSamples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<ItemGroup>

‎sample/Elastic.Apm.Azure.ServiceBus.Sample/Elastic.Apm.Azure.ServiceBus.Sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sample/ElasticsearchSample/ElasticsearchSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
<UserSecretsId>bfb02fcb-6aa5-47e7-9c9e-5fb512708949</UserSecretsId>
77
</PropertyGroup>
88

‎sample/HttpListenerSample/HttpListenerSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sample/Sample.Microsoft.Data.SqlClient/Sample.Microsoft.Data.SqlClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>$(LatestNetVersion)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>

‎sample/StackExchangeRedisSample/StackExchangeRedisSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sample/WebApiExample/WebApiExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎sample/WorkerServiceSample/WorkerServiceSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>dotnet-WorkerServiceSample-4a2affa2-a620-462a-87a0-e6e0f3f309fe</UserSecretsId>

‎src/profiler/Elastic.Apm.Profiler.IntegrationsGenerator/Elastic.Apm.Profiler.IntegrationsGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>$(LatestNetVersion)</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

0 commit comments

Comments
 (0)