Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 80ff1de

Browse files
josephdecockjosephdecock
authored
Merge pull request #225 from DuendeSoftware/joe/return-of-blazor
Bring back blazor packages
2 parents ef7e7ee + def342f commit 80ff1de

File tree

137 files changed

+3740
-491
lines changed

Some content is hidden

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

137 files changed

+3740
-491
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# MacOs
2+
.DS_Store
3+
14
# Rider
25
.idea
36

‎.run/API.run.xml

-17
This file was deleted.

‎.run/IdentityServer.run.xml

-17
This file was deleted.

‎.run/Infrastucture.run.xml

-7
This file was deleted.

‎.run/JS (.NET 3.1).run.xml

-17
This file was deleted.

‎.run/JS (EF).run.xml

-17
This file was deleted.

‎.run/SPA (.NET 5).run.xml

-17
This file was deleted.

‎.run/UserSessionDb.run.xml

-17
This file was deleted.

‎.vscode/launch.json

+40-19
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"env": {
4242
"ASPNETCORE_ENVIRONMENT": "Development"
4343
},
44-
"console": "externalTerminal",
44+
"console": "integratedTerminal",
4545
"presentation": {
4646
"group": "Infrastructure",
4747
"hidden": false,
@@ -53,13 +53,13 @@
5353
"type": "coreclr",
5454
"request": "launch",
5555
"preLaunchTask": "build-api",
56-
"program": "${workspaceFolder}/samples/Api/bin/Debug/net8.0/Api.dll",
56+
"program": "${workspaceFolder}/samples/Apis/Api/bin/Debug/net8.0/Api.dll",
5757
"args": [],
58-
"cwd": "${workspaceFolder}/samples/Api",
58+
"cwd": "${workspaceFolder}/samples/Apis/Api",
5959
"env": {
6060
"ASPNETCORE_ENVIRONMENT": "Development"
6161
},
62-
"console": "externalTerminal",
62+
"console": "integratedTerminal",
6363
"presentation": {
6464
"group": "Infrastructure",
6565
"hidden": false,
@@ -71,13 +71,13 @@
7171
"type": "coreclr",
7272
"request": "launch",
7373
"preLaunchTask": "build-api.dpop",
74-
"program": "${workspaceFolder}/samples/Api.DPoP/bin/Debug/net8.0/Api.DPoP.dll",
74+
"program": "${workspaceFolder}/samples/Apis/Api.DPoP/bin/Debug/net8.0/Api.DPoP.dll",
7575
"args": [],
76-
"cwd": "${workspaceFolder}/samples/Api.DPoP",
76+
"cwd": "${workspaceFolder}/samples/Apis/Api.DPoP",
7777
"env": {
7878
"ASPNETCORE_ENVIRONMENT": "Development"
7979
},
80-
"console": "externalTerminal",
80+
"console": "integratedTerminal",
8181
"presentation": {
8282
"group": "Infrastructure",
8383
"hidden": false,
@@ -89,13 +89,13 @@
8989
"type": "coreclr",
9090
"request": "launch",
9191
"preLaunchTask": "build-api.isolated",
92-
"program": "${workspaceFolder}/samples/Api.Isolated/bin/Debug/net8.0/Api.Isolated.dll",
92+
"program": "${workspaceFolder}/samples/Apis/Api.Isolated/bin/Debug/net8.0/Api.Isolated.dll",
9393
"args": [],
94-
"cwd": "${workspaceFolder}/samples/Api.Isolated",
94+
"cwd": "${workspaceFolder}/samples/Apis/Api.Isolated",
9595
"env": {
9696
"ASPNETCORE_ENVIRONMENT": "Development"
9797
},
98-
"console": "externalTerminal",
98+
"console": "integratedTerminal",
9999
"presentation": {
100100
"group": "Infrastructure",
101101
"hidden": false,
@@ -138,7 +138,7 @@
138138
"action": "openExternally",
139139
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
140140
},
141-
"console": "externalTerminal",
141+
"console": "integratedTerminal",
142142
"presentation": {
143143
"hidden": false,
144144
"order": 10
@@ -159,7 +159,7 @@
159159
"action": "openExternally",
160160
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
161161
},
162-
"console": "externalTerminal",
162+
"console": "integratedTerminal",
163163
"presentation": {
164164
"hidden": false,
165165
"order": 101
@@ -180,7 +180,7 @@
180180
"action": "openExternally",
181181
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
182182
},
183-
"console": "externalTerminal",
183+
"console": "integratedTerminal",
184184
"presentation": {
185185
"hidden": false,
186186
"order": 11
@@ -229,24 +229,45 @@
229229
}
230230
},
231231
{
232-
"name": "Blazor Wasm",
232+
"name": "Blazor PerComponent",
233233
"type": "coreclr",
234234
"request": "launch",
235-
"preLaunchTask": "build-blazor.wasm",
236-
"program": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/bin/Debug/net8.0/Blazor.Wasm.Bff.dll",
235+
"preLaunchTask": "build-PerComponent",
236+
"program": "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent/bin/Debug/net8.0/PerComponent.dll",
237237
"args": [],
238-
"cwd": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff",
238+
"cwd": "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent",
239239
"env": {
240240
"ASPNETCORE_ENVIRONMENT": "Development"
241241
},
242242
"serverReadyAction": {
243243
"action": "openExternally",
244244
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
245245
},
246-
"console": "externalTerminal",
246+
"console": "integratedTerminal",
247+
"presentation": {
248+
"hidden": false,
249+
"order": 500
250+
}
251+
},
252+
{
253+
"name": "Blazor WebAssembly",
254+
"type": "coreclr",
255+
"request": "launch",
256+
"preLaunchTask": "build-WebAssembly",
257+
"program": "${workspaceFolder}/samples/Blazor/WebAssembly/WebAssembly/bin/Debug/net8.0/WebAssembly.dll",
258+
"args": [],
259+
"cwd": "${workspaceFolder}/samples/Blazor/WebAssembly/WebAssembly",
260+
"env": {
261+
"ASPNETCORE_ENVIRONMENT": "Development"
262+
},
263+
"serverReadyAction": {
264+
"action": "openExternally",
265+
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
266+
},
267+
"console": "integratedTerminal",
247268
"presentation": {
248269
"hidden": false,
249-
"order": 50
270+
"order": 501
250271
}
251272
}
252273
]

‎.vscode/tasks.json

+18-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"command": "dotnet",
3232
"args": [
3333
"build",
34-
"${workspaceFolder}/samples/Api/Api.csproj",
34+
"${workspaceFolder}/samples/Apis/Api/Api.csproj",
3535
"/property:GenerateFullPaths=true",
3636
"/consoleloggerparameters:NoSummary"
3737
],
@@ -43,7 +43,7 @@
4343
"command": "dotnet",
4444
"args": [
4545
"build",
46-
"${workspaceFolder}/samples/Api.DPoP/Api.DPoP.csproj",
46+
"${workspaceFolder}/samples/Apis/Api.DPoP/Api.DPoP.csproj",
4747
"/property:GenerateFullPaths=true",
4848
"/consoleloggerparameters:NoSummary"
4949
],
@@ -55,7 +55,7 @@
5555
"command": "dotnet",
5656
"args": [
5757
"build",
58-
"${workspaceFolder}/samples/Api.Isolated/Api.Isolated.csproj",
58+
"${workspaceFolder}/samples/Apis/Api.Isolated/Api.Isolated.csproj",
5959
"/property:GenerateFullPaths=true",
6060
"/consoleloggerparameters:NoSummary"
6161
],
@@ -140,12 +140,25 @@
140140
"problemMatcher": "$msCompile"
141141
},
142142
{
143-
"label": "build-blazor.wasm",
143+
"label": "build-PerComponent",
144144
"type": "process",
145145
"command": "dotnet",
146146
"args": [
147147
"build",
148-
"${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/Blazor.Wasm.Bff.csproj",
148+
"${workspaceFolder}/samples/Blazor/PerComponent/PerComponent/PerComponent.csproj",
149+
"/property:GenerateFullPaths=true",
150+
"/consoleloggerparameters:NoSummary"
151+
],
152+
"problemMatcher": "$msCompile"
153+
},
154+
155+
{
156+
"label": "build-WebAssembly",
157+
"type": "process",
158+
"command": "dotnet",
159+
"args": [
160+
"build",
161+
"${workspaceFolder}/samples/Blazor/WebAssembly/WebAssembly/WebAssembly.csproj",
149162
"/property:GenerateFullPaths=true",
150163
"/consoleloggerparameters:NoSummary"
151164
],

‎Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<!-- ASP.NET Core -->
3434
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetCoreVersion)" />
3535
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetCoreVersion)" />
36-
<PackageReference Update="Microsoft.AspNet Core.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
36+
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
3737
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion)" />
3838
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(AspNetCoreVersion)" />
3939
<PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="$(AspNetCoreVersion)" />

0 commit comments

Comments
 (0)