Skip to content

Commit 80b3915

Browse files
author
Christophe Peugnet
committed
add dotnet 9
1 parent 2be0c93 commit 80b3915

File tree

13 files changed

+47
-75
lines changed

13 files changed

+47
-75
lines changed

‎.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88

99
env:
10-
PUBLISH_FOLDER: samples/BlazorWebAssembly/bin/Release/net8.0/publish/wwwroot
10+
PUBLISH_FOLDER: samples/BlazorWebAssembly/bin/Release/net9.0/publish/wwwroot
1111

1212
name: Build and Deploy Job
1313
steps:
@@ -19,11 +19,11 @@ jobs:
1919

2020
- uses: actions/setup-dotnet@v3
2121
with:
22-
dotnet-version: '8.x'
22+
dotnet-version: '9.x'
2323

2424
- name: Dotnet Publish
2525
run:
26-
dotnet publish --configuration Release -f net8.0
26+
dotnet publish --configuration Release -f net9.0
2727

2828
- name: Change base-tag in index.html to repo name
2929
run: sed -i 's/<base href="\/" \/>/<base href="\/${{ env.REPO_NAME }}\/" \/>/g' $GITHUB_WORKSPACE/$PUBLISH_FOLDER/index.html

‎BlazorCalendar/BlazorCalendar.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
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
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<Description>Yearly, monthly and weekly calendar Blazor Component. For use with .NET 6.0 or higher Blazor applications</Description>
9-
<Copyright>Copyright 2023</Copyright>
8+
<Description>Yearly, monthly and weekly calendar Blazor Component. For use with .NET 7.0 or higher Blazor applications</Description>
9+
<Copyright>Copyright 2024</Copyright>
1010
<PackageProjectUrl>https://github.com/tossnet/Blazor-Calendar</PackageProjectUrl>
1111
<PackageIcon>icon.png</PackageIcon>
1212
<RepositoryUrl>https://github.com/tossnet/Blazor-Calendar</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<PackageTags>blazor, calendar, schedule, component</PackageTags>
1515
<PackageReleaseNotes>https://github.com/tossnet/Blazor-Calendar#release-notes</PackageReleaseNotes>
16-
<Version>2.6.7</Version>
16+
<Version>2.7.0</Version>
1717
<Authors>Christophe Peugnet</Authors>
1818
<DebugType>embedded</DebugType>
1919
</PropertyGroup>
@@ -26,16 +26,16 @@
2626
<SupportedPlatform Include="browser" />
2727
</ItemGroup>
2828

29-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
30-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
31-
</ItemGroup>
32-
3329
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
34-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
30+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20" />
3531
</ItemGroup>
3632

3733
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
38-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
34+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
38+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎BlazorCalendar/MonthlyView.razor.cs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ partial class MonthlyView : CalendarBase
1010
public DisplayedView DisplayedView { get; set; } = DisplayedView.Monthly;
1111

1212
private DateTime _firstdate;
13+
1314
[CascadingParameter(Name = "FirstDate")]
1415
public DateTime FirstDate
1516
{

‎README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ https://github.com/tossnet/Blazor-Calendar/wiki
3636

3737
## <a name="ReleaseNotes"></a>Release Notes
3838

39-
Blazor-Calendar/pull/13
40-
<details open="open"><summary>Version 2.6.5</summary>
39+
<details open="open"><summary>Version 2.7.0</summary>
4140

42-
>- Add WeekView (thanks [BruderJohn](https://github.com/BruderJohn) ) [Pull #11](https://github.com/tossnet/Blazor-Calendar/pull/13)
41+
>- Add .NET9 and remove .NET6.0
42+
</details>
43+
44+
<details><summary>Version 2.6.5</summary>
45+
46+
>- Add WeekView (thanks [BruderJohn](https://github.com/BruderJohn) ) [Pull #13](https://github.com/tossnet/Blazor-Calendar/pull/13)
4347
</details>
4448
4549
<details><summary>Version 2.6.4</summary>

‎samples/BlazorServer/BlazorServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0; net7.0; net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0; net8.0; net9.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>BlazorServer</RootNamespace>

‎samples/BlazorServer/Pages/Annualy.razor

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page "/annualyview"
1+
@page "/"
22
@using BlazorCalendar
33
@using BlazorCalendar.Models
44

@@ -37,7 +37,7 @@
3737
private DateTime today = DateTime.Today;
3838
private int months = 12;
3939
private List<Tasks> TasksList;
40-
private string fakeConsole = "";
40+
private string fakeConsole = string.Empty;
4141
private BlazorCalendar.PriorityLabel PriorityDisplay = PriorityLabel.Code;
4242
private bool draggable = true;
4343

‎samples/BlazorServer/Pages/Index.razor

-11
This file was deleted.

‎samples/BlazorServer/Shared/NavMenu.razor

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@
1111
<nav class="flex-column">
1212
<div class="nav-item px-3">
1313
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
14-
<span class="oi oi-home" aria-hidden="true"></span> Index
14+
<span class="oi oi-home" aria-hidden="true"></span> Annual view
1515
</NavLink>
16-
</div>
17-
<div class="nav-item px-3">
18-
<NavLink class="nav-link" href="annualyview">
19-
<span class="oi oi-calendar" aria-hidden="true"></span> Annual view
20-
</NavLink>
21-
</div>
16+
</div>
2217
<div class="nav-item px-3">
2318
<NavLink class="nav-link" href="monthlyview">
2419
<span class="oi oi-calendar" aria-hidden="true"></span> Monthly view

‎samples/BlazorWebAssembly/BlazorWebAssembly.csproj

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net6.0; net7.0; net8.0</TargetFrameworks>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net7.0; net8.0; net9.0</TargetFrameworks>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
88

9-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
9+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
1212
</ItemGroup>
1313

14-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all" />
14+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
20-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
20+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
21+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
25-
<ProjectReference Include="..\..\BlazorCalendar\BlazorCalendar.csproj" />
26-
</ItemGroup>
24+
<ItemGroup>
25+
<ProjectReference Include="..\..\BlazorCalendar\BlazorCalendar.csproj" />
26+
</ItemGroup>
2727

2828
</Project>

‎samples/BlazorWebAssembly/Pages/Annualy.razor

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page "/annualyview"
1+
@page "/"
22
@using BlazorCalendar
33
@using BlazorCalendar.Models
44

@@ -37,7 +37,7 @@
3737
private DateTime today = DateTime.Today;
3838
private int months = 8;
3939
private List<Tasks> TasksList;
40-
private string fakeConsole = "";
40+
private string fakeConsole = string.Empty;
4141
private BlazorCalendar.PriorityLabel PriorityDisplay = PriorityLabel.Code;
4242
private bool draggable = true;
4343

‎samples/BlazorWebAssembly/Pages/Index.razor

-12
This file was deleted.

‎samples/BlazorWebAssembly/Pages/Monthly.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
private DateTime today = DateTime.Today;
3939
private int months = 12;
4040
private List<Tasks> TasksList;
41-
private string fakeConsole = "";
41+
private string fakeConsole = string.Empty;
4242
private BlazorCalendar.PriorityLabel PriorityDisplay = PriorityLabel.Code;
4343
private bool draggable = true;
4444

‎samples/BlazorWebAssembly/Shared/NavMenu.razor

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@
1111
<nav class="flex-column">
1212
<div class="nav-item px-3">
1313
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
14-
<span class="oi oi-home" aria-hidden="true"></span> Index
14+
<span class="oi oi-home" aria-hidden="true"></span> Annualy view
1515
</NavLink>
1616
</div>
17-
<div class="nav-item px-3">
18-
<NavLink class="nav-link" href="annualyview">
19-
<span class="oi oi-calendar" aria-hidden="true"></span> Annualy view
20-
</NavLink>
21-
</div>
2217
<div class="nav-item px-3">
2318
<NavLink class="nav-link" href="monthlyview">
2419
<span class="oi oi-calendar" aria-hidden="true"></span> Monthly view

0 commit comments

Comments
 (0)