Skip to content

Commit f1ee16d

Browse files
sebastienrossebastienros
authored
Merge branch 'main' into sebros/updates
2 parents c315d63 + 87c93b1 commit f1ee16d

27 files changed

Lines changed: 474 additions & 484 deletions

‎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>

‎build/singlefile-scenarios.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ parameters:
3939
- displayName: AOT
4040
# workaround https://github.com/dotnet/runtime/issues/81382 by explicitly referencing a Microsoft.DotNet.ILCompiler version
4141
arguments: --application.buildArguments \"/p:PublishAot=true /p:StripSymbols=true\" --property mode=Aot --application.packageReferences \"Microsoft.DotNet.ILCompiler=$(MicrosoftNETCoreAppPackageVersion)\"
42+
- displayName: R2RComposite-Windows
43+
arguments: --application.buildArguments \"/p:PublishReadyToRun=true /p:PublishReadyToRunComposite=true /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x64\" --property mode=R2RComposite --property rid=win-x64 --application.options.requiredOperatingSystem windows
44+
- displayName: R2RComposite-Linux
45+
arguments: --application.buildArguments \"/p:PublishReadyToRun=true /p:PublishReadyToRunComposite=true /p:PublishSingleFile=true /p:RuntimeIdentifier=linux-x64\" --property mode=R2RComposite --property rid=linux-x64 --application.options.requiredOperatingSystem linux
4246

4347
steps:
4448
- ${{ each s in parameters.scenarios }}:

‎build/sslstream-scenarios.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ steps:
124124
useDataContractSerializer: "false"
125125
messageBody: |
126126
{
127-
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 )",
127+
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 ) && false",
128128
"name": "crank",
129129
"args": [ "${{ parameters.tfm }} --client.options.collectCounters true --command-line-property --table SystemNet_TlsBenchmarks --sql SQL_CONNECTION_STRING --cert-tenant-id SQL_SERVER_TENANTID --cert-client-id SQL_SERVER_CLIENTID --cert-path SQL_SERVER_CERT_PATH --cert-sni --chart --session $(session) --description \"${{ t.displayName }} ${{ version.displayName }} ${{ s.displayName }} ${{ c.displayName }} ${{ res.displayName }} $(System.JobDisplayName)\" ${{ parameters.arguments }} --no-metadata --no-measurements ${{ t.arguments }} ${{ s.arguments }} ${{ version.arguments }} ${{ res.arguments }} ${{ c.arguments }}" ]
130130
}
@@ -145,7 +145,7 @@ steps:
145145
useDataContractSerializer: "false"
146146
messageBody: |
147147
{
148-
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 )",
148+
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 ) && false",
149149
"name": "crank",
150150
"args": [ "${{ parameters.tfm }} --client.options.collectCounters true --command-line-property --table SystemNet_TlsBenchmarks --sql SQL_CONNECTION_STRING --cert-tenant-id SQL_SERVER_TENANTID --cert-client-id SQL_SERVER_CLIENTID --cert-path SQL_SERVER_CERT_PATH --cert-sni --chart --session $(session) --description \"${{ t.displayName }} ${{ s.displayName }} ${{ c.displayName }} $(System.JobDisplayName)\" ${{ parameters.arguments }} --no-metadata --no-measurements ${{ t.arguments }} ${{ s.arguments }} ${{ c.arguments }}" ]
151151
}
@@ -169,7 +169,7 @@ steps:
169169
useDataContractSerializer: "false"
170170
messageBody: |
171171
{
172-
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 )",
172+
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 ) && false",
173173
"name": "crank",
174174
"args": [ "${{ parameters.tfm }} --client.options.collectCounters true --command-line-property --table SystemNet_TlsBenchmarks --sql SQL_CONNECTION_STRING --cert-tenant-id SQL_SERVER_TENANTID --cert-client-id SQL_SERVER_CLIENTID --cert-path SQL_SERVER_CERT_PATH --cert-sni --chart --session $(session) --description \"${{ t.displayName }} ${{ version.displayName }} ${{ s.displayName }} ${{ sendbuf.displayName }} ${{ recvbuf.displayName }} ${{ c.displayName }} $(System.JobDisplayName)\" ${{ parameters.arguments }} --no-metadata --no-measurements ${{ t.arguments }} ${{ s.arguments }} ${{ version.arguments }} ${{ sendbuf.arguments }} ${{ recvbuf.arguments }} ${{ c.arguments }}" ]
175175
}
@@ -192,7 +192,7 @@ steps:
192192
useDataContractSerializer: "false"
193193
messageBody: |
194194
{
195-
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 )",
195+
"condition": "(${{ parameters.condition }}) && (Math.round(Date.now() / 43200000) % 2 == 0 ) && false",
196196
"name": "crank",
197197
"args": [ "${{ parameters.tfm }} --client.options.collectCounters true --command-line-property --table SystemNet_TlsBenchmarks --sql SQL_CONNECTION_STRING --cert-tenant-id SQL_SERVER_TENANTID --cert-client-id SQL_SERVER_CLIENTID --cert-path SQL_SERVER_CERT_PATH --cert-sni --chart --session $(session) --description \"${{ t.displayName }} ${{ s.displayName }} ${{ sendbuf.displayName }} ${{ recvbuf.displayName }} ${{ c.displayName }} $(System.JobDisplayName)\" ${{ parameters.arguments }} --no-metadata --no-measurements ${{ t.arguments }} ${{ s.arguments }} ${{ sendbuf.arguments }} ${{ recvbuf.arguments }} ${{ c.arguments }}" ]
198198
}

‎scenarios/blazor.benchmarks.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
repository: https://github.com/aspnet/benchmarks.git
1515
branchOrCommit: main
1616
project: src/BenchmarksApps/BlazorBlazingPizza/BlazingPizza.Server.csproj
17-
arguments: "--urls {{serverScheme}}://{{serverAddress}}:{{serverPort}}"
17+
readyStateText: Application started.
18+
arguments: "--urls {{serverScheme}}://{{serverAddress}}:{{serverPort}}"
1819

1920
scenarios:
2021
ssr:

‎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>

‎src/Benchmarks/Data/World.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ namespace Benchmarks.Data
1010
[Table("world")]
1111
public class World
1212
{
13+
[UseColumnAttribute]
1314
[Column("id")]
1415
public int Id { get; set; }
1516

1617
[IgnoreDataMember]
1718
[NotMapped, DbValue(Ignore = true)]
1819
public int _Id { get; set; }
1920

21+
[UseColumnAttribute]
2022
[Column("randomnumber")]
2123
public int RandomNumber { get; set; }
2224
}

0 commit comments

Comments
 (0)