Skip to content

Commit a6968e6

Browse files
committed
First steps for .net 10 preview support.
1 parent 0679eb6 commit a6968e6

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ jobs:
227227
Copy-Item test/EFCore.MySql.FunctionalTests/config.json.example test/EFCore.MySql.FunctionalTests/config.json
228228
Copy-Item test/EFCore.MySql.IntegrationTests/appsettings.ci.json test/EFCore.MySql.IntegrationTests/appsettings.json
229229
Copy-Item test/EFCore.MySql.IntegrationTests/config.json.example test/EFCore.MySql.IntegrationTests/config.json
230+
- name: Build Solution
231+
shell: pwsh
232+
run: |
233+
dotnet build -c Debug
234+
dotnet build -c Release
230235
- name: Setup Integration Tests
231236
shell: pwsh
232237
run: |

Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
</PropertyGroup>
3030

3131
<PropertyGroup>
32-
<PomeloTargetFramework>net9.0</PomeloTargetFramework>
33-
<PomeloTestTargetFramework>net9.0</PomeloTestTargetFramework>
34-
<EfCoreTargetFramework>net9.0</EfCoreTargetFramework>
35-
<EfCoreTestTargetFramework>net9.0</EfCoreTestTargetFramework>
36-
<MySqlConnectorTargetFramework>net9.0</MySqlConnectorTargetFramework>
37-
<MySqlConnectorDependencyInjectionTargetFramework>net9.0</MySqlConnectorDependencyInjectionTargetFramework>
32+
<PomeloTargetFramework>net10.0</PomeloTargetFramework>
33+
<PomeloTestTargetFramework>net10.0</PomeloTestTargetFramework>
34+
<EfCoreTargetFramework>net10.0</EfCoreTargetFramework>
35+
<EfCoreTestTargetFramework>net10.0</EfCoreTestTargetFramework>
36+
<MySqlConnectorTargetFramework>net10.0</MySqlConnectorTargetFramework>
37+
<MySqlConnectorDependencyInjectionTargetFramework>net10.0</MySqlConnectorDependencyInjectionTargetFramework>
3838
</PropertyGroup>
3939

4040
<PropertyGroup>

Directory.Packages.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Common Versions">
3-
<EFCoreVersion>[9.0.8,9.0.999]</EFCoreVersion>
3+
<EFCoreVersion>[10.0.0-preview.7.25380.108,10.0.100]</EFCoreVersion>
44
</PropertyGroup>
55
<ItemGroup Label="Dependencies">
66
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
@@ -12,19 +12,19 @@
1212
<PackageVersion Include="NetTopologySuite" Version="2.6.0" />
1313
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1414
<PackageVersion Include="Castle.Core" Version="5.1.1" />
15-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
16-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.8" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(EFCoreVersion)" />
16+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(EFCoreVersion)" />
1717
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
1818
<!--<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />-->
1919
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
20-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.8" />
21-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.8" />
22-
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.8" />
23-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
20+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(EFCoreVersion)" />
21+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(EFCoreVersion)" />
22+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(EFCoreVersion)" />
23+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(EFCoreVersion)" />
2424
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(EFCoreVersion)" />
2525
<!-- CHECK: used? -->
26-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
27-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.8" />
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(EFCoreVersion)" />
27+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(EFCoreVersion)" />
2828
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
2929
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3030
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -48,7 +48,7 @@
4848
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
4949
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
5050
<!-- Needed when using EFCore.Design assembly from local EF Core repository. -->
51-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.10.0" />
51+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
5252
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
5353
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0" />
5454
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />

dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "9.0.0",
6+
"version": "10.0.0-preview.3.25171.6",
77
"commands": [
88
"dotnet-ef"
99
]

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
4-
"allowPrerelease": false,
3+
"version": "10.0.100-preview.7.25380.108",
4+
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}
77
}

0 commit comments

Comments
 (0)