From 1eaaefc724a280e141fdedc2c9e5ebaa006a00e6 Mon Sep 17 00:00:00 2001 From: John Bomhold Date: Sat, 16 Nov 2024 22:44:03 -1000 Subject: [PATCH] Updates Framework targets .Net(7/8/9) Bumps Version for release Adds init sort for BSDataGrid --- src/BlazorStrap.Docs/BlazorStrap.Docs.csproj | 4 ++-- src/BlazorStrap.Server/BlazorStrap.Server.csproj | 2 +- src/BlazorStrap.V4/BlazorStrap.V4.csproj | 12 ++++++------ src/BlazorStrap.V5/BlazorStrap.V5.csproj | 12 ++++++------ src/BlazorStrap.WASM/BlazorStrap.WASM.csproj | 6 +++--- src/BlazorStrap.WASM/wwwroot/index.html | 2 +- src/BlazorStrap/BlazorStrap.csproj | 10 +++++----- .../Shared/Components/Forms/BSInputBase.cs | 2 -- .../Components/Forms/BlazorStrapInputBase.cs | 2 -- src/BlazorStrap/Utilities/BlazorInputBase.cs | 2 +- .../BlazorStrap.Extensions.FluentValidation.csproj | 14 +++++++------- .../BlazorStrap.Extensions.TreeView.csproj | 10 +++++----- .../BlazorStrap.Extensions.Wizard/BSWizard.razor | 3 ++- .../BSWizard.razor.cs | 9 ++++++++- .../BSWizardItem.razor | 2 +- .../BSWizardItem.razor.cs | 2 +- .../BlazorStrap.Extensions.Wizard.csproj | 9 ++++----- 17 files changed, 53 insertions(+), 50 deletions(-) diff --git a/src/BlazorStrap.Docs/BlazorStrap.Docs.csproj b/src/BlazorStrap.Docs/BlazorStrap.Docs.csproj index 86808a48..df4907f3 100644 --- a/src/BlazorStrap.Docs/BlazorStrap.Docs.csproj +++ b/src/BlazorStrap.Docs/BlazorStrap.Docs.csproj @@ -4,7 +4,7 @@ - net8.0 + net9.0 enable enable BlazorStrap_Docs @@ -19,7 +19,7 @@ - + diff --git a/src/BlazorStrap.Server/BlazorStrap.Server.csproj b/src/BlazorStrap.Server/BlazorStrap.Server.csproj index e145b008..ce2fd351 100644 --- a/src/BlazorStrap.Server/BlazorStrap.Server.csproj +++ b/src/BlazorStrap.Server/BlazorStrap.Server.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable BlazorStrap.Server diff --git a/src/BlazorStrap.V4/BlazorStrap.V4.csproj b/src/BlazorStrap.V4/BlazorStrap.V4.csproj index d28d7aab..db598540 100644 --- a/src/BlazorStrap.V4/BlazorStrap.V4.csproj +++ b/src/BlazorStrap.V4/BlazorStrap.V4.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 10.0 enable enable @@ -14,13 +14,9 @@ https://blazorstrap.io/ https://github.com/chanan/BlazorStrap BlazorStrap.V4 - 5.2.103-RC1 + 5.2.103-RC2 - - - - @@ -29,6 +25,10 @@ + + + + diff --git a/src/BlazorStrap.V5/BlazorStrap.V5.csproj b/src/BlazorStrap.V5/BlazorStrap.V5.csproj index f4e6f200..a7ed1b39 100644 --- a/src/BlazorStrap.V5/BlazorStrap.V5.csproj +++ b/src/BlazorStrap.V5/BlazorStrap.V5.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 10.0 enable enable @@ -13,17 +13,13 @@ https://blazorstrap.io/ https://github.com/chanan/BlazorStrap BlazorStrap.V5 - 5.2.103-RC1 + 5.2.103-RC2 <_CurrentProjectDiscoveredScopedCssFiles Include="@(ThemeCssFiles)" RelativePath="%(Identity)" BasePath="_content/$(AssemblyName)" /> - - - - @@ -32,6 +28,10 @@ + + + + diff --git a/src/BlazorStrap.WASM/BlazorStrap.WASM.csproj b/src/BlazorStrap.WASM/BlazorStrap.WASM.csproj index 1c1d28c5..9be70fee 100644 --- a/src/BlazorStrap.WASM/BlazorStrap.WASM.csproj +++ b/src/BlazorStrap.WASM/BlazorStrap.WASM.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable BlazorStrap.WASM @@ -12,8 +12,8 @@ - - + + diff --git a/src/BlazorStrap.WASM/wwwroot/index.html b/src/BlazorStrap.WASM/wwwroot/index.html index 5f224e2c..be2bf97e 100644 --- a/src/BlazorStrap.WASM/wwwroot/index.html +++ b/src/BlazorStrap.WASM/wwwroot/index.html @@ -7,7 +7,7 @@ BlazorStrap - + diff --git a/src/BlazorStrap/BlazorStrap.csproj b/src/BlazorStrap/BlazorStrap.csproj index b3d71e19..14098c89 100644 --- a/src/BlazorStrap/BlazorStrap.csproj +++ b/src/BlazorStrap/BlazorStrap.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 10.0 enable enable @@ -33,10 +33,6 @@ - - - - @@ -45,4 +41,8 @@ + + + + diff --git a/src/BlazorStrap/Shared/Components/Forms/BSInputBase.cs b/src/BlazorStrap/Shared/Components/Forms/BSInputBase.cs index 4ea02196..f6893d6c 100644 --- a/src/BlazorStrap/Shared/Components/Forms/BSInputBase.cs +++ b/src/BlazorStrap/Shared/Components/Forms/BSInputBase.cs @@ -60,10 +60,8 @@ public BSInputBase() CultureInfo @cultureInfo => BindConverter.FormatValue(@cultureInfo.Name), DateTime @dateTimeValue => BindConverter.FormatValue(@dateTimeValue, _dateFormat, CultureInfo.InvariantCulture), DateTimeOffset @dateTimeOffsetValue => BindConverter.FormatValue(@dateTimeOffsetValue, _dateFormat, CultureInfo.InvariantCulture), -#if NET6_0_OR_GREATER DateOnly dateOnlyValue => BindConverter.FormatValue(dateOnlyValue, _dateFormat, CultureInfo.InvariantCulture), TimeOnly timeOnlyValue => BindConverter.FormatValue(timeOnlyValue, _dateFormat, CultureInfo.InvariantCulture), -#endif _ => base.FormatValueAsString(value), }; } diff --git a/src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs b/src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs index 9eb0d33e..f90af146 100644 --- a/src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs +++ b/src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs @@ -83,10 +83,8 @@ public abstract class BlazorStrapInputBase : BlazorInputBase, IB CultureInfo @cultureInfo => BindConverter.FormatValue(@cultureInfo.Name), DateTime @dateTimeValue => BindConverter.FormatValue(@dateTimeValue, _dateFormat, CultureInfo.InvariantCulture), DateTimeOffset @dateTimeOffsetValue => BindConverter.FormatValue(@dateTimeOffsetValue, _dateFormat, CultureInfo.InvariantCulture), -#if NET6_0_OR_GREATER DateOnly dateOnlyValue => BindConverter.FormatValue(dateOnlyValue, _dateFormat, CultureInfo.InvariantCulture), TimeOnly timeOnlyValue => BindConverter.FormatValue(timeOnlyValue, _dateFormat, CultureInfo.InvariantCulture), -#endif _ => base.FormatValueAsString(value), }; } diff --git a/src/BlazorStrap/Utilities/BlazorInputBase.cs b/src/BlazorStrap/Utilities/BlazorInputBase.cs index bde8f4f8..da5658ae 100644 --- a/src/BlazorStrap/Utilities/BlazorInputBase.cs +++ b/src/BlazorStrap/Utilities/BlazorInputBase.cs @@ -20,7 +20,7 @@ namespace BlazorStrap.Utilities; /// as a cascading parameter. /// -#if NET8_0 +#if NET8_0_OR_GREATER public abstract class BlazorInputBase : InputBase { [CascadingParameter] private EditContext? CascadeEditContext { get; set; } diff --git a/src/Extensions/BlazorStrap.Extensions.FluentValidation/BlazorStrap.Extensions.FluentValidation.csproj b/src/Extensions/BlazorStrap.Extensions.FluentValidation/BlazorStrap.Extensions.FluentValidation.csproj index c57eadac..e6347abc 100644 --- a/src/Extensions/BlazorStrap.Extensions.FluentValidation/BlazorStrap.Extensions.FluentValidation.csproj +++ b/src/Extensions/BlazorStrap.Extensions.FluentValidation/BlazorStrap.Extensions.FluentValidation.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0;net6.0;net7.0 + netstandard2.0;net7.0;net8.0;net9.0 true 8.0 3.0 @@ -19,16 +19,16 @@ BlazorStrap.Extensions.FluentValidation - - + + - - + + - - + + diff --git a/src/Extensions/BlazorStrap.Extensions.TreeView/BlazorStrap.Extensions.TreeView.csproj b/src/Extensions/BlazorStrap.Extensions.TreeView/BlazorStrap.Extensions.TreeView.csproj index f4ca0219..bcc8229d 100644 --- a/src/Extensions/BlazorStrap.Extensions.TreeView/BlazorStrap.Extensions.TreeView.csproj +++ b/src/Extensions/BlazorStrap.Extensions.TreeView/BlazorStrap.Extensions.TreeView.csproj @@ -3,7 +3,7 @@ 10.0 enable - net5.0;net6.0;net7.0 + net7.0;net8.0;net9.0 BlazorStrap.Extensions.TreeView 5.1.101-Preview1a Chanan Braunstein; John Bomhold @@ -18,11 +18,11 @@ - - + + - - + + diff --git a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor index db4d4139..5fb03308 100644 --- a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor +++ b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor @@ -2,10 +2,11 @@
+ @Header?.Invoke(this)
    - @ChildContent
+ @HeaderAfterNavItems?.Invoke(this)
diff --git a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor.cs b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor.cs index 4fd8fc73..86f71968 100644 --- a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor.cs +++ b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizard.razor.cs @@ -14,6 +14,9 @@ public partial class BSWizard : ComponentBase [Parameter] public string? CardBodyClass { get; set; } [Parameter] public string? CardBodyFooterClass { get; set; } [Parameter] public RenderFragment? ChildContent { get; set; } + [Parameter] public RenderFragment? Header { get; set; } + [Parameter] public RenderFragment? HeaderAfterNavItems { get; set; } + [Parameter] public RenderFragment? NextButton { get; set; } [Parameter] public RenderFragment? BackButton { get; set; } [Parameter] public EventCallback OnError { get; set; } @@ -61,7 +64,11 @@ public async Task InvokeAsync(BSWizardItem sender) ChildHandler?.Invoke(sender); if (_wizardRender != null) await _wizardRender.RefreshAsync(); } - + + public async Task RefreshAsync() + { + await InvokeAsync(StateHasChanged); + } public event Action? ChildHandler; } diff --git a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor index 57780bbc..48ac6204 100644 --- a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor +++ b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor @@ -1,6 +1,6 @@ @implements IDisposable
  • - @Label + @Label?.Invoke(this)
    • \ No newline at end of file diff --git a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor.cs b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor.cs index d8491526..446b2b4c 100644 --- a/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor.cs +++ b/src/Extensions/BlazorStrap.Extensions.Wizard/BSWizardItem.razor.cs @@ -83,7 +83,7 @@ public partial class BSWizardItem : ComponentBase, IDisposable /// Label. /// [Parameter] - public RenderFragment? Label { get; set; } + public RenderFragment? Label { get; set; } /// /// Url for nav link. diff --git a/src/Extensions/BlazorStrap.Extensions.Wizard/BlazorStrap.Extensions.Wizard.csproj b/src/Extensions/BlazorStrap.Extensions.Wizard/BlazorStrap.Extensions.Wizard.csproj index 6e692b29..d87a3360 100644 --- a/src/Extensions/BlazorStrap.Extensions.Wizard/BlazorStrap.Extensions.Wizard.csproj +++ b/src/Extensions/BlazorStrap.Extensions.Wizard/BlazorStrap.Extensions.Wizard.csproj @@ -4,9 +4,9 @@ 10.0 enable enable - net6.0;net7.0 + net7.0;net8.0 BlazorStrap.Extensions.Wizard - 5.1.100-Beta1 + 5.2.103-RC2 John Bomhold BlazorStrap Extension for Wizards A treeview component library for BlazorStrap @@ -25,9 +25,8 @@ - - + + -