Skip to content

[pull] master from blazorhero:master #47

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

Open
pull wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[pull] master from blazorhero:master #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
174dc86
update target framework to dotnet 6 + github action update
dsoronda Jan 19, 2022
6a7bf44
update microsoft nuget packages
dsoronda Jan 19, 2022
776f486
update mudblazor nuget to 6.0.2 (6.0.3 and upper breakes build!)
dsoronda Jan 19, 2022
a38051e
WiP : updated all other nuget packages
dsoronda Jan 19, 2022
9615fd9
updated all other nuget packages
dsoronda Jan 19, 2022
6bbf7d9
Merge pull request #396 from dsoronda/feature/migration-to-dotnnet6
iammukeshm Jan 26, 2022
3ae9bb1
Update Readme to cope with .Net 6 Updates
farshaddavoudi May 28, 2022
11f810d
Merge pull request #426 from farshaddavoudi/patch-1
iammukeshm Jul 23, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
working-directory: src/Server
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</a>
<h3 align="center">BlazorHero - Clean Architecture Template</h3>
<p align="center">
Open Sourced Solution Template For Blazor Web-Assembly 5.0 built with MudBlazor Components
Open Sourced Solution Template For Blazor Web-Assembly 6.0 built with MudBlazor Components
<br />
<a href="https://codewithmukesh.com/blog/blazor-hero-quick-start-guide/"><strong>Read the Documentation »</strong></a>
<br />
Expand All @@ -43,7 +43,7 @@

## About The Project :zap:

BlazorHero is a Clean Architecture Solution Template for Blazor Webassembly 5.0 built with MudBlazor Components.
BlazorHero is a Clean Architecture Solution Template for Blazor Webassembly 6.0 built with MudBlazor Components.

## Complete Overview - Youtube Video 🆕 📈

Expand All @@ -55,8 +55,8 @@ So, here is an in-depth video that takes you through the BlazorHero Project! Do

### Tech Stack :muscle:

- Blazor WebAssembly 5.0 - ASP.NET Core Hosted Model
- [Entity Framework Core 5.0](https://docs.microsoft.com/en-us/ef/core/)
- Blazor WebAssembly 6.0 - ASP.NET Core Hosted Model
- [Entity Framework Core 6.0](https://docs.microsoft.com/en-us/ef/core/)

# BlazorHero v2.2

Expand Down Expand Up @@ -92,7 +92,7 @@ If you are already using Blazor Hero v1.x, make sure that you drop your existing

The easiest way to get started with Blazor Hero is to install the [NuGet package](https://www.nuget.org/packages/BlazorHero.CleanArchitecture/) and run `dotnet new BlazorHero.CleanArchitecture`:

1. Install the latest [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
1. Install the latest [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
2. Install the latest DOTNET & EF CLI Tools by using this command `dotnet tool install --global dotnet-ef`
3. Install the latest version of Visual Studio IDE 2019 (v16.8 and above) 🚀
4. Open up Command Prompt and run `dotnet new --install BlazorHero.CleanArchitecture` to install the project template
Expand Down
19 changes: 10 additions & 9 deletions src/Application/Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Application</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Application</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="FluentValidation" Version="10.3.3" />
<PackageReference Include="AutoMapper" Version="11.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="FluentValidation" Version="10.3.6" />
<PackageReference Include="LazyCache" Version="2.4.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.12" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.15" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Domain\Domain.csproj" />
Expand Down
13 changes: 7 additions & 6 deletions src/Client.Infrastructure/Client.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Client.Infrastructure</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Client.Infrastructure</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.10" />
<PackageReference Include="MudBlazor" Version="5.1.4" />
<PackageReference Include="AutoMapper" Version="11.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
<PackageReference Include="MudBlazor" Version="6.0.2" />
<PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
<PackageReference Include="Toolbelt.Blazor.HttpClientInterceptor" Version="10.0.0" />
</ItemGroup>
Expand Down
25 changes: 13 additions & 12 deletions src/Client/Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
<RootNamespace>BlazorHero.CleanArchitecture.Client</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Client</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<Content Remove="Shared\Components\BlazorHeroLogo.razor" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Blazored.FluentValidation" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.10" PrivateAssets="all" />
<PackageReference Include="Blazored.FluentValidation" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.10" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.10" />
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
<PackageReference Include="MudBlazor" Version="5.1.4" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.1" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="MudBlazor" Version="6.0.2" />
<PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/Domain/Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Domain</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Domain</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>

</Project>
7 changes: 4 additions & 3 deletions src/Infrastructure.Shared/Infrastructure.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Infrastructure.Shared</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Infrastructure.Shared</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Application\Application.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MailKit" Version="2.15.0" />
<PackageReference Include="MimeKit" Version="2.15.1" />
<PackageReference Include="MailKit" Version="3.1.0" />
<PackageReference Include="MimeKit" Version="3.1.0" />
</ItemGroup>
</Project>
19 changes: 10 additions & 9 deletions src/Infrastructure/Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Infrastructure</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Infrastructure</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<!--<ItemGroup>
Expand All @@ -18,17 +19,17 @@
<None Remove="Persistence\**" />
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="AutoMapper" Version="11.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
<PackageReference Include="EPPlus" Version="5.7.5" />
<PackageReference Include="Hangfire.Core" Version="1.7.26" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.10" />
<PackageReference Include="EPPlus" Version="5.8.5" />
<PackageReference Include="Hangfire.Core" Version="1.7.28" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
27 changes: 14 additions & 13 deletions src/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Server</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Server</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>BlazorHero.CleanArchitecture.Server.xml</DocumentationFile>
Expand All @@ -20,29 +21,29 @@
<None Remove="Permission\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.3" />
<PackageReference Include="Hangfire" Version="1.7.26" />
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.6" />
<PackageReference Include="Hangfire" Version="1.7.28" />
<PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.2.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
Expand Down
7 changes: 4 additions & 3 deletions src/Shared/Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>BlazorHero.CleanArchitecture.Shared</RootNamespace>
<AssemblyName>BlazorHero.CleanArchitecture.Shared</AssemblyName>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.10" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="5.0.10" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.1" />
</ItemGroup>

</Project>