Skip to content

Commit 40a7237

Browse files
GerardSmitGerardSmit
committed
fixes
1 parent e6fa732 commit 40a7237

30 files changed

Lines changed: 2265 additions & 181 deletions

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
5353
VERSION_FILE_PATH: src/Directory.Build.props
5454
PROJECT_FILE_PATH: |
55+
src/Zapto.AspNetCore.Wasm.Interop/Zapto.AspNetCore.Wasm.Interop.csproj
56+
src/Zapto.AspNetCore.Wasm/Zapto.AspNetCore.Wasm.csproj
5557
src/Zapto.AspNetCore.Polyfill/Zapto.AspNetCore.Polyfill.csproj
5658
src/Zapto.AspNetCore.NetFx/Zapto.AspNetCore.NetFx.csproj
59+
sdk/Zapto.AspNetCore.CloudFlare.SDK/Zapto.AspNetCore.CloudFlare.SDK.csproj
5760

‎AspNetCore.sln‎

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zapto.AspNetCore.Wasm.Sourc
2828
EndProject
2929
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zapto.AspNetCore.Wasm.SourceGenerator.Tests", "tests\Zapto.AspNetCore.Wasm.SourceGenerator.Tests\Zapto.AspNetCore.Wasm.SourceGenerator.Tests.csproj", "{1333E8B4-070C-4C70-A9F2-070CAA66CDAD}"
3030
EndProject
31-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
32-
EndProject
3331
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zapto.AspNetCore.Wasm.Interop", "src\Zapto.AspNetCore.Wasm.Interop\Zapto.AspNetCore.Wasm.Interop.csproj", "{3827F320-31F0-4AE3-A048-8157C66DBEC8}"
3432
EndProject
33+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wasm", "Wasm", "{36B2818B-95AB-47ED-96AC-563A115C16A8}"
34+
EndProject
35+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CloudFlare", "CloudFlare", "{75661D3A-C7D4-4032-8E88-5949C22550EC}"
36+
EndProject
37+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zapto.AspNetCore.CloudFlare", "src\Zapto.AspNetCore.CloudFlare\Zapto.AspNetCore.CloudFlare.csproj", "{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}"
38+
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WasmApp.Library", "sandbox\WasmApp.Library\WasmApp.Library.csproj", "{3A4FB731-98D3-4006-A63C-5DA356FEF674}"
40+
EndProject
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zapto.AspNetCore.CloudFlare.SDK.Tasks", "sdk\Zapto.AspNetCore.CloudFlare.SDK.Tasks\Zapto.AspNetCore.CloudFlare.SDK.Tasks.csproj", "{20818784-C3EC-4554-95EB-B92CE9E58C7A}"
42+
EndProject
3543
Global
3644
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3745
Debug|Any CPU = Debug|Any CPU
@@ -174,6 +182,42 @@ Global
174182
{3827F320-31F0-4AE3-A048-8157C66DBEC8}.Release|x64.Build.0 = Release|Any CPU
175183
{3827F320-31F0-4AE3-A048-8157C66DBEC8}.Release|x86.ActiveCfg = Release|Any CPU
176184
{3827F320-31F0-4AE3-A048-8157C66DBEC8}.Release|x86.Build.0 = Release|Any CPU
185+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
186+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Debug|Any CPU.Build.0 = Debug|Any CPU
187+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Debug|x64.ActiveCfg = Debug|Any CPU
188+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Debug|x64.Build.0 = Debug|Any CPU
189+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Debug|x86.ActiveCfg = Debug|Any CPU
190+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Debug|x86.Build.0 = Debug|Any CPU
191+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Release|Any CPU.ActiveCfg = Release|Any CPU
192+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Release|Any CPU.Build.0 = Release|Any CPU
193+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Release|x64.ActiveCfg = Release|Any CPU
194+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Release|x64.Build.0 = Release|Any CPU
195+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Release|x86.ActiveCfg = Release|Any CPU
196+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414}.Release|x86.Build.0 = Release|Any CPU
197+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Debug|Any CPU.Build.0 = Debug|Any CPU
199+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Debug|x64.ActiveCfg = Debug|Any CPU
200+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Debug|x64.Build.0 = Debug|Any CPU
201+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Debug|x86.ActiveCfg = Debug|Any CPU
202+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Debug|x86.Build.0 = Debug|Any CPU
203+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Release|Any CPU.ActiveCfg = Release|Any CPU
204+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Release|Any CPU.Build.0 = Release|Any CPU
205+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Release|x64.ActiveCfg = Release|Any CPU
206+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Release|x64.Build.0 = Release|Any CPU
207+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Release|x86.ActiveCfg = Release|Any CPU
208+
{3A4FB731-98D3-4006-A63C-5DA356FEF674}.Release|x86.Build.0 = Release|Any CPU
209+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
210+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
211+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Debug|x64.ActiveCfg = Debug|Any CPU
212+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Debug|x64.Build.0 = Debug|Any CPU
213+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Debug|x86.ActiveCfg = Debug|Any CPU
214+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Debug|x86.Build.0 = Debug|Any CPU
215+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
216+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Release|Any CPU.Build.0 = Release|Any CPU
217+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Release|x64.ActiveCfg = Release|Any CPU
218+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Release|x64.Build.0 = Release|Any CPU
219+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Release|x86.ActiveCfg = Release|Any CPU
220+
{20818784-C3EC-4554-95EB-B92CE9E58C7A}.Release|x86.Build.0 = Release|Any CPU
177221
EndGlobalSection
178222
GlobalSection(SolutionProperties) = preSolution
179223
HideSolutionNode = FALSE
@@ -183,12 +227,16 @@ Global
183227
{77FA9DA3-FB50-46EC-B9B8-905121594EA1} = {DD6845EA-4012-4E0A-8B78-8BAE5FF6967B}
184228
{305C7374-1A54-4409-B527-968D49B258DF} = {B3DA0F06-4511-4791-BB12-A84655F02BFA}
185229
{507A2467-52E9-4181-8414-426AC45E01B3} = {7F209FD2-1190-4721-9A08-9569AB4AA8D5}
186-
{A8E7D4F1-2B3C-4D5E-9F6A-1B2C3D4E5F6A} = {7F209FD2-1190-4721-9A08-9569AB4AA8D5}
230+
{A8E7D4F1-2B3C-4D5E-9F6A-1B2C3D4E5F6A} = {36B2818B-95AB-47ED-96AC-563A115C16A8}
187231
{B1C2D3E4-F5A6-4B7C-8D9E-0A1B2C3D4E5F} = {E1F2A3B4-C5D6-4E7F-8A9B-0C1D2E3F4A5B}
188232
{C2D3E4F5-A6B7-4C8D-9E0F-1A2B3C4D5E6F} = {DD6845EA-4012-4E0A-8B78-8BAE5FF6967B}
189233
{D3E4F5A6-B7C8-4D9E-0F1A-2B3C4D5E6F7A} = {B3DA0F06-4511-4791-BB12-A84655F02BFA}
190-
{7BEC1F6E-3E97-489C-A134-ECCEA93FC93F} = {7F209FD2-1190-4721-9A08-9569AB4AA8D5}
234+
{7BEC1F6E-3E97-489C-A134-ECCEA93FC93F} = {36B2818B-95AB-47ED-96AC-563A115C16A8}
191235
{1333E8B4-070C-4C70-A9F2-070CAA66CDAD} = {B3DA0F06-4511-4791-BB12-A84655F02BFA}
192-
{3827F320-31F0-4AE3-A048-8157C66DBEC8} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
236+
{3827F320-31F0-4AE3-A048-8157C66DBEC8} = {36B2818B-95AB-47ED-96AC-563A115C16A8}
237+
{36B2818B-95AB-47ED-96AC-563A115C16A8} = {7F209FD2-1190-4721-9A08-9569AB4AA8D5}
238+
{B42E9FA8-1B6D-4CF0-BAFB-9CF8E86DF414} = {75661D3A-C7D4-4032-8E88-5949C22550EC}
239+
{3A4FB731-98D3-4006-A63C-5DA356FEF674} = {DD6845EA-4012-4E0A-8B78-8BAE5FF6967B}
240+
{20818784-C3EC-4554-95EB-B92CE9E58C7A} = {E1F2A3B4-C5D6-4E7F-8A9B-0C1D2E3F4A5B}
193241
EndGlobalSection
194242
EndGlobal

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Copyright>Copyright © 2025 Zapto</Copyright>
99
<PackageTags>zapto, aspnetcore</PackageTags>
1010
<PackageProjectUrl>https://github.com/zapto-dev/AspNetCore</PackageProjectUrl>
11-
<PackageLicenseUrl>https://github.com/zapto-dev/AspNetCore/blob/main/LICENSE</PackageLicenseUrl>
11+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1212
</PropertyGroup>
1313

1414
</Project>

‎sandbox/WasmApp/Program.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Extensions.DependencyInjection;
66
using WasmApp.Library;
77

8-
var builder = WebApplication.CreateEmptyBuilder(new WebApplicationOptions());
8+
var builder = WebApplication.CreateBuilder(args);
99

1010
builder.Services.AddRouting();
1111

@@ -14,8 +14,6 @@
1414
options.SerializerOptions.TypeInfoResolverChain.Insert(0, AppJsonContext.Default);
1515
});
1616

17-
builder.WebHost.UseWasmServer();
18-
1917
var app = builder.Build();
2018

2119
app.UseRouting();
@@ -38,7 +36,7 @@
3836
await context.Response.WriteAsync($"Echo: {body}");
3937
});
4038

41-
await app.StartAsync();
39+
await app.RunAsync();
4240

4341
internal record TimeResponse([property: JsonPropertyName("time")] string Time);
4442

‎sandbox/WasmApp/WasmApp.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<Import Project="..\..\sdk\Zapto.AspNetCore.CloudFlare.SDK\Sdk\Sdk.props" />
44

55
<PropertyGroup>
6+
<TargetFrameworks>net10.0-browser;net10.0</TargetFrameworks>
7+
68
<!-- For local development, reference the project directly -->
79
<ZaptoWasmUseProjectReference>true</ZaptoWasmUseProjectReference>
810
</PropertyGroup>

‎sandbox/WasmApp/test-wrangler-dotnet-run.sh‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
echo "Starting wrangler..."
3+
dotnet run 2>&1 &
4+
WRANGLER_PID=$!
5+
6+
echo "Waiting for wrangler to start (PID: $WRANGLER_PID)..."
7+
sleep 5
8+
9+
echo ""
10+
echo "=== Testing root ==="
11+
curl -v --max-time 20 http://127.0.0.1:8787/ 2>&1
12+
echo ""
13+
14+
echo ""
15+
echo "=== Testing library/greet ==="
16+
curl -s --max-time 30 http://127.0.0.1:8787/library/greet/TestUser
17+
CURL_EXIT=$?
18+
echo ""
19+
echo "curl exit code: $CURL_EXIT"
20+
21+
echo ""
22+
echo "=== Stopping wrangler ==="
23+
sleep 2
24+
kill $WRANGLER_PID 2>/dev/null
25+
echo "Done"

0 commit comments

Comments
 (0)