Skip to content

Commit bc8e7cf

Browse files
authored
Update dependencies and clean up some warnings for net11.0 support (aspnet#2137)
* Update dependencies so we can build Benchmarks.csproj for net11.0.
1 parent 5643540 commit bc8e7cf

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

build/dependencies.props

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33
<NpgsqlVersion60>6.0.13</NpgsqlVersion60>
44
<NpgsqlVersion70>7.0.10</NpgsqlVersion70>
55
<NpgsqlVersion80>8.0.7</NpgsqlVersion80>
6-
<NpgsqlVersion90>9.0.3</NpgsqlVersion90>
6+
<NpgsqlVersion90>9.0.4</NpgsqlVersion90>
7+
<NpgsqlVersion100>10.0.0</NpgsqlVersion100>
78

89
<MicrosoftDataSqlClientVersion60>5.2.2</MicrosoftDataSqlClientVersion60>
910
<MicrosoftDataSqlClientVersion70>5.2.2</MicrosoftDataSqlClientVersion70>
1011
<MicrosoftDataSqlClientVersion80>5.2.2</MicrosoftDataSqlClientVersion80>
1112
<MicrosoftDataSqlClientVersion90>5.2.2</MicrosoftDataSqlClientVersion90>
13+
<MicrosoftDataSqlClientVersion100>5.2.2</MicrosoftDataSqlClientVersion100>
1214

1315
<NpgsqlEntityFrameworkCorePostgreSQLVersion60>6.0.29</NpgsqlEntityFrameworkCorePostgreSQLVersion60>
1416
<NpgsqlEntityFrameworkCorePostgreSQLVersion70>7.0.18</NpgsqlEntityFrameworkCorePostgreSQLVersion70>
1517
<NpgsqlEntityFrameworkCorePostgreSQLVersion80>8.0.11</NpgsqlEntityFrameworkCorePostgreSQLVersion80>
1618
<NpgsqlEntityFrameworkCorePostgreSQLVersion90>9.0.4</NpgsqlEntityFrameworkCorePostgreSQLVersion90>
17-
18-
<PomeloEntityFrameworkCoreMySqlVersion60>6.0.3</PomeloEntityFrameworkCoreMySqlVersion60>
19-
<PomeloEntityFrameworkCoreMySqlVersion70>7.0.0</PomeloEntityFrameworkCoreMySqlVersion70>
20-
<PomeloEntityFrameworkCoreMySqlVersion80>8.0.2</PomeloEntityFrameworkCoreMySqlVersion80>
21-
<PomeloEntityFrameworkCoreMySqlVersion90>8.0.2</PomeloEntityFrameworkCoreMySqlVersion90>
19+
<NpgsqlEntityFrameworkCorePostgreSQLVersion100>10.0.0</NpgsqlEntityFrameworkCorePostgreSQLVersion100>
2220

2321
<MicrosoftEntityFrameworkCoreSqlServerVersion60>6.0.35</MicrosoftEntityFrameworkCoreSqlServerVersion60>
2422
<MicrosoftEntityFrameworkCoreSqlServerVersion70>7.0.20</MicrosoftEntityFrameworkCoreSqlServerVersion70>
2523
<MicrosoftEntityFrameworkCoreSqlServerVersion80>8.0.10</MicrosoftEntityFrameworkCoreSqlServerVersion80>
26-
<MicrosoftEntityFrameworkCoreSqlServerVersion90>9.0.0-rc.2.24474.1</MicrosoftEntityFrameworkCoreSqlServerVersion90>
24+
<MicrosoftEntityFrameworkCoreSqlServerVersion90>9.0.11</MicrosoftEntityFrameworkCoreSqlServerVersion90>
25+
<MicrosoftEntityFrameworkCoreSqlServerVersion100>10.0.1</MicrosoftEntityFrameworkCoreSqlServerVersion100>
2726

2827
<MicrosoftEntityFrameworkCoreSqliteVersion60>6.0.35</MicrosoftEntityFrameworkCoreSqliteVersion60>
2928
<MicrosoftEntityFrameworkCoreSqliteVersion70>7.0.20</MicrosoftEntityFrameworkCoreSqliteVersion70>
3029
<MicrosoftEntityFrameworkCoreSqliteVersion80>8.0.10</MicrosoftEntityFrameworkCoreSqliteVersion80>
31-
<MicrosoftEntityFrameworkCoreSqliteVersion90>9.0.0-rc.2.24474.1</MicrosoftEntityFrameworkCoreSqliteVersion90>
30+
<MicrosoftEntityFrameworkCoreSqliteVersion90>9.0.11</MicrosoftEntityFrameworkCoreSqliteVersion90>
31+
<MicrosoftEntityFrameworkCoreSqliteVersion100>10.0.1</MicrosoftEntityFrameworkCoreSqliteVersion100>
3232

3333
<!--
3434
Don't follow ASPNETCORE version for this package since it only exists as servicing builds
@@ -40,6 +40,7 @@
4040
<MicrosoftIISTestingVersion80>8.0.0-*</MicrosoftIISTestingVersion80>
4141
<MicrosoftIISTestingVersion90>9.0.0-*</MicrosoftIISTestingVersion90>
4242
<MicrosoftIISTestingVersion100>10.0.0-*</MicrosoftIISTestingVersion100>
43+
<MicrosoftIISTestingVersion110>11.0.0-*</MicrosoftIISTestingVersion110>
4344

4445
<DapperVersion>2.1.66</DapperVersion>
4546
<DapperAotVersion>1.0.48</DapperAotVersion>

src/Benchmarks/Benchmarks.csproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftIISTestingVersion80)" />
5858
</ItemGroup>
5959

60-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0'">
60+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
6161
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion90)" />
6262
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion90)" />
6363
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion90)" />
@@ -66,6 +66,15 @@
6666
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftIISTestingVersion90)" />
6767
</ItemGroup>
6868

69+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net11.0'">
70+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion100)" />
71+
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion100)" />
72+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion100)" />
73+
<PackageReference Include="Microsoft.Data.SqlClient" Version="$(MicrosoftDataSqlClientVersion100)" />
74+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion100)" />
75+
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftIISTestingVersion100)" />
76+
</ItemGroup>
77+
6978
<ItemGroup>
7079
<PackageReference Include="RazorSlices" Version="$(RazorSlicesVersion)" />
7180
</ItemGroup>

0 commit comments

Comments
 (0)