Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4c61fc9

Browse files
egilegil
authored
Upgrade orleans blazor sample (#7012)
* Update to latest blazor server and dotnet * Upgrade wasm server to dotnet 9
1 parent 169f147 commit 4c61fc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+670
-1471
lines changed

‎orleans/Blazor/BlazorServer/App.razor

-10
This file was deleted.

‎orleans/Blazor/BlazorServer/BlazorServer.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
4+
<TargetFramework>net9.0</TargetFramework>
65
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0" />
11-
<PackageReference Include="Microsoft.Orleans.Streaming" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.Orleans.Server" Version="9.0.1" />
11+
<PackageReference Include="Microsoft.Orleans.Streaming" Version="9.0.1" />
1212
</ItemGroup>
1313

1414
</Project>

‎orleans/Blazor/BlazorServer/BlazorServer.sln

+6-26
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,22 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.9.34701.34
4+
VisualStudioVersion = 17.12.35527.113 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "BlazorServer.csproj", "{EB758977-3FA0-450C-9862-D3EFC6A3C019}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F38AA530-C62F-48B9-B85C-95100081981F}"
9-
ProjectSection(SolutionItems) = preProject
10-
README.md = README.md
11-
EndProjectSection
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorServer", "BlazorServer.csproj", "{F0F13D9C-E653-46F8-8104-8391CFF98603}"
127
EndProject
138
Global
149
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1510
Debug|Any CPU = Debug|Any CPU
16-
Debug|x64 = Debug|x64
17-
Debug|x86 = Debug|x86
1811
Release|Any CPU = Release|Any CPU
19-
Release|x64 = Release|x64
20-
Release|x86 = Release|x86
2112
EndGlobalSection
2213
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x64.ActiveCfg = Debug|Any CPU
26-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x64.Build.0 = Debug|Any CPU
27-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x86.ActiveCfg = Debug|Any CPU
28-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|x86.Build.0 = Debug|Any CPU
29-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x64.ActiveCfg = Release|Any CPU
32-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x64.Build.0 = Release|Any CPU
33-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x86.ActiveCfg = Release|Any CPU
34-
{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x86.Build.0 = Release|Any CPU
14+
{F0F13D9C-E653-46F8-8104-8391CFF98603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{F0F13D9C-E653-46F8-8104-8391CFF98603}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{F0F13D9C-E653-46F8-8104-8391CFF98603}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{F0F13D9C-E653-46F8-8104-8391CFF98603}.Release|Any CPU.Build.0 = Release|Any CPU
3518
EndGlobalSection
3619
GlobalSection(SolutionProperties) = preSolution
3720
HideSolutionNode = FALSE
3821
EndGlobalSection
39-
GlobalSection(ExtensibilityGlobals) = postSolution
40-
SolutionGuid = {2410FA5C-535D-4486-BE8A-650E9C8DB2D3}
41-
EndGlobalSection
4222
EndGlobal

‎orleans/Blazor/BlazorServer/Components/App.razor

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="utf-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<base href="/" />
8+
<link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
9+
<link rel="stylesheet" href="@Assets["app.css"]" />
10+
<link rel="stylesheet" href="@Assets["BlazorServer.styles.css"]" />
11+
<ImportMap />
12+
<link rel="icon" type="image/png" href="favicon.png" />
13+
<HeadOutlet @rendermode="@InteractiveServer" />
14+
</head>
15+
16+
<body>
17+
<Routes @rendermode="@InteractiveServer" />
18+
<script src="_framework/blazor.web.js"></script>
19+
</body>
20+
21+
</html>

‎orleans/Blazor/BlazorServer/Components/Layout/MainLayout.razor

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@inherits LayoutComponentBase
2+
3+
<div class="page">
4+
<div class="sidebar">
5+
<NavMenu />
6+
</div>
7+
8+
<main>
9+
<div class="top-row px-4">
10+
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
11+
</div>
12+
13+
<article class="content px-4">
14+
@Body
15+
</article>
16+
</main>
17+
</div>
18+
19+
<div id="blazor-error-ui" data-nosnippet>
20+
An unhandled error has occurred.
21+
<a href="." class="reload">Reload</a>
22+
<span class="dismiss">🗙</span>
23+
</div>

‎orleans/Blazor/BlazorServer/Components/Layout/MainLayout.razor.css

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
.page {
2+
position: relative;
3+
display: flex;
4+
flex-direction: column;
5+
}
6+
7+
main {
8+
flex: 1;
9+
}
10+
11+
.sidebar {
12+
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
13+
}
14+
15+
.top-row {
16+
background-color: #f7f7f7;
17+
border-bottom: 1px solid #d6d5d5;
18+
justify-content: flex-end;
19+
height: 3.5rem;
20+
display: flex;
21+
align-items: center;
22+
}
23+
24+
.top-row ::deep a, .top-row ::deep .btn-link {
25+
white-space: nowrap;
26+
margin-left: 1.5rem;
27+
text-decoration: none;
28+
}
29+
30+
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
31+
text-decoration: underline;
32+
}
33+
34+
.top-row ::deep a:first-child {
35+
overflow: hidden;
36+
text-overflow: ellipsis;
37+
}
38+
39+
@media (max-width: 640.98px) {
40+
.top-row {
41+
justify-content: space-between;
42+
}
43+
44+
.top-row ::deep a, .top-row ::deep .btn-link {
45+
margin-left: 0;
46+
}
47+
}
48+
49+
@media (min-width: 641px) {
50+
.page {
51+
flex-direction: row;
52+
}
53+
54+
.sidebar {
55+
width: 250px;
56+
height: 100vh;
57+
position: sticky;
58+
top: 0;
59+
}
60+
61+
.top-row {
62+
position: sticky;
63+
top: 0;
64+
z-index: 1;
65+
}
66+
67+
.top-row.auth ::deep a:first-child {
68+
flex: 1;
69+
text-align: right;
70+
width: 0;
71+
}
72+
73+
.top-row, article {
74+
padding-left: 2rem !important;
75+
padding-right: 1.5rem !important;
76+
}
77+
}
78+
79+
#blazor-error-ui {
80+
color-scheme: light only;
81+
background: lightyellow;
82+
bottom: 0;
83+
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
84+
box-sizing: border-box;
85+
display: none;
86+
left: 0;
87+
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
88+
position: fixed;
89+
width: 100%;
90+
z-index: 1000;
91+
}
92+
93+
#blazor-error-ui .dismiss {
94+
cursor: pointer;
95+
position: absolute;
96+
right: 0.75rem;
97+
top: 0.5rem;
98+
}

‎orleans/Blazor/BlazorServer/Components/Layout/NavMenu.razor

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<div class="top-row ps-3 navbar navbar-dark">
2+
<div class="container-fluid">
3+
<a class="navbar-brand" href="">BlazorServer</a>
4+
</div>
5+
</div>
6+
7+
<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
8+
9+
<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
10+
<nav class="nav flex-column">
11+
<div class="nav-item px-3">
12+
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
13+
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
14+
</NavLink>
15+
</div>
16+
17+
<div class="nav-item px-3">
18+
<NavLink class="nav-link" href="counter">
19+
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
20+
</NavLink>
21+
</div>
22+
23+
<div class="nav-item px-3">
24+
<NavLink class="nav-link" href="weather">
25+
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
26+
</NavLink>
27+
</div>
28+
29+
<div class="nav-item px-3">
30+
<NavLink class="nav-link" href="todo">
31+
<span class="bi bi-list-check" aria-hidden="true"></span> Todo
32+
</NavLink>
33+
</div>
34+
</nav>
35+
</div>
36+

‎orleans/Blazor/BlazorServer/Components/Layout/NavMenu.razor.css

+109
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
.navbar-toggler {
2+
appearance: none;
3+
cursor: pointer;
4+
width: 3.5rem;
5+
height: 2.5rem;
6+
color: white;
7+
position: absolute;
8+
top: 0.5rem;
9+
right: 1rem;
10+
border: 1px solid rgba(255, 255, 255, 0.1);
11+
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);
12+
}
13+
14+
.navbar-toggler:checked {
15+
background-color: rgba(255, 255, 255, 0.5);
16+
}
17+
18+
.top-row {
19+
min-height: 3.5rem;
20+
background-color: rgba(0,0,0,0.4);
21+
}
22+
23+
.navbar-brand {
24+
font-size: 1.1rem;
25+
}
26+
27+
.bi {
28+
display: inline-block;
29+
position: relative;
30+
width: 1.25rem;
31+
height: 1.25rem;
32+
margin-right: 0.75rem;
33+
top: -1px;
34+
background-size: cover;
35+
}
36+
37+
.bi-house-door-fill-nav-menu {
38+
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");
39+
}
40+
41+
.bi-plus-square-fill-nav-menu {
42+
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");
43+
}
44+
45+
.bi-list-nested-nav-menu {
46+
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");
47+
}
48+
49+
.bi-list-check {
50+
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");
51+
}
52+
53+
.nav-item {
54+
font-size: 0.9rem;
55+
padding-bottom: 0.5rem;
56+
}
57+
58+
.nav-item:first-of-type {
59+
padding-top: 1rem;
60+
}
61+
62+
.nav-item:last-of-type {
63+
padding-bottom: 1rem;
64+
}
65+
66+
.nav-item ::deep .nav-link {
67+
color: #d7d7d7;
68+
background: none;
69+
border: none;
70+
border-radius: 4px;
71+
height: 3rem;
72+
display: flex;
73+
align-items: center;
74+
line-height: 3rem;
75+
width: 100%;
76+
}
77+
78+
.nav-item ::deep a.active {
79+
background-color: rgba(255,255,255,0.37);
80+
color: white;
81+
}
82+
83+
.nav-item ::deep .nav-link:hover {
84+
background-color: rgba(255,255,255,0.1);
85+
color: white;
86+
}
87+
88+
.nav-scrollable {
89+
display: none;
90+
}
91+
92+
.navbar-toggler:checked ~ .nav-scrollable {
93+
display: block;
94+
}
95+
96+
@media (min-width: 641px) {
97+
.navbar-toggler {
98+
display: none;
99+
}
100+
101+
.nav-scrollable {
102+
/* Never collapse the sidebar for wide screens */
103+
display: block;
104+
105+
/* Allow sidebar to scroll for tall menus */
106+
height: calc(100vh - 3.5rem);
107+
overflow-y: auto;
108+
}
109+
}

‎orleans/Blazor/BlazorServer/Pages/Counter.razor renamed to ‎orleans/Blazor/BlazorServer/Components/Pages/Counter.razor

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
@page "/counter"
2+
<PageTitle>Counter</PageTitle>
23

34
<h1>Counter</h1>
45

5-
<p>Current count: @currentCount</p>
6+
<p role="status">Current count: @currentCount</p>
67

78
<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
89

0 commit comments

Comments
 (0)