Merge pull request #219 from DuendeSoftware/joe/remove-blazor

Temporarily revert breaking changes to enable a release
DuendeSoftware · Dec 18, 2024 · c2f6942 · c2f6942
2 parents f95d897 + ae2ae30
commit c2f6942
Show file tree

Hide file tree

Showing 141 changed files with 477 additions and 2,937 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
-# MacOs
-.DS_Store
-
 # Rider
 .idea
 

diff --git a/.run/API.run.xml b/.run/API.run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="API" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/Api/Api.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net6.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="Api" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Infrastucture.run.xml b/.run/Infrastucture.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Infrastucture" type="CompoundRunConfigurationType">
-    <toRun name="Api" type="LaunchSettings" />
     <toRun name="IdentityServer" type="LaunchSettings" />
+    <toRun name="API" type="LaunchSettings" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/JS (.NET 3.1).run.xml b/.run/JS (.NET 3.1).run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="JS (.NET 3.1)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/JS3/JS3.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="LAUNCH_PROFILE_NAME" value="Host3" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/JS (EF).run.xml b/.run/JS (EF).run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="JS (EF)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/JS6.EF/JS6.EF.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net5.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="Host5.EntityFramework" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/SPA (.NET 5).run.xml b/.run/SPA (.NET 5).run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="JS (.NET 5)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/JS5/JS5.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net5.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="Host5" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -32,7 +32,7 @@
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
               "group": "Infrastructure",
               "hidden": false,
@@ -44,13 +44,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api",
-            "program": "${workspaceFolder}/samples/Apis/Api/bin/Debug/net8.0/Api.dll",
+            "program": "${workspaceFolder}/samples/Api/bin/Debug/net8.0/Api.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Apis/Api",
+            "cwd": "${workspaceFolder}/samples/Api",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
                 "group": "Infrastructure",
                 "hidden": false,
@@ -62,13 +62,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api.dpop",
-            "program": "${workspaceFolder}/samples/Apis/Api.DPoP/bin/Debug/net8.0/Api.DPoP.dll",
+            "program": "${workspaceFolder}/samples/Api.DPoP/bin/Debug/net8.0/Api.DPoP.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Apis/Api.DPoP",
+            "cwd": "${workspaceFolder}/samples/Api.DPoP",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
                 "group": "Infrastructure",
                 "hidden": false,
@@ -80,13 +80,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api.isolated",
-            "program": "${workspaceFolder}/samples/Apis/Api.Isolated/bin/Debug/net8.0/Api.Isolated.dll",
+            "program": "${workspaceFolder}/samples/Api.Isolated/bin/Debug/net8.0/Api.Isolated.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Apis/Api.Isolated",
+            "cwd": "${workspaceFolder}/samples/Api.Isolated",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
                 "group": "Infrastructure",
                 "hidden": false,
@@ -108,7 +108,7 @@
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
               "hidden": false,
               "order": 10
@@ -129,7 +129,7 @@
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
               "hidden": false,
               "order": 10
@@ -150,49 +150,28 @@
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "integratedTerminal",
+            "console": "externalTerminal",
             "presentation": {
               "hidden": false,
               "order": 10
             }
         },
         {
-            "name": "Blazor PerComponent",
+            "name": "Blazor Wasm",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build-PerComponent",
-            "program": "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent/bin/Debug/net8.0/PerComponent.dll",
+            "preLaunchTask": "build-blazor.wasm",
+            "program": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/bin/Debug/net8.0/Blazor.Wasm.Bff.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/samples/Blazor/PerComponent/PerComponent",
+            "cwd": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
             "serverReadyAction": {
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
             },
-            "console": "integratedTerminal",
-            "presentation": {
-              "hidden": false,
-              "order": 10
-            }
-        },
-        {
-            "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",
+            "console": "externalTerminal",
             "presentation": {
               "hidden": false,
               "order": 10

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

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -19,7 +19,7 @@
         <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
         <PackageReference Update="Microsoft.Extensions.Http" Version="$(FrameworkVersionRuntime)" />
         <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="$(FrameworkVersionRuntime)" />
-        <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(FrameworkVersionRuntime)"  />
+        <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(FrameworkVersionRuntime)" />
         <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(FrameworkVersionRuntime)" />
         <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="$(FrameworkVersionRuntime)" />
         <PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
@@ -33,8 +33,7 @@
         <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(FrameworkVersionTesting)" />
         <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersionTesting)" />
         <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersionTesting)" />
-        <!-- Test timeprovider is released separately from the framework, so we can't use FrameworkVersionTesting -->
-        <PackageReference Update="Microsoft.Extensions.TimeProvider.Testing" Version="8.8.0" />
+        <PackageReference Update="Microsoft.Extensions.TimeProvider.Testing" Version="$(FrameworkVersionTesting)" />
 
         <PackageReference Update="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
-Original file line number
+Diff line change
@@ -1,6 +1,3 @@
-    # MacOs
-    .DS_Store
     # Rider
     .idea
@@ Expand Down @@