Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.Net9 testing #115

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

.Net9 testing #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4aca2b9
FIrst running .net9 demo... Running but nowhere functional.
Tewr Aug 24, 2024
f704292
Add NET9_0 symbols
Tewr Sep 28, 2024
b34041e
Add .net9 target
Tewr Sep 28, 2024
c150e46
Some comments and debug statements
Tewr Sep 28, 2024
c6a2d6b
upgrade to 9.0.0-rc1
Tewr Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/BlazorWorker.Demo/Net8/Client/BlazorWorker.Demo.Client/Shared/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@inherits LayoutComponentBase

<div class="page">
<div class="sidebar">
<NavMenu />
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorWorker.Demo/Net8/Client/BlazorWorker.Demo.Client/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<div id="app">
<div style="margin: 100px auto; width: 500px; height: 120px; text-align: center; ">
<img src="loading-icon.svg" width="97" height="88" />
<img src="loading-icon.svg" width="97" height="88" />
</div>
<svg class="loading-progress">
<circle r="40%" cx="50%" cy="50%" />
Expand Down
12 changes: 12 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Router AppAssembly="@typeof(App).Assembly">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
</Found>
<NotFound>
<PageTitle>Not found</PageTitle>
<LayoutView Layout="@typeof(MainLayout)">
<p role="alert">Sorry, there's nothing at this address.</p>
</LayoutView>
</NotFound>
</Router>
31 changes: 31 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/BlazorWorker.Demo.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.1.24452.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.1.24452.1" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\BlazorWorker.ServiceFactory\BlazorWorker.BackgroundServiceFactory.csproj" />
<ProjectReference Include="..\..\SharedPages\BlazorWorker.Demo.SharedPages.csproj" />
<ProjectReference Include="..\..\Shared\BlazorWorker.Demo.Shared.csproj" />
</ItemGroup>

<ItemGroup>
<Content Update="wwwroot\favicon.png">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\loading-icon.svg">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>

</Project>
16 changes: 16 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Layout/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@inherits LayoutComponentBase
<div class="page">
<div class="sidebar">
<NavMenu />
</div>

<main>
<div class="top-row px-4">
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
</div>

<article class="content px-4">
@Body
</article>
</main>
</div>
77 changes: 77 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Layout/MainLayout.razor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
.page {
position: relative;
display: flex;
flex-direction: column;
}

main {
flex: 1;
}

.sidebar {
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
}

.top-row {
background-color: #f7f7f7;
border-bottom: 1px solid #d6d5d5;
justify-content: flex-end;
height: 3.5rem;
display: flex;
align-items: center;
}

.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}

.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}

.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}

@media (max-width: 640.98px) {
.top-row {
justify-content: space-between;
}

.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
}

@media (min-width: 641px) {
.page {
flex-direction: row;
}

.sidebar {
width: 250px;
height: 100vh;
position: sticky;
top: 0;
}

.top-row {
position: sticky;
top: 0;
z-index: 1;
}

.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}

.top-row, article {
padding-left: 2rem !important;
padding-right: 1.5rem !important;
}
}
29 changes: 29 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Layout/NavMenu.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">BlazorWorker.Demo.Client</a>
<button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
<span class="navbar-toggler-icon"></span>
</button>
</div>
</div>

<div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
<nav class="flex-column">
@foreach(var navlink in BlazorWorker.Demo.SharedPages.Shared.NavMenuLinksModel.NavMenuLinks) {
<div class="nav-item px-3">
<BlazorWorker.Demo.SharedPages.Shared.NavMenuLink Model=navlink/>
</div>
}
</nav>
</div>

@code {
private bool collapseNavMenu = true;

private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;

private void ToggleNavMenu()
{
collapseNavMenu = !collapseNavMenu;
}
}
83 changes: 83 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Layout/NavMenu.razor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.navbar-toggler {
background-color: rgba(255, 255, 255, 0.1);
}

.top-row {
height: 3.5rem;
background-color: rgba(0,0,0,0.4);
}

.navbar-brand {
font-size: 1.1rem;
}

.bi {
display: inline-block;
position: relative;
width: 1.25rem;
height: 1.25rem;
margin-right: 0.75rem;
top: -1px;
background-size: cover;
}

.bi-house-door-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
}

.bi-plus-square-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
}

.bi-list-nested-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
}

.nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
}

.nav-item:first-of-type {
padding-top: 1rem;
}

.nav-item:last-of-type {
padding-bottom: 1rem;
}

.nav-item ::deep a {
color: #d7d7d7;
border-radius: 4px;
height: 3rem;
display: flex;
align-items: center;
line-height: 3rem;
}

.nav-item ::deep a.active {
background-color: rgba(255,255,255,0.37);
color: white;
}

.nav-item ::deep a:hover {
background-color: rgba(255,255,255,0.1);
color: white;
}

@media (min-width: 641px) {
.navbar-toggler {
display: none;
}

.collapse {
/* Never collapse the sidebar for wide screens */
display: block;
}

.nav-scrollable {
/* Allow sidebar to scroll for tall menus */
height: calc(100vh - 3.5rem);
overflow-y: auto;
}
}
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/BackgroundServiceMulti.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/BackgroundServiceMulti"
<BlazorWorker.Demo.SharedPages.Pages.BackgroundServiceMulti />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/ComplexSerialization.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/ComplexSerialization"
<BlazorWorker.Demo.SharedPages.Pages.ComplexSerialization />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/CoreExample.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/CoreExample"
<BlazorWorker.Demo.SharedPages.Pages.CoreExample />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/Http.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/Http"
<BlazorWorker.Demo.SharedPages.Pages.Http />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/"
<BlazorWorker.Demo.SharedPages.Pages.Index />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/IndexedDb.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/IndexedDb"
<BlazorWorker.Demo.SharedPages.Pages.IndexedDb />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/IoCExample.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/IoCExample"
<BlazorWorker.Demo.SharedPages.Pages.IoCExamplePage />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/JsDirect.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/JsDirect"
<BlazorWorker.Demo.SharedPages.Pages.JsDirect />
2 changes: 2 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Pages/JsInteractions.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@page "/JsInteractions"
<BlazorWorker.Demo.SharedPages.Pages.JsInteractions />
20 changes: 20 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using BlazorWorker.Demo.Shared;

namespace BlazorWorker.Demo.Client
{
public class Program
{
public static async Task Main(string[] args)
{
var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("#app");
builder.RootComponents.Add<HeadOutlet>("head::after");

builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
builder.Services.AddDemoDependencies();
await builder.Build().RunAsync();
}
}
}
10 changes: 10 additions & 0 deletions src/BlazorWorker.Demo/Net9/BLazorWorker.Demo.Client/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@using System.Net.Http
@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop
@using BlazorWorker.Demo.Client
@using BlazorWorker.Demo.Client.Layout
Loading