-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade orleans blazor sample (#7012)
* Update to latest blazor server and dotnet * Upgrade wasm server to dotnet 9
- Loading branch information
Showing
66 changed files
with
670 additions
and
1,471 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0" /> | ||
| <PackageReference Include="Microsoft.Orleans.Streaming" Version="8.0.0" /> | ||
| <PackageReference Include="Microsoft.Orleans.Server" Version="9.0.1" /> | ||
| <PackageReference Include="Microsoft.Orleans.Streaming" Version="9.0.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,22 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.9.34701.34 | ||
| VisualStudioVersion = 17.12.35527.113 d17.12 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "BlazorServer.csproj", "{EB758977-3FA0-450C-9862-D3EFC6A3C019}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F38AA530-C62F-48B9-B85C-95100081981F}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| README.md = README.md | ||
| EndProjectSection | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorServer", "BlazorServer.csproj", "{F0F13D9C-E653-46F8-8104-8391CFF98603}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Debug|x64 = Debug|x64 | ||
| Debug|x86 = Debug|x86 | ||
| Release|Any CPU = Release|Any CPU | ||
| Release|x64 = Release|x64 | ||
| Release|x86 = Release|x86 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x64.Build.0 = Debug|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x86.Build.0 = Debug|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x64.ActiveCfg = Release|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x64.Build.0 = Release|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x86.ActiveCfg = Release|Any CPU | ||
| {EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x86.Build.0 = Release|Any CPU | ||
| {F0F13D9C-E653-46F8-8104-8391CFF98603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {F0F13D9C-E653-46F8-8104-8391CFF98603}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {F0F13D9C-E653-46F8-8104-8391CFF98603}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {F0F13D9C-E653-46F8-8104-8391CFF98603}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {2410FA5C-535D-4486-BE8A-650E9C8DB2D3} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <!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="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" /> | ||
| <link rel="stylesheet" href="@Assets["app.css"]" /> | ||
| <link rel="stylesheet" href="@Assets["BlazorServer.styles.css"]" /> | ||
| <ImportMap /> | ||
| <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> |
23 changes: 23 additions & 0 deletions
23
orleans/Blazor/BlazorServer/Components/Layout/MainLayout.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| @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> | ||
|
|
||
| <div id="blazor-error-ui" data-nosnippet> | ||
| An unhandled error has occurred. | ||
| <a href="." class="reload">Reload</a> | ||
| <span class="dismiss">🗙</span> | ||
| </div> |
98 changes: 98 additions & 0 deletions
98
orleans/Blazor/BlazorServer/Components/Layout/MainLayout.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| .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 { | ||
| color-scheme: light only; | ||
| background: lightyellow; | ||
| bottom: 0; | ||
| box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); | ||
| box-sizing: border-box; | ||
| 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; | ||
| } |
36 changes: 36 additions & 0 deletions
36
orleans/Blazor/BlazorServer/Components/Layout/NavMenu.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <div class="top-row ps-3 navbar navbar-dark"> | ||
| <div class="container-fluid"> | ||
| <a class="navbar-brand" href="">BlazorServer</a> | ||
| </div> | ||
| </div> | ||
|
|
||
| <input type="checkbox" title="Navigation menu" class="navbar-toggler" /> | ||
|
|
||
| <div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()"> | ||
| <nav class="nav 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> | ||
|
|
||
| <div class="nav-item px-3"> | ||
| <NavLink class="nav-link" href="counter"> | ||
| <span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter | ||
| </NavLink> | ||
| </div> | ||
|
|
||
| <div class="nav-item px-3"> | ||
| <NavLink class="nav-link" href="weather"> | ||
| <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather | ||
| </NavLink> | ||
| </div> | ||
|
|
||
| <div class="nav-item px-3"> | ||
| <NavLink class="nav-link" href="todo"> | ||
| <span class="bi bi-list-check" aria-hidden="true"></span> Todo | ||
| </NavLink> | ||
| </div> | ||
| </nav> | ||
| </div> | ||
|
|
109 changes: 109 additions & 0 deletions
109
orleans/Blazor/BlazorServer/Components/Layout/NavMenu.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| .navbar-toggler { | ||
| appearance: none; | ||
| cursor: pointer; | ||
| width: 3.5rem; | ||
| height: 2.5rem; | ||
| color: white; | ||
| position: absolute; | ||
| top: 0.5rem; | ||
| right: 1rem; | ||
| border: 1px solid rgba(255, 255, 255, 0.1); | ||
| background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); | ||
| } | ||
|
|
||
| .navbar-toggler:checked { | ||
| background-color: rgba(255, 255, 255, 0.5); | ||
| } | ||
|
|
||
| .top-row { | ||
| min-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"); | ||
| } | ||
|
|
||
| .bi-list-check { | ||
| 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-check' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M5 11.5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5m0-4a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5m0-4a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5M3.854 2.146a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708L2 3.293l1.146-1.147a.5.5 0 0 1 .708 0m0 4a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708L2 7.293l1.146-1.147a.5.5 0 0 1 .708 0m0 4a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 0 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0' /%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 .nav-link { | ||
| color: #d7d7d7; | ||
| background: none; | ||
| border: none; | ||
| border-radius: 4px; | ||
| height: 3rem; | ||
| display: flex; | ||
| align-items: center; | ||
| line-height: 3rem; | ||
| width: 100%; | ||
| } | ||
|
|
||
| .nav-item ::deep a.active { | ||
| background-color: rgba(255,255,255,0.37); | ||
| color: white; | ||
| } | ||
|
|
||
| .nav-item ::deep .nav-link:hover { | ||
| background-color: rgba(255,255,255,0.1); | ||
| color: white; | ||
| } | ||
|
|
||
| .nav-scrollable { | ||
| display: none; | ||
| } | ||
|
|
||
| .navbar-toggler:checked ~ .nav-scrollable { | ||
| display: block; | ||
| } | ||
|
|
||
| @media (min-width: 641px) { | ||
| .navbar-toggler { | ||
| display: none; | ||
| } | ||
|
|
||
| .nav-scrollable { | ||
| /* Never collapse the sidebar for wide screens */ | ||
| display: block; | ||
|
|
||
| /* Allow sidebar to scroll for tall menus */ | ||
| height: calc(100vh - 3.5rem); | ||
| overflow-y: auto; | ||
| } | ||
| } |
3 changes: 2 additions & 1 deletion
3
...s/Blazor/BlazorServer/Pages/Counter.razor → ...azorServer/Components/Pages/Counter.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.