Skip to content

Commit

Permalink
Updated everything to .NET 8 (#249)
Browse files Browse the repository at this point in the history
* Updated everything to .NET 8
* New sample projects
  • Loading branch information
chrissainty authored Feb 19, 2024
1 parent bc95f20 commit b9f5172
Show file tree
Hide file tree
Showing 76 changed files with 813 additions and 2,180 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
types: [ published ]

env:
NETCORE_VERSION: '7.0.x'
OUTPUT_DIR: 'net7.0'
NETCORE_VERSION: '8.0.x'
OUTPUT_DIR: 'net8.0'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
PROJECT_NAME: Toast
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
PROJECT_NAME: Blazored.Toast
NETCORE_VERSION: '7.0.x'
NETCORE_VERSION: '8.0.x'
jobs:
build:
name: Build and test
Expand Down
60 changes: 30 additions & 30 deletions Blazored.Toast.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.Toast", "src\Blazo
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAD8AEBC-BDBA-4EFB-A8EA-971624D2E333}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebAssembly", "samples\BlazorWebAssembly\BlazorWebAssembly.csproj", "{6622CD34-5B0D-43EC-B86E-3A671BE72104}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{011F9D7D-38DC-436C-9597-CDF701683608}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{44082A48-88B8-4BB0-BF2D-B243A0C46F06}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
Expand All @@ -28,6 +24,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUnitExample", "samples\bUn
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.Toast.TestExtensions", "src\Blazored.Toast.TestExtensions\Blazored.Toast.TestExtensions.csproj", "{942FBF78-648B-47C4-922F-503CF11B1EAE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorWebAssembly", "samples\BlazorWebAssembly\BlazorWebAssembly.csproj", "{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorInteractiveServer", "samples\BlazorInteractiveServer\BlazorInteractiveServer.csproj", "{934AB0A3-ECB7-4190-B4B6-2906884FEB27}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -50,30 +50,6 @@ Global
{41CF3689-AEF1-4AAC-B7CF-F60E75023355}.Release|x64.Build.0 = Release|Any CPU
{41CF3689-AEF1-4AAC-B7CF-F60E75023355}.Release|x86.ActiveCfg = Release|Any CPU
{41CF3689-AEF1-4AAC-B7CF-F60E75023355}.Release|x86.Build.0 = Release|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Debug|x64.ActiveCfg = Debug|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Debug|x64.Build.0 = Debug|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Debug|x86.ActiveCfg = Debug|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Debug|x86.Build.0 = Debug|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Release|Any CPU.Build.0 = Release|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Release|x64.ActiveCfg = Release|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Release|x64.Build.0 = Release|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Release|x86.ActiveCfg = Release|Any CPU
{6622CD34-5B0D-43EC-B86E-3A671BE72104}.Release|x86.Build.0 = Release|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Debug|Any CPU.Build.0 = Debug|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Debug|x64.ActiveCfg = Debug|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Debug|x64.Build.0 = Debug|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Debug|x86.ActiveCfg = Debug|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Debug|x86.Build.0 = Debug|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Release|Any CPU.ActiveCfg = Release|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Release|Any CPU.Build.0 = Release|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Release|x64.ActiveCfg = Release|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Release|x64.Build.0 = Release|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Release|x86.ActiveCfg = Release|Any CPU
{011F9D7D-38DC-436C-9597-CDF701683608}.Release|x86.Build.0 = Release|Any CPU
{5E396684-2ED7-4D93-8AAA-B57291C6ABED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E396684-2ED7-4D93-8AAA-B57291C6ABED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E396684-2ED7-4D93-8AAA-B57291C6ABED}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -110,15 +86,39 @@ Global
{942FBF78-648B-47C4-922F-503CF11B1EAE}.Release|x64.Build.0 = Release|Any CPU
{942FBF78-648B-47C4-922F-503CF11B1EAE}.Release|x86.ActiveCfg = Release|Any CPU
{942FBF78-648B-47C4-922F-503CF11B1EAE}.Release|x86.Build.0 = Release|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Debug|x64.ActiveCfg = Debug|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Debug|x64.Build.0 = Debug|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Debug|x86.ActiveCfg = Debug|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Debug|x86.Build.0 = Debug|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Release|Any CPU.Build.0 = Release|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Release|x64.ActiveCfg = Release|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Release|x64.Build.0 = Release|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Release|x86.ActiveCfg = Release|Any CPU
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3}.Release|x86.Build.0 = Release|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Debug|x64.ActiveCfg = Debug|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Debug|x64.Build.0 = Debug|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Debug|x86.ActiveCfg = Debug|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Debug|x86.Build.0 = Debug|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Release|Any CPU.Build.0 = Release|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Release|x64.ActiveCfg = Release|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Release|x64.Build.0 = Release|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Release|x86.ActiveCfg = Release|Any CPU
{934AB0A3-ECB7-4190-B4B6-2906884FEB27}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6622CD34-5B0D-43EC-B86E-3A671BE72104} = {DAD8AEBC-BDBA-4EFB-A8EA-971624D2E333}
{011F9D7D-38DC-436C-9597-CDF701683608} = {DAD8AEBC-BDBA-4EFB-A8EA-971624D2E333}
{5E396684-2ED7-4D93-8AAA-B57291C6ABED} = {AAC2415B-57A1-4091-89E9-842C0483CC34}
{FA280CA2-87E1-4EC3-BF6D-9E134B62F0CC} = {DAD8AEBC-BDBA-4EFB-A8EA-971624D2E333}
{3B1E7A07-43A7-4C49-B252-A032FE64ABB3} = {DAD8AEBC-BDBA-4EFB-A8EA-971624D2E333}
{934AB0A3-ECB7-4190-B4B6-2906884FEB27} = {DAD8AEBC-BDBA-4EFB-A8EA-971624D2E333}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A209D472-2B33-4B1C-8FE6-8F53A0DC6901}
Expand Down
13 changes: 13 additions & 0 deletions samples/BlazorInteractiveServer/BlazorInteractiveServer.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
<ProjectReference Include="..\..\src\Blazored.Toast\Blazored.Toast.csproj" />
</ItemGroup>

</Project>
20 changes: 20 additions & 0 deletions samples/BlazorInteractiveServer/Components/App.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<base href="/"/>
<link rel="stylesheet" href="bootstrap/bootstrap.min.css"/>
<link rel="stylesheet" href="app.css"/>
<link rel="stylesheet" href="BlazorInteractiveServer.styles.css"/>
<link rel="icon" type="image/png" href="favicon.png"/>
<HeadOutlet @rendermode="@InteractiveServer" />
</head>

<body>
<Routes @rendermode="@InteractiveServer" />
<script src="_framework/blazor.web.js"></script>
</body>

</html>
41 changes: 41 additions & 0 deletions samples/BlazorInteractiveServer/Components/Layout/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
@inherits LayoutComponentBase
@using Blazored.Toast.Configuration

<BlazoredToasts Position="ToastPosition.BottomRight"
Timeout="10"
IconType="IconType.Material"
ErrorIcon="error_outline"
InfoIcon="school"
SuccessIcon="done_outline"
WarningIcon="warning"
ShowProgressBar="@true"
ShowCloseButton="@true"
MaxToastCount="3">
<CloseButtonContent>
<div>
<span class="myCloseButtonStyleClass">&times;</span>
</div>
</CloseButtonContent>
</BlazoredToasts>

<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>

<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
.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;
}
}

#blazor-error-ui {
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
}

#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
17 changes: 17 additions & 0 deletions samples/BlazorInteractiveServer/Components/Layout/NavMenu.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">BlazorInteractiveServer</a>
</div>
</div>

<input type="checkbox" title="Navigation menu" class="navbar-toggler"/>

<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<nav class="flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
</NavLink>
</div>
</nav>
</div>
Loading

0 comments on commit b9f5172

Please sign in to comment.