huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating benchmark apps for netcoreapp3.0 (#4433)

This commit is contained in:
Sébastien Ros 2018-12-05 12:42:14 -08:00 committed by GitHub
parent e9c4c935f6
commit a51ff6e6ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
View File

@ -16,15 +16,16 @@
<ItemGroup Condition="'$(TargetFramework)' != 'net461'"> <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
<PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" /> <PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
</ItemGroup> </ItemGroup>
<!-- These references are used when running locally --> <!-- These references are used when running locally -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' == ''"> <ItemGroup Condition="'$(BenchmarksTargetFramework)' == ''">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" /> <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
@ -37,6 +38,10 @@
Use All meta-package and not App to include Microsoft.EntityFrameworkCore.Sqlite. Use All meta-package and not App to include Microsoft.EntityFrameworkCore.Sqlite.
--> -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''"> <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" /> <KnownFrameworkReference
Update="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Mvc/benchmarkapps/BasicApi/benchmarks.json
View File

@ -7,9 +7,9 @@
"PresetHeaders": "Json", "PresetHeaders": "Json",
"ReadyStateText": "Application started.", "ReadyStateText": "Application started.",
"Source": { "Source": {
"Repository": "https://github.com/aspnet/AspNetCore.git",
"BranchOrCommit": "master", "BranchOrCommit": "master",
"Project": "benchmarkapps/BasicApi/BasicApi.csproj", "Project": "src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj"
"Repository": "https://github.com/aspnet/mvc.git"
} }
}, },
"BasicApi.GetToken": { "BasicApi.GetToken": {

14
src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
View File

@ -16,6 +16,10 @@
<ItemGroup Condition="'$(TargetFramework)' != 'net461'"> <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
<PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" /> <PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
</ItemGroup> </ItemGroup>
<!-- These references are used when running locally --> <!-- These references are used when running locally -->
@ -23,9 +27,6 @@
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
@ -34,10 +35,13 @@
<!-- <!--
These references are used when running on the Benchmarks Server. These references are used when running on the Benchmarks Server.
Use All meta-package and not App to include Microsoft.EntityFrameworkCore.Sqlite.
--> -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''"> <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" /> <KnownFrameworkReference
Update="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Mvc/benchmarkapps/BasicViews/benchmarks.json
View File

@ -7,9 +7,9 @@
"PresetHeaders": "Html", "PresetHeaders": "Html",
"ReadyStateText": "Application started.", "ReadyStateText": "Application started.",
"Source": { "Source": {
"Repository": "https://github.com/aspnet/AspNetCore.git",
"BranchOrCommit": "master", "BranchOrCommit": "master",
"Project": "benchmarkapps/BasicViews/BasicViews.csproj", "Project": "src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj"
"Repository": "https://github.com/aspnet/mvc.git"
} }
}, },
"BasicViews.GetHtmlHelpers": { "BasicViews.GetHtmlHelpers": {

9
src/Mvc/benchmarkapps/BasicViews/web.config
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" forwardWindowsAuthToken="false" stdoutLogEnabled="false" />
</system.webServer>
</configuration>

6
src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
View File

@ -17,7 +17,11 @@
These references are used when running on the Benchmarks Server. These references are used when running on the Benchmarks Server.
--> -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''"> <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" /> <KnownFrameworkReference
Update="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Mvc/build/dependencies.props
View File

@ -10,12 +10,12 @@
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion> <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion> <BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-preview.18572.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>
<BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion> <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview.18572.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>
<BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion> <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview.18572.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<BenchmarksOnlyMySqlConnectorPackageVersion>0.43.0</BenchmarksOnlyMySqlConnectorPackageVersion> <BenchmarksOnlyMySqlConnectorPackageVersion>0.47.1</BenchmarksOnlyMySqlConnectorPackageVersion>
<BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>2.1.1.1</BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion> <BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>2.1.1.1</BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>
<BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.1</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion> <BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.4</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview.18572.1</InternalAspNetCoreAnalyzersPackageVersion> <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview.18572.1</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview.18572.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview.18572.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
<MicrosoftAspNetCoreAntiforgeryPackageVersion>3.0.0-preview-18604-0074</MicrosoftAspNetCoreAntiforgeryPackageVersion> <MicrosoftAspNetCoreAntiforgeryPackageVersion>3.0.0-preview-18604-0074</MicrosoftAspNetCoreAntiforgeryPackageVersion>

8
src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj
View File

@ -15,8 +15,12 @@
</ItemGroup> </ItemGroup>
<!--These references are used when running on the Benchmarks Server--> <!--These references are used when running on the Benchmarks Server-->
<ItemGroup Condition="'$(UseP2PReferences)'!='true'"> <ItemGroup Condition="'$(BenchmarksTargetFramework)'!=''">
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" /> <KnownFrameworkReference
Update="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Routing/benchmarkapps/Benchmarks/benchmarks.json
View File

@ -7,9 +7,9 @@
"PipelineDepth": 16 "PipelineDepth": 16
}, },
"Source": { "Source": {
"Repository": "https://github.com/aspnet/routing.git", "Repository": "https://github.com/aspnet/AspNetCore.git",
"BranchOrCommit": "master", "BranchOrCommit": "master",
"Project": "benchmarkapps/Benchmarks/Benchmarks.csproj" "Project": "src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj"
}, },
"Port": 8080 "Port": 8080
}, },

9
src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(BenchmarksTargetFramework)' != ''">$(BenchmarksTargetFramework)</TargetFramework> <TargetFramework Condition="'$(BenchmarksTargetFramework)' != ''">$(BenchmarksTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
@ -23,6 +23,11 @@
<!-- These references are used when running on the Benchmarks Server --> <!-- These references are used when running on the Benchmarks Server -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''"> <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
<Reference Include="Microsoft.AspNetCore.All" /> <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" version="2.2.0" />
<KnownFrameworkReference
Update="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.json.json
View File

@ -4,9 +4,9 @@
"PresetHeaders": "Json", "PresetHeaders": "Json",
"Source": { "Source": {
"Repository": "https://github.com/aspnet/KestrelHttpServer.git", "Repository": "https://github.com/aspnet/AspNetCore.git",
"BranchOrCommit": "dev", "BranchOrCommit": "master",
"Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj" "Project": "src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj"
} }
}, },
"JsonPlatform": { "JsonPlatform": {

6
src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.plaintext.json
View File

@ -7,9 +7,9 @@
"PipelineDepth": 16 "PipelineDepth": 16
}, },
"Source": { "Source": {
"Repository": "https://github.com/aspnet/KestrelHttpServer.git", "Repository": "https://github.com/aspnet/AspNetCore.git",
"BranchOrCommit": "dev", "BranchOrCommit": "master",
"Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj" "Project": "src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj"
}, },
"Port": 8080 "Port": 8080
}, },