Skip to content

Commit 7fda0c6

Browse files
MpdreamzMpdreamz
authored
Migrate to .NET 10 (#2195)
* Migrate to .NET 10 * Update lambda.DockerFile * depend on higher fedora package repo * fedora 41 * attempt script install of dotnet 10 on aws2023 * actually call install.sh * add tar/find * update package name * invoke dotnet-install.sh * update PATH * DOTNET_SYSTEM_GLOBALIZATION_INVARIANT * GeneratedRegex for CutOffGitExtensions does not need to specify cultureinfo * clean up more generatedregex's defaulting to invariant culture * clean up more generatedregex's defaulting to invariant culture * update index-publisher lambda as well * fix packages after updating
1 parent 7dee006 commit 7fda0c6

File tree

60 files changed

+137
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+137
-132
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ dotnet_diagnostic.IDE0305.severity = none
249249
# CS8509 already warns
250250
dotnet_diagnostic.IDE0072.severity = none
251251

252+
dotnet_diagnostic.CA1873.severity = suggestion
253+
252254
[src/api/Elastic.Documentation.Api.Lambda/**.cs]
253255
dotnet_diagnostic.IL3050.severity = none
254256
dotnet_diagnostic.IL2026.severity = none

‎.github/.github.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<IsPackable>False</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1515
<MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
1616
<MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>
17-
<LangVersion>latest</LangVersion>
17+
<LangVersion>preview</LangVersion>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1919
<UseArtifactsOutput>true</UseArtifactsOutput>
2020
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.sh))</SolutionRoot>

‎Directory.Packages.props‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,24 @@
2020
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
2121
<PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
2222
<PackageVersion Include="AngleSharp" Version="1.1.2" />
23-
<PackageVersion Include="Aspire.Hosting" Version="9.5.2" />
24-
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.4.2" />
23+
<PackageVersion Include="Aspire.Hosting" Version="13.0.0" />
24+
<PackageVersion Include="Aspire.Hosting.Testing" Version="13.0.0" />
2525
<PackageVersion Include="AWSSDK.Core" Version="4.0.3" />
2626
<PackageVersion Include="AWSSDK.SQS" Version="4.0.2.2" />
2727
<PackageVersion Include="AWSSDK.S3" Version="4.0.7.14" />
2828
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.7.0" />
29+
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.0.0" />
3030
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
3131
<PackageVersion Include="Generator.Equals" Version="3.2.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
32-
<PackageVersion Include="KubernetesClient" Version="17.0.14" />
32+
<PackageVersion Include="KubernetesClient" Version="18.0.5" />
3333
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
3434
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.4" />
3535
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
3636
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.16.3" />
3737
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
3838
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
39-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
40-
<PackageVersion Include="Microsoft.OpenApi" Version="2.0.0-preview9" />
41-
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
39+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
40+
<PackageVersion Include="Microsoft.OpenApi" Version="3.0.0" />
4241
<PackageVersion Include="TUnit" Version="0.25.21" />
4342
<PackageVersion Include="xunit.v3.extensibility.core" Version="2.0.2" />
4443
</ItemGroup>
@@ -49,17 +48,17 @@
4948
<PackageVersion Include="Proc.Fs" Version="0.9.1" />
5049
<PackageVersion Include="Fake.Tools.Git" Version="6.1.3" />
5150
<PackageVersion Include="Fake.IO.Zip" Version="6.1.3" />
52-
<PackageVersion Include="FSharp.Core" Version="9.0.202" />
51+
<PackageVersion Include="FSharp.Core" Version="10.0.100" />
5352
</ItemGroup>
5453
<ItemGroup>
55-
<PackageVersion Include="ConsoleAppFramework" Version="5.7.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
54+
<PackageVersion Include="ConsoleAppFramework" Version="5.7.3" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5655
<PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.7.2" />
5756
<PackageVersion Include="Crayon" Version="2.0.69" />
5857
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
5958
<PackageVersion Include="Errata" Version="0.14.0" />
6059
<PackageVersion Include="Github.Actions.Core" Version="9.0.0" />
61-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
62-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
60+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
61+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
6362
<PackageVersion Include="Markdig" Version="0.41.1" />
6463
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
6564
<PackageVersion Include="Proc" Version="0.9.1" />
@@ -69,16 +68,16 @@
6968
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
7069
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
7170
<PackageVersion Include="System.IO.Abstractions" Version="22.0.16" />
72-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
71+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
7372
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
7473
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
7574
<PackageVersion Include="Westwind.AspNetCore.LiveReload" Version="0.5.2" />
7675
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
7776
</ItemGroup>
7877
<!-- Test packages -->
7978
<ItemGroup>
80-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
81-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
79+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
80+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
8281
<PackageVersion Include="OpenTelemetry" Version="1.13.1" />
8382
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
8483
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
@@ -87,14 +86,14 @@
8786
</ItemGroup>
8887
<!-- Test packages -->
8988
<ItemGroup>
90-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.2" />
89+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
9190
<PackageVersion Include="AngleSharp.Diffing" Version="1.1.0" />
9291
<PackageVersion Include="DiffPlex" Version="1.7.2" />
9392
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
9493
<PackageVersion Include="FsUnit.xUnit" Version="7.0.1" />
9594
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
9695
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
97-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
96+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
9897
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.13.0" />
9998
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.16" />
10099
<PackageVersion Include="Unquote" Version="7.0.1" />

‎aspire/aspire.csproj‎

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

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net9.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<UserSecretsId>72f50f33-6fb9-4d08-bff3-39568fe370b3</UserSecretsId>

‎build/build.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<NoWarn>$(NoWarn);NU1701</NoWarn>
66
<IsPackable>false</IsPackable>

‎docs/docs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<IsPackable>False</IsPackable>
55
</PropertyGroup>
66

‎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": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

‎src/Elastic.ApiExplorer/ApiRenderContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Elastic.Documentation.Navigation;
88
using Elastic.Documentation.Site.FileProviders;
99
using Elastic.Documentation.Site.Navigation;
10-
using Microsoft.OpenApi.Models;
10+
using Microsoft.OpenApi;
1111

1212
namespace Elastic.ApiExplorer;
1313

‎src/Elastic.ApiExplorer/Elastic.ApiExplorer.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<InvariantGlobalization>true</InvariantGlobalization>
@@ -15,7 +15,6 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.OpenApi"/>
1717
<PackageReference Include="RazorSlices"/>
18-
<PackageReference Include="System.Text.Json"/>
1918
<PackageReference Include="Utf8StreamReader"/>
2019
</ItemGroup>
2120

0 commit comments

Comments
 (0)