Skip to content

Bump Npgsql dependencies to 6.0.0-rc.2 #1702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2021
Merged

Bump Npgsql dependencies to 6.0.0-rc.2 #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,37 @@

<MongoDbVersion>2.8.0</MongoDbVersion>
<DapperVersion>2.0.30</DapperVersion>
<NpgsqlVersion>5.0.5</NpgsqlVersion>
<NpgsqlVersion60>6.0.0-preview4</NpgsqlVersion60>

<NpgsqlVersion50>5.0.5</NpgsqlVersion50>
<NpgsqlVersion60>6.0.0-rc.2</NpgsqlVersion60>

<NpgsqlEntityFrameworkCorePostgreSQLVersion20>2.0.2</NpgsqlEntityFrameworkCorePostgreSQLVersion20>
<NpgsqlEntityFrameworkCorePostgreSQLVersion21>2.1.2</NpgsqlEntityFrameworkCorePostgreSQLVersion21>
<NpgsqlEntityFrameworkCorePostgreSQLVersion22>2.2.4</NpgsqlEntityFrameworkCorePostgreSQLVersion22>
<NpgsqlEntityFrameworkCorePostgreSQLVersion30>3.0.1</NpgsqlEntityFrameworkCorePostgreSQLVersion30>
<NpgsqlEntityFrameworkCorePostgreSQLVersion31>3.1.11</NpgsqlEntityFrameworkCorePostgreSQLVersion31>
<NpgsqlEntityFrameworkCorePostgreSQLVersion50>5.0.6</NpgsqlEntityFrameworkCorePostgreSQLVersion50>
<NpgsqlEntityFrameworkCorePostgreSQLVersion60>6.0.0-preview4</NpgsqlEntityFrameworkCorePostgreSQLVersion60>
<NpgsqlEntityFrameworkCorePostgreSQLVersion60>6.0.0-rc.2</NpgsqlEntityFrameworkCorePostgreSQLVersion60>

<PomeloEntityFrameworkCoreMySqlVersion20>2.0.1</PomeloEntityFrameworkCoreMySqlVersion20>
<PomeloEntityFrameworkCoreMySqlVersion21>2.1.4</PomeloEntityFrameworkCoreMySqlVersion21>
<PomeloEntityFrameworkCoreMySqlVersion22>2.2.0</PomeloEntityFrameworkCoreMySqlVersion22>
<PomeloEntityFrameworkCoreMySqlVersion30>3.0.1</PomeloEntityFrameworkCoreMySqlVersion30>
<PomeloEntityFrameworkCoreMySqlVersion31>3.1.1</PomeloEntityFrameworkCoreMySqlVersion31>
<PomeloEntityFrameworkCoreMySqlVersion50>5.0.2</PomeloEntityFrameworkCoreMySqlVersion50>
<PomeloEntityFrameworkCoreMySqlVersion60>6.0.0-preview.7</PomeloEntityFrameworkCoreMySqlVersion60>

<MicrosoftEntityFrameworkCoreSqlServerVersion30>3.0.3</MicrosoftEntityFrameworkCoreSqlServerVersion30>
<MicrosoftEntityFrameworkCoreSqlServerVersion31>3.1.13</MicrosoftEntityFrameworkCoreSqlServerVersion31>
<MicrosoftEntityFrameworkCoreSqlServerVersion50>5.0.6</MicrosoftEntityFrameworkCoreSqlServerVersion50>
<MicrosoftEntityFrameworkCoreSqlServerVersion60>6.0.0-preview.4.21253.1</MicrosoftEntityFrameworkCoreSqlServerVersion60>
<MicrosoftEntityFrameworkCoreSqlServerVersion50>5.0.10</MicrosoftEntityFrameworkCoreSqlServerVersion50>
<MicrosoftEntityFrameworkCoreSqlServerVersion60>6.0.0-rc.2.21480.5</MicrosoftEntityFrameworkCoreSqlServerVersion60>

<MicrosoftEntityFrameworkCoreSqliteVersion21>2.1.14</MicrosoftEntityFrameworkCoreSqliteVersion21>
<MicrosoftEntityFrameworkCoreSqliteVersion22>2.2.6</MicrosoftEntityFrameworkCoreSqliteVersion22>
<MicrosoftEntityFrameworkCoreSqliteVersion30>3.0.3</MicrosoftEntityFrameworkCoreSqliteVersion30>
<MicrosoftEntityFrameworkCoreSqliteVersion31>3.1.13</MicrosoftEntityFrameworkCoreSqliteVersion31>
<MicrosoftEntityFrameworkCoreSqliteVersion50>5.0.6</MicrosoftEntityFrameworkCoreSqliteVersion50>
<MicrosoftEntityFrameworkCoreSqliteVersion60>6.0.0-preview.4.21253.1</MicrosoftEntityFrameworkCoreSqliteVersion60>
<MicrosoftEntityFrameworkCoreSqliteVersion50>5.0.10</MicrosoftEntityFrameworkCoreSqliteVersion50>
<MicrosoftEntityFrameworkCoreSqliteVersion60>6.0.0-rc.2.21480.5</MicrosoftEntityFrameworkCoreSqliteVersion60>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'netcoreapp2.1'">
Expand Down
20 changes: 9 additions & 11 deletions src/Benchmarks/Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />

<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion21)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion21)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion21)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion21)" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp2.2'">
Expand All @@ -69,8 +69,8 @@
<PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.2" />

<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion22)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion22)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion22)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion22)" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.0'">
Expand All @@ -81,11 +81,10 @@
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="3.0.0-preview3-19122-02" />

<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion30)" />
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion50)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion30)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion30)" />

<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion30)" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
Expand All @@ -96,11 +95,10 @@
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="3.0.0-preview3-19122-02" />

<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion31)" />
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion50)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion31)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion31)" />

<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion31)" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net5.0'">
Expand All @@ -113,10 +111,10 @@
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="5.0.0-preview.6.20303.1" />

<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion50)" />
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion50)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion50)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion50)" />

<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion50)" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
Expand All @@ -130,7 +128,7 @@
<PackageReference Include="Npgsql" Version="$(NpgsqlVersion60)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion60)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion60)" />

<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion60)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Benchmarks/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void ConfigureServices(IServiceCollection services)
#endif
)
#if NET6_0_OR_GREATER
.DisableConcurrencyDetection()
.EnableThreadSafetyChecks(false)
#endif
, 1024);

Expand Down
4 changes: 2 additions & 2 deletions src/BenchmarksApps/Kestrel/PlatformBenchmarks/Data/EfDb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public EfDb(AppSettings appSettings)
#endif
)
#if NET6_0_OR_GREATER
.DisableConcurrencyDetection()
.EnableThreadSafetyChecks(false)
#endif
;

Expand Down Expand Up @@ -61,4 +61,4 @@ public async Task<List<FortuneEf>> LoadFortunesRows()
private static readonly Func<ApplicationDbContext, IAsyncEnumerable<FortuneEf>> _fortunesQuery
= EF.CompileAsyncQuery((ApplicationDbContext context) => context.Fortune);
}
}
}
5 changes: 5 additions & 0 deletions src/BenchmarksApps/Kestrel/PlatformBenchmarks/Data/RawDb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,13 @@ public async Task<List<Fortune>> LoadFortunesRows()

private (NpgsqlCommand readCmd, NpgsqlParameter<int> idParameter) CreateReadCommand(NpgsqlConnection connection)
{
#if NET6_0_OR_GREATER
var cmd = new NpgsqlCommand("SELECT id, randomnumber FROM world WHERE id = $1", connection);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no more sql parsing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep (here's a blog post). I'll do a bit of benchmarking soon to see if this makes a difference - the more parameters/batched commands, and the longer the SQL, the more this should help.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(named parameters are still supported for backwards compat!)

var parameter = new NpgsqlParameter<int> { Value = _random.Next(1, 10001) };
#else
var cmd = new NpgsqlCommand("SELECT id, randomnumber FROM world WHERE id = @Id", connection);
var parameter = new NpgsqlParameter<int>(parameterName: "@Id", value: _random.Next(1, 10001));
#endif

cmd.Parameters.Add(parameter);

Expand Down
4 changes: 2 additions & 2 deletions src/BenchmarksApps/Kestrel/PlatformBenchmarks/PlatformBenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
<PackageReference Include="Npgsql" Version="6.0.0-preview4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-preview4" />
<PackageReference Include="Npgsql" Version="6.0.0-rc.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.2" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
Expand Down