From 1a84a678d66868afc4fbc95e42fc8b7034dc8718 Mon Sep 17 00:00:00 2001 From: Vikram Reddy Date: Tue, 19 Nov 2024 13:18:26 +0530 Subject: [PATCH 1/3] .NET 9 support added. --- blazorbootstrap/BlazorBootstrap.csproj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/blazorbootstrap/BlazorBootstrap.csproj b/blazorbootstrap/BlazorBootstrap.csproj index 19cb62caa..1f470b5f0 100644 --- a/blazorbootstrap/BlazorBootstrap.csproj +++ b/blazorbootstrap/BlazorBootstrap.csproj @@ -45,13 +45,18 @@ - - + + - + + + + + + \ No newline at end of file From 27aefcc124f9d4bfa61d4034474834efb4681fe9 Mon Sep 17 00:00:00 2001 From: Vikram Reddy Date: Tue, 19 Nov 2024 22:33:41 +0530 Subject: [PATCH 2/3] .NET 9 support added --- .../Client/BlazorBootstrap.Demo.Hosted.Client.csproj | 8 ++++---- .../Client/wwwroot/appsettings.json | 3 ++- .../Server/BlazorBootstrap.Demo.Hosted.Server.csproj | 6 +++--- BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj | 6 +++--- .../Components/Layout/EmptyLayout.razor | 1 + .../Components/Layout/MainLayout.razor | 4 ++++ .../Components/Layout/MainLayoutBase.cs | 3 +++ .../Components/Layout/MainLayoutBaseFooter.razor | 4 ++++ .../Components/Layout/MainLayoutBaseFooter.razor.cs | 1 + .../BlazorBootstrap.Demo.Server.csproj | 2 +- BlazorBootstrap.Demo.Server/appsettings.json | 1 + .../BlazorBootstrap.Demo.WebAssembly.csproj | 8 ++++---- BlazorBootstrap.Demo.WebAssembly/wwwroot/appsettings.json | 1 + 13 files changed, 32 insertions(+), 16 deletions(-) diff --git a/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj b/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj index abccfb1d1..80e41a737 100644 --- a/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj +++ b/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj @@ -1,15 +1,15 @@  - net8.0 + net9.0 enable enable - - - + + + diff --git a/BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json b/BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json index a55633d1d..5ba5d432f 100644 --- a/BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json +++ b/BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json @@ -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" } \ No newline at end of file diff --git a/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj b/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj index 3f05c8a0a..f377d8fcd 100644 --- a/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj +++ b/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj @@ -1,13 +1,13 @@ - + - net8.0 + net9.0 enable enable - + diff --git a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj index 3db87cbfd..3a3a921dc 100644 --- a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj +++ b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable @@ -11,8 +11,8 @@ - - + + diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor b/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor index 03fd94491..fd5e67f14 100644 --- a/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor +++ b/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor @@ -81,6 +81,7 @@ Designed and built with all the love in the world by the Blazor Bootstrap team with the help of our contributors.
  • Code licensed Apache License 2.0.
  • Currently @Version.
    • + @if (!string.IsNullOrWhiteSpace(DotNetVersion)) + { +
  • Powered by @DotNetVersion
    • + }
    diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBase.cs b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBase.cs index 38c42ce5f..68ae5a072 100644 --- a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBase.cs +++ b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBase.cs @@ -3,6 +3,7 @@ public class MainLayoutBase : LayoutComponentBase { internal string version = default!; + internal string dotNetVersion = default!; internal string docsUrl = default!; internal string blogUrl = default!; internal string githubUrl = default!; @@ -23,6 +24,7 @@ public class MainLayoutBase : LayoutComponentBase protected override void OnInitialized() { version = $"v{Configuration["version"]}"; // example: v0.6.1 + dotNetVersion = $".NET {Configuration["dotNetVersion"]}"; // example: 9.0.0 docsUrl = $"{Configuration["urls:docs"]}"; blogUrl = $"{Configuration["urls:blog"]}"; githubUrl = $"{Configuration["urls:github"]}"; @@ -46,6 +48,7 @@ internal virtual async Task Sidebar2DataProvider(Sid internal virtual IEnumerable GetNavItems() => new List(); public string Version => version; + public string DotNetVersion => dotNetVersion; public string DocsUrl => docsUrl; public string BlogUrl => blogUrl; public string GithubUrl => githubUrl; diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor index c35d8360e..de129b136 100644 --- a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor +++ b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor @@ -13,6 +13,10 @@
  • Designed and built with all the love in the world by the Blazor Bootstrap team with the help of our contributors.
  • Code licensed Apache License 2.0.
  • Currently @Version.
    • + @if (!string.IsNullOrWhiteSpace(DotNetVersion)) + { +
  • Powered by @DotNetVersion
    • + }
    diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor.cs index 2bd88276f..57e9eab0c 100644 --- a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor.cs +++ b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayoutBaseFooter.razor.cs @@ -3,6 +3,7 @@ public partial class MainLayoutBaseFooter : ComponentBase { [Parameter] public string? Version { get; set; } + [Parameter] public string? DotNetVersion { get; set; } [Parameter] public string? DocsUrl { get; set; } [Parameter] public string? BlogUrl { get; set; } [Parameter] public string? GithubUrl { get; set; } diff --git a/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj b/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj index 62358c3c9..f60b2a192 100644 --- a/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj +++ b/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable 17d839f8-f71e-4856-829b-ccf23589bb77 diff --git a/BlazorBootstrap.Demo.Server/appsettings.json b/BlazorBootstrap.Demo.Server/appsettings.json index 54620a75f..16e8a030b 100644 --- a/BlazorBootstrap.Demo.Server/appsettings.json +++ b/BlazorBootstrap.Demo.Server/appsettings.json @@ -21,6 +21,7 @@ "github_discussions": "//github.com/vikramlearning/blazorbootstrap/discussions", "stackoverflow": "//stackoverflow.com/questions/tagged/blazor-bootstrap" }, + "dotNetVersion": "9.0.0", "GoogleMap": { "ApiKey": "AIzaSyDc110Rvu20IMJhlZcWTOPoLbVQdnjLyXs" }, diff --git a/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj b/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj index 324566609..3fcfea059 100644 --- a/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj +++ b/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj @@ -1,15 +1,15 @@  - net8.0 + net9.0 enable enable - - - + + + diff --git a/BlazorBootstrap.Demo.WebAssembly/wwwroot/appsettings.json b/BlazorBootstrap.Demo.WebAssembly/wwwroot/appsettings.json index a6f4631bf..c317275ef 100644 --- a/BlazorBootstrap.Demo.WebAssembly/wwwroot/appsettings.json +++ b/BlazorBootstrap.Demo.WebAssembly/wwwroot/appsettings.json @@ -14,6 +14,7 @@ "github_discussions": "//github.com/vikramlearning/blazorbootstrap/discussions", "stackoverflow": "//stackoverflow.com/questions/tagged/blazor-bootstrap" }, + "dotNetVersion": "9.0.0", "GoogleMap": { "ApiKey": "AIzaSyDc110Rvu20IMJhlZcWTOPoLbVQdnjLyXs" } From dd4be7e1b8eec4feda20e2cf068623dac6db0bf8 Mon Sep 17 00:00:00 2001 From: Vikram Reddy Date: Wed, 20 Nov 2024 10:43:45 +0530 Subject: [PATCH 3/3] .NET 9 version upgrade --- .github/workflows/static-web-app.yml | 4 ++-- .github/workflows/web-app.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/static-web-app.yml b/.github/workflows/static-web-app.yml index 515688aa6..e46c71b42 100644 --- 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 index c4b0bba7a..e2f0fa20f 100644 --- 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