Skip to content

Commit bc42773

Browse files
authored
Net6 Support (#66)
* Add net6 monikers, temporary dependency list in WorkerProxy * Add net6 monikers, temporary dependency list in WorkerProxy * Working! Almost ready for a pre-release here. * Update deps to 6, consistent pre-compiler IF * Full test suite for .NET 6 Fixed Failing IoC Examples
1 parent 69dcb9b commit bc42773

File tree

89 files changed

+2831
-130
lines changed

Some content is hidden

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

89 files changed

+2831
-130
lines changed

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

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

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

8-
<ItemGroup>
8+
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
99
<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" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
1017
<PackageReference Include="TG.Blazor.IndexedDB" Version="1.5.0-preview" />
1118
</ItemGroup>
1219

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>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\..\SharedPages\BlazorWorker.Demo.SharedPages.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Content Update="Pages\Index.razor">
20+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
21+
</Content>
22+
<Content Update="wwwroot\favicon.ico">
23+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
24+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
25+
</Content>
26+
</ItemGroup>
27+
28+
</Project>
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 />
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 />
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 />
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 />
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@page "/IndexedDB"
2+
<BlazorWorker.Demo.SharedPages.Pages.IndexedDb />
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@page "/IoCExample"
2+
<BlazorWorker.Demo.SharedPages.Pages.IoCExamplePage />
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using BlazorWorker.Core;
2+
using BlazorWorker.Demo.Client;
3+
using BlazorWorker.Demo.IoCExample;
4+
using Microsoft.AspNetCore.Components.Web;
5+
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
6+
7+
var builder = WebAssemblyHostBuilder.CreateDefault(args);
8+
builder.RootComponents.Add<App>("#app");
9+
builder.RootComponents.Add<HeadOutlet>("head::after");
10+
11+
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
12+
builder.Services.AddWorkerFactory();
13+
builder.Services.AddIndexedDbDemoPersonConfig();
14+
15+
await builder.Build().RunAsync();

0 commit comments

Comments
 (0)