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.

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

Port to .NET 8, re-write, etc. #373

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 11 additions & 7 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<Project>
<PropertyGroup>
<AspNetCoreVersion>7.0.0</AspNetCoreVersion>
<BlazorVersion>7.0.0</BlazorVersion>
<EntityFrameworkVersion>7.0.0</EntityFrameworkVersion>
<TargetFrameworkVersion>net7.0</TargetFrameworkVersion>
<SystemNetHttpJsonVersion>7.0.0</SystemNetHttpJsonVersion>
</PropertyGroup>
<PropertyGroup>
<AspNetCoreVersion>8.0.8</AspNetCoreVersion>
<BlazorVersion>8.0.0</BlazorVersion>
<EntityFrameworkVersion>8.0.8</EntityFrameworkVersion>
<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
<SystemNetHttpJsonVersion>8.0.0</SystemNetHttpJsonVersion>
</PropertyGroup>
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
20 changes: 20 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<DefaultTargetFramework>$(TargetFrameworkVersion)</DefaultTargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
<PackageVersion Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="WebPush" Version="1.0.12" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>BlazingPizza.TemplateComponents</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions src/BlazingComponents/TemplatedDialog.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@if (Show)

{
<div class="dialog-container">
<div class="dialog">
Expand All @@ -9,5 +10,6 @@

@code {
[Parameter, EditorRequired] public RenderFragment? ChildContent { get; set; }

[Parameter] public bool Show { get; set; }
}
10 changes: 5 additions & 5 deletions src/BlazingComponents/TemplatedList.razor
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
@typeparam TItem

@if (items is null)
@if (_items is null)
{
@Loading
}
else if (!items.Any())
else if (_items.Any() is false)
{
@Empty
}
else
{
<div class="list-group @ListGroupClass">
@foreach (var item in items)
@foreach (var item in _items)
{
<div class="list-group-item">
@if (Item is not null)
Expand All @@ -24,7 +24,7 @@ else
}

@code {
IEnumerable<TItem>? items;
IEnumerable<TItem>? _items;

[Parameter, EditorRequired] public Func<Task<IEnumerable<TItem>>>? Loader { get; set; }
[Parameter] public RenderFragment? Loading { get; set; }
Expand All @@ -36,7 +36,7 @@ else
{
if (Loader is not null)
{
items = await Loader();
_items = await Loader();
}
}
}
19 changes: 0 additions & 19 deletions src/BlazingPizza.Client/App.razor

This file was deleted.

23 changes: 0 additions & 23 deletions src/BlazingPizza.Client/BlazingPizza.Client.csproj

This file was deleted.

11 changes: 0 additions & 11 deletions src/BlazingPizza.Client/JSRuntimeExtensions.cs

This file was deleted.

55 changes: 0 additions & 55 deletions src/BlazingPizza.Client/OrderState.cs

This file was deleted.

35 changes: 0 additions & 35 deletions src/BlazingPizza.Client/OrdersClient.cs

This file was deleted.

32 changes: 0 additions & 32 deletions src/BlazingPizza.Client/Pages/Authentication.razor

This file was deleted.

48 changes: 0 additions & 48 deletions src/BlazingPizza.Client/Pages/MyOrders.razor

This file was deleted.

Loading