Skip to content

Commit df1baeb

Browse files
magiccodingmanmagiccodingman
committed
New server unit test and changed service to scoped for server use case and no down side to wasm
1 parent 5c9d38d commit df1baeb

File tree

74 files changed

+61107
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+61107
-11
lines changed

‎Magic.IndexedDb.sln‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "E2eTestWebApp", "E2eTestWeb
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "E2eTest", "E2eTest\E2eTest.csproj", "{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicIndexedDbBuildTool", "MagicIndexedDbBuildTool\MagicIndexedDbBuildTool.csproj", "{B4288282-3A6A-48DF-864A-1258FC02314D}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer\TestServer.csproj", "{F52D8979-97DE-478B-B5DA-E8DACD20A9AC}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer.Client", "TestServer\TestServer.Client\TestServer.Client.csproj", "{D34C8E12-2846-4F93-B51F-D68FCC2A850F}"
1517
EndProject
1618
Global
1719
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +37,14 @@ Global
3537
{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
3638
{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
3739
{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{B4288282-3A6A-48DF-864A-1258FC02314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{B4288282-3A6A-48DF-864A-1258FC02314D}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{B4288282-3A6A-48DF-864A-1258FC02314D}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{B4288282-3A6A-48DF-864A-1258FC02314D}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{F52D8979-97DE-478B-B5DA-E8DACD20A9AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{F52D8979-97DE-478B-B5DA-E8DACD20A9AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{F52D8979-97DE-478B-B5DA-E8DACD20A9AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{F52D8979-97DE-478B-B5DA-E8DACD20A9AC}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Release|Any CPU.Build.0 = Release|Any CPU
4248
EndGlobalSection
4349
GlobalSection(SolutionProperties) = preSolution
4450
HideSolutionNode = FALSE

‎Magic.IndexedDb/Extensions/ServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static IServiceCollection AddMagicBlazorDB(this IServiceCollection servic
4040
public static IServiceCollection AddMagicBlazorDB(this IServiceCollection services,
4141
long jsMessageSizeBytes, bool isDebug)
4242
{
43-
services.AddSingleton<IMagicIndexedDb>(sp =>
43+
services.AddScoped<IMagicIndexedDb>(sp =>
4444
new MagicDbFactory(sp, sp.GetRequiredService<IJSRuntime>(), jsMessageSizeBytes));
4545

4646
if (isDebug)

‎Magic.IndexedDb/Magic.IndexedDb.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReadmeFile>README.md</PackageReadmeFile>
1818
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
1919
<FileVersion>1.01</FileVersion>
20-
<Version>2.0.0-alpha2</Version>
20+
<Version>2.0.0-alpha3</Version>
2121
</PropertyGroup>
2222

2323
<ItemGroup>

‎TestServer/TestServer.Client/Pages/Counter.razor‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@page "/counter"
2+
@rendermode InteractiveAuto
3+
4+
<PageTitle>Counter</PageTitle>
5+
6+
<h1>Counter</h1>
7+
8+
<p role="status">Current count: @currentCount</p>
9+
10+
<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
11+
12+
@code {
13+
private int currentCount = 0;
14+
15+
private void IncrementCount()
16+
{
17+
currentCount++;
18+
}
19+
}

‎TestServer/TestServer.Client/Program.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
2+
3+
var builder = WebAssemblyHostBuilder.CreateDefault(args);
4+
5+
await builder.Build().RunAsync();

‎TestServer/TestServer.Client/TestServer.Client.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
8+
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.3" />
13+
</ItemGroup>
14+
15+
</Project>

‎TestServer/TestServer.Client/_Imports.razor‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@using System.Net.Http
2+
@using System.Net.Http.Json
3+
@using Microsoft.AspNetCore.Components.Forms
4+
@using Microsoft.AspNetCore.Components.Routing
5+
@using Microsoft.AspNetCore.Components.Web
6+
@using static Microsoft.AspNetCore.Components.Web.RenderMode
7+
@using Microsoft.AspNetCore.Components.Web.Virtualization
8+
@using Microsoft.JSInterop
9+
@using TestServer.Client

‎TestServer/TestServer.Client/wwwroot/appsettings.Development.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft.AspNetCore": "Warning"
6+
}
7+
}
8+
}

‎TestServer/TestServer.Client/wwwroot/appsettings.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft.AspNetCore": "Warning"
6+
}
7+
}
8+
}

‎TestServer/TestServer/Components/App.razor‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="utf-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<base href="/" />
8+
<link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
9+
<link rel="stylesheet" href="@Assets["app.css"]" />
10+
<link rel="stylesheet" href="@Assets["TestServer.styles.css"]" />
11+
<ImportMap />
12+
<link rel="icon" type="image/png" href="favicon.png" />
13+
<HeadOutlet />
14+
</head>
15+
16+
<body>
17+
<Routes />
18+
<script src="_framework/blazor.web.js"></script>
19+
</body>
20+
21+
</html>

0 commit comments

Comments
 (0)