Use aspire in bit Boilerplate test project (if enabled) (#11481)

.github/workflows/admin-sample.cd.yml

@@ -56,7 +56,7 @@ jobs:
         AdsPushVapid.PublicKey: ${{ secrets.ADMINPANEL_PUBLIC_VAPIDKEY }}
         ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -113,7 +113,7 @@ jobs:
         AdsPushVapid.PublicKey: ${{ secrets.ADMINPANEL_PUBLIC_VAPIDKEY }}
         ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -183,7 +183,7 @@ jobs:
       with:
         global-json-file: src\global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -248,7 +248,7 @@ jobs:
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
        cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --module Admin --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --ads
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -320,7 +320,7 @@ jobs:
       with:
         xcode-version: '16.4'
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

.github/workflows/bit.ci.yml

@@ -37,7 +37,7 @@ jobs:
         dotnet-version: |
           8.0.x
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -81,7 +81,7 @@ jobs:
         dotnet-version: |
           8.0.x
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

.github/workflows/bit.full.ci.yml

@@ -4,7 +4,6 @@ on:
   workflow_dispatch:
 
 env:
-  ConnectionStrings__sqldb: 'Data Source=localhost; Initial Catalog=BoilerplateTestDb;Application Name=Boilerplate;TrustServerCertificate=True;User Id=sa;Password=P@ssw0rdP@ssw0rd;'
   DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
 
 jobs:
@@ -35,7 +34,7 @@ jobs:
         dotnet-version: |
           8.0.x
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -51,40 +50,32 @@ jobs:
         dotnet workload install maui-tizen maui-android wasm-tools wasm-tools-net9 wasm-tools-net8
         ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
 
-    - name: Run tests usign Sqlite
-      id: run-test-sqlite
+    - name: Run tests using PostgreSQL
+      id: run-test-postgresql
       run: |
-        dotnet new bit-bp --name SimpleTest --database Sqlite
-        cd SimpleTest/src/Server/SimpleTest.Server.Api/
+        dotnet new bit-bp --name TestPostgreSQL --database PostgreSQL --module Sales --signalR --aspire
+        cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Api/
         dotnet build
         dotnet tool restore
         dotnet ef migrations add Initial --verbose
-        dotnet ef database update
         cd ../../Tests
         dotnet build
         pwsh bin/Debug/net10.0/playwright.ps1 install --with-deps
         dotnet test
 
     - name: Upload Tests Artifact
       uses: actions/upload-artifact@v4.4.1
-      if: ${{ !env.ACT && failure() && steps.run-test-sqlite.conclusion == 'failure' }}
+      if: ${{ !env.ACT && failure() && steps.run-test-postgresql.conclusion == 'failure' }}
       with:
         name: tests-artifact
-        path: ./SimpleTest/src/Tests/TestResults
+        path: ./TestPostgreSQL/src/Tests/TestResults
         retention-days: 14
 
-    - name: Install sql server
-      uses: potatoqualitee/mssqlsuite@v1.7
-      with:
-        install: sqlengine
-        sa-password: P@ssw0rdP@ssw0rd
-        show-log: true
-
-    - name: Run tests usign SQL Server
-      id: run-test-sqlserver
+    - name: Run tests using Sqlite
+      id: run-test-sqlite
       run: |
-        dotnet new bit-bp --name TestSqlServer --database SqlServer --module Sales --signalR
-        cd TestSqlServer/src/Server/TestSqlServer.Server.Api/
+        dotnet new bit-bp --name SimpleTest --database Sqlite --aspire false
+        cd SimpleTest/src/Server/SimpleTest.Server.Api/
         dotnet build
         dotnet tool restore
         dotnet ef migrations add Initial --verbose
@@ -96,24 +87,24 @@ jobs:
 
     - name: Upload Tests Artifact
       uses: actions/upload-artifact@v4.4.1
-      if: ${{ !env.ACT && failure() && steps.run-test-sqlserver.conclusion == 'failure' }}
+      if: ${{ !env.ACT && failure() && steps.run-test-sqlite.conclusion == 'failure' }}
       with:
         name: tests-artifact
-        path: ./TestSqlServer/src/Tests/TestResults
+        path: ./SimpleTest/src/Tests/TestResults
         retention-days: 14
 
     - name: Cleanup test projects to free disk space
       run: |
         rm -rf SimpleTest
-        rm -rf TestSqlServer
+        rm -rf TestPostgreSQL
 
-    - name: Build PostgreSQL and Other database options
+    - name: Build SQLServer and Other database options
       run: |
-        dotnet new bit-bp --name TestPostgreSQL --database PostgreSQL --module Sales --signalR
-        cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Web/
+        dotnet new bit-bp --name SQLServer --database SQLServer --module Sales --signalR
+        cd SQLServer/src/Server/SQLServer.Server.Web/
         dotnet build
         cd ../../../../
-        rm -r "TestPostgreSQL"
+        rm -r "SQLServer"
         dotnet new bit-bp --name TestOther --database Other --sample --sentry
         cd TestOther/src/Server/TestOther.Server.Web/
         dotnet build

.github/workflows/blazorui.demo.cd.yml

@@ -35,7 +35,7 @@ jobs:
       env:
         ApiServerAddress: ${{ env.SERVER_ADDRESS }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -102,7 +102,7 @@ jobs:
       with:
         global-json-file: src\global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -144,7 +144,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -198,7 +198,7 @@ jobs:
       with:
         xcode-version: '16.4'
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

.github/workflows/nuget.org.yml

@@ -28,7 +28,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

.github/workflows/prerelease.nuget.org.yml

@@ -19,7 +19,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

.github/workflows/sales-module-demo.cd.yml

@@ -31,7 +31,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -127,7 +127,7 @@ jobs:
       with:
         global-json-file: src\global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

.github/workflows/todo-sample.cd.yml

@@ -31,7 +31,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -144,7 +144,7 @@ jobs:
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -196,7 +196,7 @@ jobs:
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -252,7 +252,7 @@ jobs:
         ServerAddress: ${{ env.SERVER_ADDRESS }}
         GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -289,7 +289,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -347,7 +347,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 
@@ -442,7 +442,7 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd-template.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           global-json-file: global.json
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 23
 
@@ -112,7 +112,7 @@ jobs:
         with:
           global-json-file: global.json
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 23
 
@@ -159,7 +159,7 @@ jobs:
         with:
           global-json-file: global.json
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 23
 
@@ -221,7 +221,7 @@ jobs:
         with:
           xcode-version: '16.4'
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 23
 

src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       with:
         global-json-file: global.json
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 23
 

src/Templates/Boilerplate/Bit.Boilerplate/.vscode/extensions.json

@@ -7,7 +7,6 @@
         "ms-dotnettools.csdevkit",
         "ms-dotnettools.dotnet-maui",
         "ms-azuretools.vscode-docker",
-        "DominicVonk.vscode-resx-editor",
         "ms-vscode-remote.remote-containers",
         "ms-dotnettools.blazorwasm-companion",
         "ms-dotnettools.vscode-dotnet-runtime"

src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props

@@ -32,7 +32,7 @@
         <DefineConstants Condition=" '$(InvariantGlobalization)' == 'true' ">$(DefineConstants);InvariantGlobalization</DefineConstants>
         <DefineConstants>$(DefineConstants);$(Environment);$(Configuration)</DefineConstants>
         <DefineConstants Condition="$(Configuration.Contains('Debug'))">$(DefineConstants);DEBUG</DefineConstants>
-
+        
         <HotReloadAutoRestart>true</HotReloadAutoRestart>
         <CompressionEnabled Condition="'$(Environment)' == 'Development'">false</CompressionEnabled>
     </PropertyGroup>

src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props

@@ -50,6 +50,7 @@
         <PackageVersion Include="Microsoft.Extensions.Logging.EventLog" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Microsoft.Extensions.Logging.EventSource" Version="10.0.0-rc.1.25451.107" />
         <!--/+:msbuild-conditional:noEmit -->
+        <PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.Testing" Version="9.5.1" />
         <PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="CommunityToolkit.Aspire.Hosting.MailPit" Version="9.8.0" />
         <PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.DevTunnels" Version="9.5.1-preview.1.25502.11" />
         <PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.AppHost" Version="9.5.1" />
@@ -110,14 +111,14 @@
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
-        <PackageVersion Include="Microsoft.Identity.Web" Version="3.14.1" />
+        <PackageVersion Include="Microsoft.Identity.Web" Version="4.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="AspNet.Security.OAuth.Apple" Version="9.4.1" />
         <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="9.4.1" />
         <PackageVersion Include="Riok.Mapperly" Version="4.2.1" />
-        <PackageVersion Include="Twilio" Version="7.13.3" />
+        <PackageVersion Include="Twilio" Version="7.13.4" />
         <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.0-rc.1.25451.107" />
         <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" />

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/appsettings.json

@@ -1,12 +1,10 @@
 {
     "ConnectionStrings": {
         //#if (aspire == true)
-        "Aspire__Comment": "Running Boilerplate.Server.AppHost `overrides` the following connection strings at runtime, but including them here provides two benefits:",
-        "Aspire__Comment_1": "Most Aspire resources use Docker, but if team members run Server.Api or Server.Web directly without Docker or wanna using Visual Studio / WSL, these connection strings ensure functionality.",
-        "Aspire__Comment_2": "The Boilerplate.Tests project runs Server.Web and Server.Api directly, bypassing Aspire, to allow replacing app's registered service in tests, enhancing the test-writing experience. These connection strings are also used by the integration API and UI tests.",
+        "Aspire__Comment": "Running Boilerplate.Server.AppHost `overrides` the following connection strings at runtime.",
         //#endif
         //#if (database == "SqlServer")
-        "sqldb": "Data Source=(localdb)\\mssqllocaldb; Initial Catalog=BoilerplateDb;Integrated Security=true;Application Name=Boilerplate;TrustServerCertificate=True;",
+        "mssqldb": "Data Source=(localdb)\\mssqllocaldb; Initial Catalog=BoilerplateDb;Integrated Security=true;Application Name=Boilerplate;TrustServerCertificate=True;",
         //#elif (database == "Sqlite")
         "sqlite": "Data Source=App_Data/BoilerplateDb.db;",
         "sqlite_Comment": "To debug inside docker, change ConnectionStrings__sqlite's value in launchSettings.json",