Skip to content

Commit 1eaaefc

Browse files
jbomhold3jbomhold3
committed
Updates Framework targets .Net(7/8/9)
Bumps Version for release Adds init sort for BSDataGrid
1 parent ead0913 commit 1eaaefc

17 files changed

Lines changed: 53 additions & 50 deletions

File tree

‎src/BlazorStrap.Docs/BlazorStrap.Docs.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55

66
<PropertyGroup>
7-
<TargetFramework>net8.0</TargetFramework>
7+
<TargetFramework>net9.0</TargetFramework>
88
<Nullable>enable</Nullable>
99
<ImplicitUsings>enable</ImplicitUsings>
1010
<RootNamespace>BlazorStrap_Docs</RootNamespace>
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<PackageReference Include="Markdig.SyntaxHighlighting" Version="1.0.0-custom"/>
2121
<PackageReference Include="Markdig" Version="0.26.0"/>
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.*"/>
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/BlazorStrap.Server/BlazorStrap.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>BlazorStrap.Server</RootNamespace>

‎src/BlazorStrap.V4/BlazorStrap.V4.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -14,13 +14,9 @@
1414
<PackageProjectUrl>https://blazorstrap.io/</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/chanan/BlazorStrap</RepositoryUrl>
1616
<RootNamespace>BlazorStrap.V4</RootNamespace>
17-
<PackageVersion>5.2.103-RC1</PackageVersion>
17+
<PackageVersion>5.2.103-RC2</PackageVersion>
1818
</PropertyGroup>
1919

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
21-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.*" />
22-
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
23-
</ItemGroup>
2420
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
2521
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.*" />
2622
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
@@ -29,6 +25,10 @@
2925
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.*" />
3026
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
3127
</ItemGroup>
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
29+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.*" />
30+
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
31+
</ItemGroup>
3232
<ItemGroup>
3333
<ProjectReference Include="..\BlazorStrap\BlazorStrap.csproj" />
3434
</ItemGroup>

‎src/BlazorStrap.V5/BlazorStrap.V5.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
44
<LangVersion>10.0</LangVersion>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -13,17 +13,13 @@
1313
<PackageProjectUrl>https://blazorstrap.io/</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/chanan/BlazorStrap</RepositoryUrl>
1515
<RootNamespace>BlazorStrap.V5</RootNamespace>
16-
<PackageVersion>5.2.103-RC1</PackageVersion>
16+
<PackageVersion>5.2.103-RC2</PackageVersion>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
2020
<SupportedPlatform Include="browser" />
2121
<_CurrentProjectDiscoveredScopedCssFiles Include="@(ThemeCssFiles)" RelativePath="%(Identity)" BasePath="_content/$(AssemblyName)" />
2222
</ItemGroup>
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
24-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.*" />
25-
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
26-
</ItemGroup>
2723
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
2824
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.*" />
2925
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
@@ -32,6 +28,10 @@
3228
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.*" />
3329
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
3430
</ItemGroup>
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
32+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.*" />
33+
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
34+
</ItemGroup>
3535
<ItemGroup>
3636
<ProjectReference Include="..\BlazorStrap\BlazorStrap.csproj" />
3737
</ItemGroup>

‎src/BlazorStrap.WASM/BlazorStrap.WASM.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>BlazorStrap.WASM</RootNamespace>
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7"/>
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all"/>
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.*"/>
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.*" PrivateAssets="all"/>
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/BlazorStrap.WASM/wwwroot/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>BlazorStrap</title>
88
<base href="/" />
99
<link href="css/app.css" rel="stylesheet" />
10-
<link href="_content/BlazorStrap.V4/offcanvas.css" rel="stylesheet" /><!-- This is only included for V4 demo note needed in V5-->
10+
<link href="_content/BlazorStrap.V4/offcanvas.css" rel="stylesheet" /><!-- This is only included for V4 demo not needed in V5-->
1111
<link href="_content/BlazorStrap.Extensions.TreeView/css/style.css" rel="stylesheet" />
1212
<link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
1313
<link href="css/docs.css" rel="stylesheet" />

‎src/BlazorStrap/BlazorStrap.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
44
<LangVersion>10.0</LangVersion>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -33,10 +33,6 @@
3333
<SupportedPlatform Include="browser" />
3434
</ItemGroup>
3535

36-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
37-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.*" />
38-
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
39-
</ItemGroup>
4036
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
4137
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.*" />
4238
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
@@ -45,4 +41,8 @@
4541
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.*" />
4642
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
4743
</ItemGroup>
44+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
45+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.*" />
46+
<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
47+
</ItemGroup>
4848
</Project>

‎src/BlazorStrap/Shared/Components/Forms/BSInputBase.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ public BSInputBase()
6060
CultureInfo @cultureInfo => BindConverter.FormatValue(@cultureInfo.Name),
6161
DateTime @dateTimeValue => BindConverter.FormatValue(@dateTimeValue, _dateFormat, CultureInfo.InvariantCulture),
6262
DateTimeOffset @dateTimeOffsetValue => BindConverter.FormatValue(@dateTimeOffsetValue, _dateFormat, CultureInfo.InvariantCulture),
63-
#if NET6_0_OR_GREATER
6463
DateOnly dateOnlyValue => BindConverter.FormatValue(dateOnlyValue, _dateFormat, CultureInfo.InvariantCulture),
6564
TimeOnly timeOnlyValue => BindConverter.FormatValue(timeOnlyValue, _dateFormat, CultureInfo.InvariantCulture),
66-
#endif
6765
_ => base.FormatValueAsString(value),
6866
};
6967
}

‎src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ public abstract class BlazorStrapInputBase<TValue> : BlazorInputBase<TValue>, IB
8383
CultureInfo @cultureInfo => BindConverter.FormatValue(@cultureInfo.Name),
8484
DateTime @dateTimeValue => BindConverter.FormatValue(@dateTimeValue, _dateFormat, CultureInfo.InvariantCulture),
8585
DateTimeOffset @dateTimeOffsetValue => BindConverter.FormatValue(@dateTimeOffsetValue, _dateFormat, CultureInfo.InvariantCulture),
86-
#if NET6_0_OR_GREATER
8786
DateOnly dateOnlyValue => BindConverter.FormatValue(dateOnlyValue, _dateFormat, CultureInfo.InvariantCulture),
8887
TimeOnly timeOnlyValue => BindConverter.FormatValue(timeOnlyValue, _dateFormat, CultureInfo.InvariantCulture),
89-
#endif
9088
_ => base.FormatValueAsString(value),
9189
};
9290
}

‎src/BlazorStrap/Utilities/BlazorInputBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace BlazorStrap.Utilities;
2020
/// as a cascading parameter.
2121
/// </summary>
2222

23-
#if NET8_0
23+
#if NET8_0_OR_GREATER
2424
public abstract class BlazorInputBase<TValue> : InputBase<TValue>
2525
{
2626
[CascadingParameter] private EditContext? CascadeEditContext { get; set; }

0 commit comments

Comments
 (0)