Merge pull request #225 from DuendeSoftware/joe/return-of-blazor

Bring back blazor packages
DuendeSoftware · Jan 2, 2025 · 80ff1de · 80ff1de
2 parents ef7e7ee + def342f
commit 80ff1de
Show file tree

Hide file tree

Showing 137 changed files with 3,740 additions and 491 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# MacOs
+.DS_Store
+
 # Rider
 .idea
 

diff --git a/.run/API.run.xml b/.run/API.run.xml
diff --git a/.run/IdentityServer.run.xml b/.run/IdentityServer.run.xml
diff --git a/.run/Infrastucture.run.xml b/.run/Infrastucture.run.xml
diff --git a/.run/JS (.NET 3.1).run.xml b/.run/JS (.NET 3.1).run.xml
diff --git a/.run/JS (EF).run.xml b/.run/JS (EF).run.xml
diff --git a/.run/SPA (.NET 5).run.xml b/.run/SPA (.NET 5).run.xml
diff --git a/.run/UserSessionDb.run.xml b/.run/UserSessionDb.run.xml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -41,7 +41,7 @@
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
               "group": "Infrastructure",
               "hidden": false,
@@ -53,13 +53,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api",
-            "program": "${workspaceFolder}/samples/Api/bin/Debug/net8.0/Api.dll",
+            "program": "${workspaceFolder}/samples/Apis/Api/bin/Debug/net8.0/Api.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Api",
+            "cwd": "${workspaceFolder}/samples/Apis/Api",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
                 "group": "Infrastructure",
                 "hidden": false,
@@ -71,13 +71,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api.dpop",
-            "program": "${workspaceFolder}/samples/Api.DPoP/bin/Debug/net8.0/Api.DPoP.dll",
+            "program": "${workspaceFolder}/samples/Apis/Api.DPoP/bin/Debug/net8.0/Api.DPoP.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Api.DPoP",
+            "cwd": "${workspaceFolder}/samples/Apis/Api.DPoP",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
                 "group": "Infrastructure",
                 "hidden": false,
@@ -89,13 +89,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api.isolated",
-            "program": "${workspaceFolder}/samples/Api.Isolated/bin/Debug/net8.0/Api.Isolated.dll",
+            "program": "${workspaceFolder}/samples/Apis/Api.Isolated/bin/Debug/net8.0/Api.Isolated.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Api.Isolated",
+            "cwd": "${workspaceFolder}/samples/Apis/Api.Isolated",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
                 "group": "Infrastructure",
                 "hidden": false,
@@ -138,7 +138,7 @@
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
               "hidden": false,
               "order": 10
@@ -159,7 +159,7 @@
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
               "hidden": false,
               "order": 101
@@ -180,7 +180,7 @@
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
             "presentation": {
               "hidden": false,
               "order": 11
@@ -229,24 +229,45 @@
             }
         },
         {
-            "name": "Blazor Wasm",
+            "name": "Blazor PerComponent",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build-blazor.wasm",
-            "program": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/bin/Debug/net8.0/Blazor.Wasm.Bff.dll",
+            "preLaunchTask": "build-PerComponent",
+            "program": "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent/bin/Debug/net8.0/PerComponent.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff",
+            "cwd": "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
             "serverReadyAction": {
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "externalTerminal",
+            "console": "integratedTerminal",
+            "presentation": {
+              "hidden": false,
+              "order": 500
+            }
+        },
+        {
+            "name": "Blazor WebAssembly",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-WebAssembly",
+            "program": "${workspaceFolder}/samples/Blazor/WebAssembly/WebAssembly/bin/Debug/net8.0/WebAssembly.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/samples/Blazor/WebAssembly/WebAssembly",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "console": "integratedTerminal",
             "presentation": {
               "hidden": false,
-              "order": 50
+              "order": 501
             }
         }
     ]

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -31,7 +31,7 @@
         "command": "dotnet",
         "args": [
             "build",
-            "${workspaceFolder}/samples/Api/Api.csproj",
+            "${workspaceFolder}/samples/Apis/Api/Api.csproj",
             "/property:GenerateFullPaths=true",
             "/consoleloggerparameters:NoSummary"
         ],
@@ -43,7 +43,7 @@
         "command": "dotnet",
         "args": [
             "build",
-            "${workspaceFolder}/samples/Api.DPoP/Api.DPoP.csproj",
+            "${workspaceFolder}/samples/Apis/Api.DPoP/Api.DPoP.csproj",
             "/property:GenerateFullPaths=true",
             "/consoleloggerparameters:NoSummary"
         ],
@@ -55,7 +55,7 @@
         "command": "dotnet",
         "args": [
             "build",
-            "${workspaceFolder}/samples/Api.Isolated/Api.Isolated.csproj",
+            "${workspaceFolder}/samples/Apis/Api.Isolated/Api.Isolated.csproj",
             "/property:GenerateFullPaths=true",
             "/consoleloggerparameters:NoSummary"
         ],
@@ -140,12 +140,25 @@
         "problemMatcher": "$msCompile"
       },
       {
-        "label": "build-blazor.wasm",
+        "label": "build-PerComponent",
         "type": "process",
         "command": "dotnet",
         "args": [
             "build",
-            "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/Blazor.Wasm.Bff.csproj",
+            "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent/PerComponent.csproj",
+            "/property:GenerateFullPaths=true",
+            "/consoleloggerparameters:NoSummary"
+        ],
+        "problemMatcher": "$msCompile"
+      },
+
+      {
+        "label": "build-WebAssembly",
+        "type": "process",
+        "command": "dotnet",
+        "args": [
+            "build",
+            "${workspaceFolder}/samples/Blazor/WebAssembly/WebAssembly/WebAssembly.csproj",
             "/property:GenerateFullPaths=true",
             "/consoleloggerparameters:NoSummary"
         ],

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -33,7 +33,7 @@
         <!-- ASP.NET Core -->
         <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetCoreVersion)" />
         <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetCoreVersion)" />
-        <PackageReference Update="Microsoft.AspNet Core.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
+        <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
         <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion)" />
         <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(AspNetCoreVersion)" />
         <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="$(AspNetCoreVersion)" />
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    # MacOs
+    .DS_Store
     # Rider
     .idea
@@ Expand Down @@