Merged with the current branch

Removed non-bootstrap features Fixed bug causing child content to throw nullrefs if the content are in a error state
vikramlearning · Dec 6, 2024 · 25208e8 · 25208e8
2 parents dbbdb37 + fbc0fd8
commit 25208e8
Show file tree

Hide file tree

Showing 282 changed files with 7,281 additions and 4,372 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,6 +6,8 @@ labels: ''
 assignees: ''
 ---
 
+> NOTE: We do not look at .zip attachments for issue investigation.
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -23,7 +25,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Versions (please complete the following information):**
- - .NET Version: [e.g. .NET 6, .NET 7, .NET 8]
+ - .NET Version: [e.g. .NET 6, .NET 7, .NET 8, .NET 9]
  - BlazorBootstrap: [e.g. 2.0.0, 2.1.0, 2.2.0]
  - Blazor WebAssembly / Server: [e.g. WebAssembly, Server]
  - Blazor Interactive Render Mode: [e.g. Auto, Server, WebAssembly, None]

diff --git a/.github/workflows/static-web-app.yml b/.github/workflows/static-web-app.yml
@@ -29,13 +29,13 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Build And Deploy
         id: builddeploy
         uses: Azure/static-web-apps-deploy@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GRAY_WAVE_0E4848710 }}
           skip_deploy_on_missing_secrets: true
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)

diff --git a/.github/workflows/web-app.yml b/.github/workflows/web-app.yml
@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up .NET 8.0.x
+      - name: Set up .NET 9.0.x
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
           include-prerelease: false
 
       - name: Build
@@ -32,7 +32,7 @@ jobs:
         run: dotnet publish ./BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj -c Release -o ${{env.DOTNET_ROOT}}/myapp
 
       - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: .net-app
           path: ${{env.DOTNET_ROOT}}/myapp
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Download artifact from build job
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: .net-app
 

diff --git a/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj b/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json b/BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
 {
-  "version": "3.0.0",
+  "version": "3.2.0",
   "release": {
-    "short_description": "New Carousel, Google Map, Image, Polar Area Chart, Radar Chart, Scatter Chart components, and other improvements!!!"
+    "short_description": "New MainLayout and Theme Switcher components, along with other enhancements!!!"
   },
   "urls": {
     "docs": "//docs.blazorbootstrap.com/docs/getting-started/blazor-webassembly",
@@ -13,5 +13,6 @@
     "github_issues": "//github.com/vikramlearning/blazorbootstrap/issues",
     "github_discussions": "//github.com/vikramlearning/blazorbootstrap/discussions",
     "stackoverflow": "//stackoverflow.com/questions/tagged/blazor-bootstrap"
-  }
+  },
+  "dotNetVersion": "9.0.0"
 }
diff --git a/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj b/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorBootstrap.Demo.Hosted/Server/Pages/_Host.cshtml b/BlazorBootstrap.Demo.Hosted/Server/Pages/_Host.cshtml
@@ -50,7 +50,7 @@
     <script src="_framework/blazor.webassembly.js" autostart="false" asp-append-version="true"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
     <!-- Add chart.js reference if chart components are used in your application. -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.0.1/chart.umd.js" integrity="sha512-gQhCDsnnnUfaRzD8k1L5llCCV6O9HN09zClIzzeJ8OJ9MpGmIlCxm+pdCkqTwqJ4JcjbojFr79rl2F1mzcoLMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js" integrity="sha512-ZwR1/gSZM3ai6vCdI+LVF1zSq/5HznD3ZSTk7kajkaj4D292NLuduDCO1c/NT8Id+jE58KYLKT7hXnbtryGmMg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <!-- Add chartjs-plugin-datalabels.min.js reference if chart components with data label feature is used in your application. -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js" integrity="sha512-JPcRR8yFa8mmCsfrw4TNte1ZvF1e3+1SdGMslZvmrzDYxS69J7J49vkFL8u6u8PlPJK+H3voElBtUCzaXj+6ig==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <!-- Add sortable.js reference if SortableList component is used in your application. -->

diff --git a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor b/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor
@@ -1,6 +1,5 @@
 @namespace BlazorBootstrap.Demo.RCL
-
-@inherits LayoutComponentBase
+@inherits MainLayoutBase
 
 <Skippy Url="https://github.com/vikramlearning/blazorbootstrap">
     <i class="bi bi-star-fill"></i>
@@ -32,38 +31,45 @@
                 <hr class="d-lg-none text-white-50">
                 <ul class="navbar-nav flex-row flex-wrap bd-navbar-nav">
                     <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="/getting-started/blazor-webassembly">Demos</a></li>
-                    <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="@docsUrl" target="_blank" rel="noopener">Docs</a></li>
-                    <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="@blogUrl" target="_blank" rel="noopener">Blog</a></li>
-                    <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="@githubUrl" target="_blank" rel="noopener">GitHub</a></li>
+                    <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="@DocsUrl" target="_blank" rel="noopener">Docs</a></li>
+                    <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="@BlogUrl" target="_blank" rel="noopener">Blog</a></li>
+                    <li class="nav-item col-6 col-lg-auto"><a class="nav-link py-2 px-0 px-lg-2" href="@GithubUrl" target="_blank" rel="noopener">GitHub</a></li>
                 </ul>
 
                 <hr class="d-lg-none text-white-50">
 
                 <ul class="navbar-nav flex-row flex-wrap ms-md-auto">
                     <li class="nav-item col-6 col-lg-auto">
-                        <a class="nav-link py-2 px-0 px-lg-2" href="@githubUrl" target="_blank" rel="noopener">
+                        <a class="nav-link py-2 px-0 px-lg-2" href="@GithubUrl" target="_blank" rel="noopener">
                             <i class="bi bi-github"></i>
                             <small class="d-lg-none ms-2">GitHub</small>
                         </a>
                     </li>
                     <li class="nav-item col-6 col-lg-auto">
-                        <a class="nav-link py-2 px-0 px-lg-2" href="@twitterUrl" target="_blank" rel="noopener">
+                        <a class="nav-link py-2 px-0 px-lg-2" href="@TwitterUrl" target="_blank" rel="noopener">
                             <i class="bi bi-twitter-x"></i>
                             <small class="d-lg-none ms-2">Twitter</small>
                         </a>
                     </li>
                     <li class="nav-item col-6 col-lg-auto">
-                        <a class="nav-link py-2 px-0 px-lg-2" href="@linkedInUrl" target="_blank" rel="noopener">
+                        <a class="nav-link py-2 px-0 px-lg-2" href="@LinkedInUrl" target="_blank" rel="noopener">
                             <i class="bi bi-linkedin"></i>
                             <small class="d-lg-none ms-2">LinkedIn</small>
                         </a>
                     </li>
                     <li class="nav-item col-6 col-lg-auto">
-                        <a class="nav-link py-2 px-0 px-lg-2" href="@openCollectiveUrl" target="_blank" rel="noopener">
+                        <a class="nav-link py-2 px-0 px-lg-2" href="@OpenCollectiveUrl" target="_blank" rel="noopener">
                             <i class="bi bi-opencollective"></i>
                             <small class="d-lg-none ms-2">Open Collective</small>
                         </a>
                     </li>
+                    <li class="nav-item py-2 py-lg-1 col-12 col-lg-auto">
+                        <div class="vr d-none d-lg-flex h-100 mx-lg-2 text-white"></div>
+                        <hr class="d-lg-none my-2 text-white-50">
+                    </li>
+                    <li class="nav-item">
+                        <ThemeSwitcher Position="DropdownMenuPosition.End" />
+                    </li>
                 </ul>
             </div>
         </div>
@@ -74,79 +80,14 @@
     @Body
 </main>
 
-<footer class="bd-footer py-4 py-md-5 mt-5 bg-light">
-    <div class="container py-4 py-md-5 px-4 px-md-3">
-        <div class="row">
-            <div class="col-lg-4 mb-3">
-                <a class="d-inline-flex align-items-center mb-2 link-dark text-decoration-none" href="/" aria-label="Bootstrap">
-                    <img src="/images/logo/logo-color.svg" width="40" height="32" class="d-block me-2" alt="Blazor Bootstrap" />
-                    <span class="fs-5">Blazor Bootstrap</span>
-                </a>
-                <ul class="list-unstyled small text-muted">
-                    <li class="mb-2">Designed and built with all the love in the world by the <strong><a href="https://www.nuget.org/packages/Blazor.Bootstrap">Blazor Bootstrap</a></strong> team with the help of our contributors.</li>
-                    <li class="mb-2">Code licensed <a href="https://github.com/vikramlearning/blazorbootstrap/blob/main/LICENSE.txt" target="_blank" rel="license noopener">Apache License 2.0</a>.</li>
-                    <li class="mb-2">Currently @version.</li>
-                </ul>
-            </div>
-            <div class="col-6 col-lg-2 offset-lg-1 mb-3">
-                <h5>Links</h5>
-                <ul class="list-unstyled">
-                    <li class="mb-2"><a href="/">Home</a></li>
-                    <li class="mb-2"><a href="@docsUrl" target="_blank" rel="noopener">Docs</a></li>
-                    <li class="mb-2"><a href="@blogUrl" target="_blank" rel="noopener">Blog</a></li>
-                    <li class="mb-2"><a href="@githubUrl" target="_blank" rel="noopener">Github</a></li>
-                </ul>
-            </div>
-            <div class="col-6 col-lg-2 mb-3">
-                <h5>Guides</h5>
-                <ul class="list-unstyled">
-                    <li class="mb-2"><a href="/getting-started/blazor-webassembly">Getting started</a></li>
-                    <li class="mb-2"><a href="/getting-started#install-nuget-package">Install Nuget</a></li>
-                    <li class="mb-2"><a href="https://github.com/vikramlearning/blazorbootstrap-starter-templates" target="_blank">Starter templates</a></li>
-                </ul>
-            </div>
-            <div class="col-6 col-lg-2 mb-3">
-                <h5>Community</h5>
-                <ul class="list-unstyled">
-                    <li class="mb-2"><a href="@githubIssuesUrl" target="_blank" rel="noopener">Issues</a></li>
-                    <li class="mb-2"><a href="@githubDiscussionsUrl" target="_blank" rel="noopener">Discussions</a></li>
-                    <li class="mb-2"><a href="@openCollectiveUrl" target="_blank" rel="noopener">Open Collective</a></li>
-                    <li class="mb-2"><a href="@stackoverflowUrl" target="_blank" rel="noopener">Stack Overflow</a></li>
-                </ul>
-            </div>
-            <div class="col-6 col-lg-2 mb-3">
-            </div>
-        </div>
-    </div>
-</footer>
-
-@code {
-    private string version = default!;
-    private string docsUrl = default!;
-    private string blogUrl = default!;
-    private string githubUrl = default!;
-    private string twitterUrl = default!;
-    private string linkedInUrl = default!;
-    private string openCollectiveUrl = default!;
-    private string githubIssuesUrl = default!;
-    private string githubDiscussionsUrl = default!;
-    private string stackoverflowUrl = default!;
-
-    [Inject] public IConfiguration Configuration { get; set; } = default!;
-
-    protected override void OnInitialized()
-    {
-        version = $"v{Configuration["version"]}"; // example: v0.6.1
-        docsUrl = $"{Configuration["urls:docs"]}";
-        blogUrl = $"{Configuration["urls:blog"]}";
-        githubUrl = $"{Configuration["urls:github"]}";
-        twitterUrl = $"{Configuration["urls:twitter"]}";
-        linkedInUrl = $"{Configuration["urls:linkedin"]}";
-        openCollectiveUrl = $"{Configuration["urls:opencollective"]}";
-        githubIssuesUrl = $"{Configuration["urls:github_issues"]}";
-        githubDiscussionsUrl = $"{Configuration["urls:github_discussions"]}";
-        stackoverflowUrl = $"{Configuration["urls:stackoverflow"]}";
-
-        base.OnInitialized();
-    }
-}
+<MainLayoutBaseFooter Version="@Version"
+                      DotNetVersion="@DotNetVersion"
+                      DocsUrl="@DocsUrl"
+                      BlogUrl="@BlogUrl"
+                      GithubUrl="@GithubUrl"
+                      TwitterUrl="@TwitterUrl"
+                      LinkedInUrl="@LinkedInUrl"
+                      OpenCollectiveUrl="@OpenCollectiveUrl"
+                      GithubIssuesUrl="@GithubIssuesUrl"
+                      GithubDiscussionsUrl="@GithubDiscussionsUrl"
+                      StackoverflowUrl="@StackoverflowUrl" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor.cs
@@ -0,0 +1,5 @@
+namespace BlazorBootstrap.Demo.RCL;
+
+public partial class EmptyLayout : MainLayoutBase
+{
+}