Skip to content

Commit 6b7abf5

Browse files
MpdreamzMpdreamz
authored
Migrate to dotnet 10 (#181)
1 parent f868b89 commit 6b7abf5

38 files changed

+232
-316
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ resharper_redundant_argument_default_value_highlighting=do_not_show
135135
resharper_redundant_type_arguments_of_method_highlighting=do_not_show
136136
resharper_switch_expression_handles_some_known_enum_values_with_exception_in_default_highlighting=error
137137

138+
resharper_arrange_type_member_modifiers_highlighting=none;
139+
140+
[src/api/Elastic.Transport/Components/Serialization/**.cs]
141+
dotnet_diagnostic.IL3050.severity = none
142+
dotnet_diagnostic.IL2026.severity = none
143+
138144
[Jenkinsfile]
139145
indent_style = space
140146
indent_size = 2

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: dotnet publish examples/transport-aot-example
4242

4343
- name: Invoke AOT
44-
run: ./examples/transport-aot-example/bin/Release/net8.0/${{ matrix.os.folder }}/${{ matrix.os.binary }}
44+
run: .artifacts/publish/transport-aot-example/release/${{ matrix.os.binary }}
4545

4646
build:
4747
runs-on: ubuntu-latest

‎.github/workflows/test-windows.yml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040
with:
4141
fetch-depth: 1
4242

@@ -55,22 +55,12 @@ jobs:
5555
${{ runner.os }}-nuget
5656
5757
- name: Setup dotnet
58-
uses: actions/setup-dotnet@v4
58+
uses: actions/setup-dotnet@v5
5959
with:
6060
global-json-file: ./global.json
6161

6262
- run: ./build.bat build -s true
6363
name: Build
6464

6565
- run: ./build.bat test -s true
66-
name: Test
67-
68-
- name: Test Results
69-
if: success() || failure()
70-
uses: mikepenz/action-junit-report@v4
71-
with:
72-
report_paths: 'build/output/junit-*.xml'
73-
github_token: ${{ secrets.GITHUB_TOKEN }}
74-
fail_on_failure: true
75-
require_tests: true
76-
check_name: Test Results
66+
name: Test

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@ src/packages/
8080
BenchmarkDotNet.Artifacts
8181
*.received.*
8282

83-
/.ionide/symbolCache.db
83+
/.ionide/symbolCache.db
84+
.artifacts

‎Directory.Build.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@
44

55
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))</SolutionRoot>
66

7-
<MinVerDefaultPreReleasePhase>canary</MinVerDefaultPreReleasePhase>
8-
<MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>
7+
<MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
8+
<MinVerMinimumMajorMinor>0.2</MinVerMinimumMajorMinor>
99

1010
<LangVersion>latest</LangVersion>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<IsPackable>False</IsPackable>
1313
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>$(SolutionRoot)\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
16+
<UseArtifactsOutput>true</UseArtifactsOutput>
17+
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.sh))</SolutionRoot>
18+
<ArtifactsPath>$(MSBuildThisFileDirectory).artifacts</ArtifactsPath>
1619
</PropertyGroup>
1720
<PropertyGroup Condition="">
1821
</PropertyGroup>
1922
<ItemGroup>
20-
<PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="all" />
23+
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
2124
<PackageReference Condition="'$(TargetFramework)' != 'net462'" Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3">
2225
<PrivateAssets>all</PrivateAssets>
2326
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎Elastic.Transport.sln‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎Elastic.Transport.slnx‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Solution>
2+
<Folder Name="/benchmarks/">
3+
<Project Path="benchmarks/Elastic.Transport.Benchmarks/Elastic.Transport.Benchmarks.csproj" />
4+
<Project Path="benchmarks/Elastic.Transport.Profiling/Elastic.Transport.Profiling.csproj" />
5+
</Folder>
6+
<Folder Name="/build/">
7+
<File Path=".editorconfig" />
8+
<File Path=".gitattributes" />
9+
<File Path=".github/workflows/ci.yml" />
10+
<File Path=".github/workflows/test-windows.yml" />
11+
<File Path=".gitignore" />
12+
<File Path="build.bat" />
13+
<File Path="build.sh" />
14+
<File Path="Directory.Build.props" />
15+
<File Path="global.json" />
16+
<File Path="license.txt" />
17+
<File Path="README.md" />
18+
<Project Path="build/scripts/scripts.fsproj" />
19+
</Folder>
20+
<Folder Name="/examples/">
21+
<Project Path="examples/transport-aot-example/transport-aot-example.csproj" />
22+
</Folder>
23+
<Folder Name="/src/">
24+
<File Path="src/Directory.Build.props" />
25+
<Project Path="Playground/Playground.csproj" />
26+
<Project Path="src/Elastic.Transport.VirtualizedCluster/Elastic.Transport.VirtualizedCluster.csproj" />
27+
<Project Path="src/Elastic.Transport/Elastic.Transport.csproj" />
28+
</Folder>
29+
<Folder Name="/tests/">
30+
<Project Path="tests/Elastic.Elasticsearch.IntegrationTests/Elastic.Elasticsearch.IntegrationTests.csproj" />
31+
<Project Path="tests/Elastic.Transport.IntegrationTests/Elastic.Transport.IntegrationTests.csproj" />
32+
<Project Path="tests/Elastic.Transport.Tests.Shared/Elastic.Transport.Tests.Shared.csproj" />
33+
<Project Path="tests/Elastic.Transport.Tests/Elastic.Transport.Tests.csproj" />
34+
</Folder>
35+
</Solution>

‎Playground/Playground.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>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<PublishAot>true</PublishAot>

‎benchmarks/Elastic.Transport.Benchmarks/Elastic.Transport.Benchmarks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<IsPackable>false</IsPackable>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
10+
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎benchmarks/Elastic.Transport.Benchmarks/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
using BenchmarkDotNet.Columns;
65
using BenchmarkDotNet.Configs;
76
using BenchmarkDotNet.Diagnosers;
87
using BenchmarkDotNet.Reports;
98
using BenchmarkDotNet.Running;
9+
using Perfolizer.Metrology;
1010

1111
namespace Elastic.Transport.Benchmarks
1212
{

0 commit comments

Comments
 (0)