Skip to content

Commit 55bba60

Browse files
DamianEdwardsDamianEdwards
authored
Add Razor Pages Fortunes, rename BlazorUnited to BlazorSSR, & other updates (#1850)
* Add TechEmpower MVC Dapper variant * Added TechEmpower/RazorPages * Customize HtmlEncoder * Rename BlazorUnited to BlazorSSR
1 parent 8fb2286 commit 55bba60

35 files changed

+430
-44
lines changed

‎src/BenchmarksApps.sln

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkServer", "Benchmar
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TcpEcho", "BenchmarksApps\TcpEcho\TcpEcho.csproj", "{436118C1-B9A7-4966-86AB-6F2477B6B201}"
5353
EndProject
54-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorUnited", "BenchmarksApps\TechEmpower\BlazorUnited\BlazorUnited.csproj", "{FE3606FF-CBC9-421A-A0B5-836E312E7719}"
55-
EndProject
5654
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodosApi", "BenchmarksApps\TodosApi\TodosApi.csproj", "{8E1A1F61-43E4-4629-A25B-7E5FA82697D0}"
5755
EndProject
58-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCore.OpenApi", "BenchmarksApps\AspNetCore.OpenApi\AspNetCore.OpenApi.csproj", "{28F432A6-1328-4996-91DD-BB1C87F45BF2}"
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore.OpenApi", "BenchmarksApps\AspNetCore.OpenApi\AspNetCore.OpenApi.csproj", "{28F432A6-1328-4996-91DD-BB1C87F45BF2}"
57+
EndProject
58+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPages", "BenchmarksApps\TechEmpower\RazorPages\RazorPages.csproj", "{31B61CD7-4CF6-464F-B418-04C700A17CB9}"
59+
EndProject
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSSR", "BenchmarksApps\TechEmpower\BlazorSSR\BlazorSSR.csproj", "{D6616E03-A2DA-4929-AD28-595ECC4C004D}"
5961
EndProject
6062
Global
6163
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -193,14 +195,6 @@ Global
193195
{436118C1-B9A7-4966-86AB-6F2477B6B201}.Release_Database|Any CPU.Build.0 = Release_Database|Any CPU
194196
{436118C1-B9A7-4966-86AB-6F2477B6B201}.Release|Any CPU.ActiveCfg = Release|Any CPU
195197
{436118C1-B9A7-4966-86AB-6F2477B6B201}.Release|Any CPU.Build.0 = Release|Any CPU
196-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Debug_Database|Any CPU.ActiveCfg = Debug_Database|Any CPU
197-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Debug_Database|Any CPU.Build.0 = Debug_Database|Any CPU
198-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
199-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Debug|Any CPU.Build.0 = Debug|Any CPU
200-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Release_Database|Any CPU.ActiveCfg = Release_Database|Any CPU
201-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Release_Database|Any CPU.Build.0 = Release_Database|Any CPU
202-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Release|Any CPU.ActiveCfg = Release|Any CPU
203-
{FE3606FF-CBC9-421A-A0B5-836E312E7719}.Release|Any CPU.Build.0 = Release|Any CPU
204198
{8E1A1F61-43E4-4629-A25B-7E5FA82697D0}.Debug_Database|Any CPU.ActiveCfg = Debug_Database|Any CPU
205199
{8E1A1F61-43E4-4629-A25B-7E5FA82697D0}.Debug_Database|Any CPU.Build.0 = Debug_Database|Any CPU
206200
{8E1A1F61-43E4-4629-A25B-7E5FA82697D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -217,6 +211,22 @@ Global
217211
{28F432A6-1328-4996-91DD-BB1C87F45BF2}.Release_Database|Any CPU.Build.0 = Release_Database|Any CPU
218212
{28F432A6-1328-4996-91DD-BB1C87F45BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
219213
{28F432A6-1328-4996-91DD-BB1C87F45BF2}.Release|Any CPU.Build.0 = Release|Any CPU
214+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Debug_Database|Any CPU.ActiveCfg = Debug_Database|Any CPU
215+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Debug_Database|Any CPU.Build.0 = Debug_Database|Any CPU
216+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
217+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
218+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Release_Database|Any CPU.ActiveCfg = Release_Database|Any CPU
219+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Release_Database|Any CPU.Build.0 = Release_Database|Any CPU
220+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
221+
{31B61CD7-4CF6-464F-B418-04C700A17CB9}.Release|Any CPU.Build.0 = Release|Any CPU
222+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Debug_Database|Any CPU.ActiveCfg = Debug_Database|Any CPU
223+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Debug_Database|Any CPU.Build.0 = Debug_Database|Any CPU
224+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Debug|Any CPU.Build.0 = Debug|Any CPU
226+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Release_Database|Any CPU.ActiveCfg = Release_Database|Any CPU
227+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Release_Database|Any CPU.Build.0 = Release_Database|Any CPU
228+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Release|Any CPU.ActiveCfg = Release|Any CPU
229+
{D6616E03-A2DA-4929-AD28-595ECC4C004D}.Release|Any CPU.Build.0 = Release|Any CPU
220230
EndGlobalSection
221231
GlobalSection(SolutionProperties) = preSolution
222232
HideSolutionNode = FALSE
@@ -230,7 +240,8 @@ Global
230240
{ACA43671-AD28-4F72-AAAB-6C32B388C2F0} = {B6DB234C-8F80-4160-B95D-D70AFC444A3D}
231241
{D8F11F87-823F-4864-926D-5F66448A5C13} = {398A40DA-FE1D-4B4D-A580-A33E29885553}
232242
{3D2573DE-CE7A-4CB8-A980-8C8636EE059E} = {6A69DE6C-07A6-4ABE-A4D2-0F983A33BBF8}
233-
{FE3606FF-CBC9-421A-A0B5-836E312E7719} = {B6DB234C-8F80-4160-B95D-D70AFC444A3D}
243+
{31B61CD7-4CF6-464F-B418-04C700A17CB9} = {B6DB234C-8F80-4160-B95D-D70AFC444A3D}
244+
{D6616E03-A2DA-4929-AD28-595ECC4C004D} = {B6DB234C-8F80-4160-B95D-D70AFC444A3D}
234245
EndGlobalSection
235246
GlobalSection(ExtensibilityGlobals) = postSolution
236247
SolutionGuid = {117072DC-DE12-4F74-90CA-692FA2BE8DCB}

‎src/BenchmarksApps/TechEmpower/BlazorUnited/AppSettings.cs renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/AppSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace BlazorUnited;
1+
namespace BlazorSSR;
22

33
public class AppSettings
44
{

‎src/BenchmarksApps/TechEmpower/BlazorUnited/BlazorUnited.csproj renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/BlazorSSR.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
<ItemGroup>
1212
<PackageReference Include="Dapper" Version="2.0.123" />
1313
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-preview.4" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-preview.4.23259.3" />
1514
</ItemGroup>
1615
</Project>

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Components/Fortunes.razor renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Components/Fortunes.razor

File renamed without changes.

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Components/FortunesEf.razor renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Components/FortunesEf.razor

File renamed without changes.

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Database/AppDbContext.cs renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Database/AppDbContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using BlazorUnited.Models;
1+
using BlazorSSR.Models;
22
using Microsoft.EntityFrameworkCore;
33

4-
namespace BlazorUnited.Database;
4+
namespace BlazorSSR.Database;
55

66
public class AppDbContext : DbContext
77
{

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Database/Db.cs renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Database/Db.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using BlazorUnited.Models;
1+
using BlazorSSR.Models;
22
using Dapper;
33
using Npgsql;
44

5-
namespace BlazorUnited.Database;
5+
namespace BlazorSSR.Database;
66

77
public sealed class Db : IAsyncDisposable
88
{

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Models/Fortune.cs renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Models/Fortune.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace BlazorUnited.Models;
1+
namespace BlazorSSR.Models;
22

33
public class Fortune
44
{

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Program.cs renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Program.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using Microsoft.AspNetCore.Components.Endpoints;
22
using Microsoft.EntityFrameworkCore;
33
using Microsoft.EntityFrameworkCore.Storage;
4-
using BlazorUnited;
5-
using BlazorUnited.Components;
6-
using BlazorUnited.Database;
4+
using BlazorSSR;
5+
using BlazorSSR.Components;
6+
using BlazorSSR.Database;
7+
using System.Text.Encodings.Web;
8+
using System.Text.Unicode;
79

810
var builder = WebApplication.CreateBuilder(args);
911

@@ -21,6 +23,12 @@
2123

2224
builder.Services.AddSingleton(new Db(appSettings));
2325
builder.Services.AddRazorComponents();
26+
builder.Services.AddSingleton(serviceProvider =>
27+
{
28+
var settings = new TextEncoderSettings(UnicodeRanges.BasicLatin, UnicodeRanges.Katakana, UnicodeRanges.Hiragana);
29+
settings.AllowCharacter('\u2014'); // allow EM DASH through
30+
return HtmlEncoder.Create(settings);
31+
});
2432

2533
var app = builder.Build();
2634

‎src/BenchmarksApps/TechEmpower/BlazorUnited/Properties/launchSettings.json renamed to ‎src/BenchmarksApps/TechEmpower/BlazorSSR/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json.schemastore.org/launchsettings.json",
33
"profiles": {
4-
"BlazorUnited": {
4+
"http": {
55
"commandName": "Project",
66
"launchBrowser": true,
77
"environmentVariables": {

0 commit comments

Comments
 (0)