Skip to content

Commit 3ee79b8

Browse files
TewrTewr
authored
Ideas for net7 support (#89)
* First wire-up. Not really compiling as multitargeting is being messed up by the jsruntime generator, but the idea is there and will most likely work. * Working now all the way to PostMessage, where it breaks due to missing dep tree * Proxy for mono-config.json * Fixes hard-coded init method General cleanup * Version up + removal of most multi-targeting code
1 parent ad0446e commit 3ee79b8

File tree

69 files changed

+21521
-398
lines changed

Some content is hidden

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

69 files changed

+21521
-398
lines changed

‎src/Assets/mono-config.json‎

Lines changed: 717 additions & 0 deletions
Large diffs are not rendered by default.

‎src/BlazorWorker.Demo.IoCExample/BlazorWorker.Demo.IoCExample.csproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0</TargetFrameworks>
55
<Configurations>Debug;Release;Nuget</Configurations>
66
</PropertyGroup>
77

8-
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
10-
</ItemGroup>
11-
12-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
1410
</ItemGroup>
1511

1612
<ItemGroup>

‎src/BlazorWorker.Demo/Client/BlazorWorker.Demo.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
1515
<PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
1616
</ItemGroup>
1717

‎src/BlazorWorker.Demo/ClientWasm32/BlazorWorker.Demo.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
1212
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
1313

14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
1515
<PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
1616
</ItemGroup>
1717

‎src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/App.razor‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Router AppAssembly="@typeof(App).Assembly">
2+
<Found Context="routeData">
3+
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
4+
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
5+
</Found>
6+
<NotFound>
7+
<PageTitle>Not found</PageTitle>
8+
<LayoutView Layout="@typeof(MainLayout)">
9+
<p role="alert">Sorry, there's nothing at this address.</p>
10+
</LayoutView>
11+
</NotFound>
12+
</Router>

‎src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/BlazorWorker.Demo.Client.csproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\..\SharedPages\BlazorWorker.Demo.SharedPages.csproj" />
17+
</ItemGroup>
18+
19+
</Project>

‎src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Pages/BackgroundServiceMulti.razor‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@page "/BackgroundServiceMulti"
2+
<BlazorWorker.Demo.SharedPages.Pages.BackgroundServiceMulti />

‎src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Pages/CoreExample.razor‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@page "/CoreExample"
2+
<BlazorWorker.Demo.SharedPages.Pages.CoreExample />

‎src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Pages/Http.razor‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@page "/Http"
2+
<BlazorWorker.Demo.SharedPages.Pages.Http />

‎src/BlazorWorker.Demo/Net7/Client/BlazorWorker.Demo.Client/Pages/Index.razor‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@page "/"
2+
<BlazorWorker.Demo.SharedPages.Pages.Index />

0 commit comments

Comments
 (0)