From c3898a58a96644a0140eb9f0bf8b5d64fee7247d Mon Sep 17 00:00:00 2001 From: Jens-Christian Skibakk Date: Mon, 22 Apr 2024 21:36:46 +0200 Subject: [PATCH 1/2] Update demo to net8 Compile for both net6 and net8 (cherry picked from commit 8389dae8eb80025c2e60d5b5550897a37d3cc329) --- .../BlazorBootstrap.Demo.Hosted.Client.csproj | 8 ++++---- .../BlazorBootstrap.Demo.Hosted.Server.csproj | 4 ++-- .../BlazorBootstrap.Demo.RCL.csproj | 6 +++--- blazorbootstrap/BlazorBootstrap.csproj | 16 ++++++++++------ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj b/BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj index f92bf057a..abccfb1d1 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 @@  - net7.0 + net8.0 enable enable - - - + + + diff --git a/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj b/BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj index 712b8f029..3f05c8a0a 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 @@ - net7.0 + net8.0 enable enable - + diff --git a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj index dd74e9dec..3db87cbfd 100644 --- a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj +++ b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -11,8 +11,8 @@ - - + + diff --git a/blazorbootstrap/BlazorBootstrap.csproj b/blazorbootstrap/BlazorBootstrap.csproj index 101e0ba33..438ac5692 100644 --- a/blazorbootstrap/BlazorBootstrap.csproj +++ b/blazorbootstrap/BlazorBootstrap.csproj @@ -10,13 +10,13 @@ Apache-2.0 https://docs.blazorbootstrap.com/ https://github.com/vikramlearning/blazorbootstrap - Blazor, WebAssembly, BlazorWebAssembly, Bootstrap, Bootstrap5, BlazorBootstrap, BlazorAlert, BlazorAutoComplete, BlazorButtons, BlazorCallout, BlazorCharts, BlazorConfirmDialog, BlazorGrid, BlazorIcon, BlazorModal, BlazorCurrencyInput, BlazorNumberInput, BlazorInput, BlazorNumber, BlazorDate, BlazorDateInput, BlazorDatePicker, BlazorTime, BlazorTimeInput, BlazorTimePicker, BlazorOffcanvas, BlazorPagination, BlazorPdfViewer, BlazorPlaceholders, BlazorPreload, BlazorProgress, BlazorRibbon, BlazorScriptLoader, BlazorSidebar, BlazorSidebar2, BlazorSortableList, BlazorSwitch, BlazorSpinners, BlazorTabs, BlazorToasts, BlazorTooltips, BlazorTooltips, BlazorBarChart, BlazorDoughnutChart, BlazorLineChart, BlazorPieChart + Blazor, WebAssembly, BlazorWebAssembly, Bootstrap, Bootstrap5, BlazorBootstrap, BlazorAlert, BlazorAutoComplete, BlazorButtons, BlazorCallout, BlazorCharts, BlazorConfirmDialog, BlazorGrid, BlazorIcon, BlazorModal, BlazorCurrencyInput, BlazorNumberInput, BlazorInput, BlazorNumber, BlazorDate, BlazorDateInput, BlazorDatePicker, BlazorTime, BlazorTimeInput, BlazorTimePicker, BlazorOffcanvas, BlazorPagination, BlazorPdfViewer, BlazorPlaceholders, BlazorPreload, BlazorProgress, BlazorRibbon, BlazorScriptLoader, BlazorSidebar, BlazorSidebar2, BlazorSortableList, BlazorSwitch, BlazorSpinners, BlazorTabs, BlazorToasts, BlazorTooltips, BlazorTooltips, BlazorBarChart, BlazorDoughnutChart, BlazorLineChart, BlazorPieChart Blazor Bootstrap is a component library built on top of Blazor and Bootstrap5 CSS framework. Vikram Reddy Copyright © 2024 Blazor Bootstrap - - net6.0 + + net6.0;net8.0 enable enable Library @@ -44,8 +44,12 @@ - - + + - + + + + + \ No newline at end of file From dcedd2d2869662e883e18d421213f5ae3cbbddda Mon Sep 17 00:00:00 2001 From: Vikram Reddy Date: Tue, 30 Apr 2024 17:28:49 +0530 Subject: [PATCH 2/2] Indentation fix. --- blazorbootstrap/BlazorBootstrap.csproj | 84 +++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/blazorbootstrap/BlazorBootstrap.csproj b/blazorbootstrap/BlazorBootstrap.csproj index 438ac5692..72a3818dc 100644 --- a/blazorbootstrap/BlazorBootstrap.csproj +++ b/blazorbootstrap/BlazorBootstrap.csproj @@ -1,52 +1,52 @@  - + - Blazor.Bootstrap + Blazor.Bootstrap 2.2.1 - 2.2.1 - - - Apache-2.0 - https://docs.blazorbootstrap.com/ - https://github.com/vikramlearning/blazorbootstrap - Blazor, WebAssembly, BlazorWebAssembly, Bootstrap, Bootstrap5, BlazorBootstrap, BlazorAlert, BlazorAutoComplete, BlazorButtons, BlazorCallout, BlazorCharts, BlazorConfirmDialog, BlazorGrid, BlazorIcon, BlazorModal, BlazorCurrencyInput, BlazorNumberInput, BlazorInput, BlazorNumber, BlazorDate, BlazorDateInput, BlazorDatePicker, BlazorTime, BlazorTimeInput, BlazorTimePicker, BlazorOffcanvas, BlazorPagination, BlazorPdfViewer, BlazorPlaceholders, BlazorPreload, BlazorProgress, BlazorRibbon, BlazorScriptLoader, BlazorSidebar, BlazorSidebar2, BlazorSortableList, BlazorSwitch, BlazorSpinners, BlazorTabs, BlazorToasts, BlazorTooltips, BlazorTooltips, BlazorBarChart, BlazorDoughnutChart, BlazorLineChart, BlazorPieChart - Blazor Bootstrap is a component library built on top of Blazor and Bootstrap5 CSS framework. - Vikram Reddy - - Copyright © 2024 Blazor Bootstrap - - net6.0;net8.0 - enable - enable - Library - true - 10.0 - 128X128.png - README.md - git - https://github.com/vikramlearning/blazorbootstrap/releases - - - - - - True - \ - - - True - \ - + 2.2.1 + + + Apache-2.0 + https://docs.blazorbootstrap.com/ + https://github.com/vikramlearning/blazorbootstrap + Blazor, WebAssembly, BlazorWebAssembly, Bootstrap, Bootstrap5, BlazorBootstrap, BlazorAlert, BlazorAutoComplete, BlazorButtons, BlazorCallout, BlazorCharts, BlazorConfirmDialog, BlazorGrid, BlazorIcon, BlazorModal, BlazorCurrencyInput, BlazorNumberInput, BlazorInput, BlazorNumber, BlazorDate, BlazorDateInput, BlazorDatePicker, BlazorTime, BlazorTimeInput, BlazorTimePicker, BlazorOffcanvas, BlazorPagination, BlazorPdfViewer, BlazorPlaceholders, BlazorPreload, BlazorProgress, BlazorRibbon, BlazorScriptLoader, BlazorSidebar, BlazorSidebar2, BlazorSortableList, BlazorSwitch, BlazorSpinners, BlazorTabs, BlazorToasts, BlazorTooltips, BlazorTooltips, BlazorBarChart, BlazorDoughnutChart, BlazorLineChart, BlazorPieChart + Blazor Bootstrap is a component library built on top of Blazor and Bootstrap5 CSS framework. + Vikram Reddy + + Copyright © 2024 Blazor Bootstrap + + net6.0;net8.0 + enable + enable + Library + true + 10.0 + 128X128.png + README.md + git + https://github.com/vikramlearning/blazorbootstrap/releases + + + + + + True + \ + + + True + \ + - - - + + + - - - + + +