add dotnet 9

tossnet · Nov 19, 2024 · 80b3915 · 80b3915
1 parent 2be0c93
commit 80b3915
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 75 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-     PUBLISH_FOLDER: samples/BlazorWebAssembly/bin/Release/net8.0/publish/wwwroot
+     PUBLISH_FOLDER: samples/BlazorWebAssembly/bin/Release/net9.0/publish/wwwroot
 
     name: Build and Deploy Job
     steps:
@@ -19,11 +19,11 @@ jobs:
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '8.x'
+          dotnet-version: '9.x'
 
       - name: Dotnet Publish
         run: 
-            dotnet publish  --configuration Release -f net8.0
+            dotnet publish  --configuration Release -f net9.0
 
       - name: Change base-tag in index.html to repo name
         run: sed -i 's/<base href="\/" \/>/<base href="\/${{ env.REPO_NAME }}\/" \/>/g' $GITHUB_WORKSPACE/$PUBLISH_FOLDER/index.html

diff --git a/BlazorCalendar/BlazorCalendar.csproj b/BlazorCalendar/BlazorCalendar.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0; net7.0; net8.0</TargetFrameworks>
+		<TargetFrameworks>net7.0; net8.0;net9.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Description>Yearly, monthly and weekly calendar Blazor Component. For use with .NET 6.0 or higher Blazor applications</Description>
-		<Copyright>Copyright 2023</Copyright>
+		<Description>Yearly, monthly and weekly calendar Blazor Component. For use with .NET 7.0 or higher Blazor applications</Description>
+		<Copyright>Copyright 2024</Copyright>
 		<PackageProjectUrl>https://github.com/tossnet/Blazor-Calendar</PackageProjectUrl>
 		<PackageIcon>icon.png</PackageIcon>
 		<RepositoryUrl>https://github.com/tossnet/Blazor-Calendar</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>blazor, calendar, schedule, component</PackageTags>
 		<PackageReleaseNotes>https://github.com/tossnet/Blazor-Calendar#release-notes</PackageReleaseNotes>
-		<Version>2.6.7</Version>
+		<Version>2.7.0</Version>
 		<Authors>Christophe Peugnet</Authors>
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
@@ -26,16 +26,16 @@
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/BlazorCalendar/MonthlyView.razor.cs b/BlazorCalendar/MonthlyView.razor.cs
@@ -10,6 +10,7 @@ partial class MonthlyView : CalendarBase
     public DisplayedView DisplayedView { get; set; } = DisplayedView.Monthly;
 
     private DateTime _firstdate;
+
     [CascadingParameter(Name = "FirstDate")]
     public DateTime FirstDate
     {

diff --git a/README.md b/README.md
@@ -36,10 +36,14 @@ https://github.com/tossnet/Blazor-Calendar/wiki
 
 ## <a name="ReleaseNotes"></a>Release Notes
 
-Blazor-Calendar/pull/13
-<details open="open"><summary>Version 2.6.5</summary>
+<details open="open"><summary>Version 2.7.0</summary>
 
->- Add WeekView (thanks [BruderJohn](https://github.com/BruderJohn) )  [Pull #11](https://github.com/tossnet/Blazor-Calendar/pull/13)
+>- Add .NET9 and remove .NET6.0 
+</details>
+
+<details><summary>Version 2.6.5</summary>
+
+>- Add WeekView (thanks [BruderJohn](https://github.com/BruderJohn) )  [Pull #13](https://github.com/tossnet/Blazor-Calendar/pull/13)
 </details>
 
 <details><summary>Version 2.6.4</summary>

diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-	<TargetFrameworks>net6.0; net7.0; net8.0</TargetFrameworks>
+	  <TargetFrameworks>net7.0; net8.0; net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>BlazorServer</RootNamespace>

diff --git a/samples/BlazorServer/Pages/Annualy.razor b/samples/BlazorServer/Pages/Annualy.razor
@@ -1,4 +1,4 @@
-@page "/annualyview"
+@page "/"
 @using BlazorCalendar
 @using BlazorCalendar.Models
 
@@ -37,7 +37,7 @@
 	private DateTime today = DateTime.Today;
 	private int months = 12;
 	private List<Tasks> TasksList;
-	private string fakeConsole = "";
+	private string fakeConsole = string.Empty;
 	private BlazorCalendar.PriorityLabel PriorityDisplay = PriorityLabel.Code;
 	private bool draggable = true;
 

diff --git a/samples/BlazorServer/Pages/Index.razor b/samples/BlazorServer/Pages/Index.razor
diff --git a/samples/BlazorServer/Shared/NavMenu.razor b/samples/BlazorServer/Shared/NavMenu.razor
@@ -11,14 +11,9 @@
     <nav class="flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Index
+                <span class="oi oi-home" aria-hidden="true"></span> Annual view
             </NavLink> 
-        </div>         
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="annualyview">
-                <span class="oi oi-calendar" aria-hidden="true"></span> Annual view
-            </NavLink> 
-        </div>
+        </div>    
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="monthlyview">
                 <span class="oi oi-calendar" aria-hidden="true"></span> Monthly view

diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
-  <PropertyGroup>
-    <TargetFrameworks>net6.0; net7.0; net8.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
+	<PropertyGroup>
+	  <TargetFrameworks>net7.0; net8.0; net9.0</TargetFrameworks>
+	  <Nullable>enable</Nullable>
+	  <ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
 	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\BlazorCalendar\BlazorCalendar.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\BlazorCalendar\BlazorCalendar.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/samples/BlazorWebAssembly/Pages/Annualy.razor b/samples/BlazorWebAssembly/Pages/Annualy.razor
@@ -1,4 +1,4 @@
-@page "/annualyview"
+@page "/"
 @using BlazorCalendar
 @using BlazorCalendar.Models
 
@@ -37,7 +37,7 @@
 	private DateTime today = DateTime.Today;  
 	private int months = 8;
 	private List<Tasks> TasksList;
-	private string fakeConsole = "";
+	private string fakeConsole = string.Empty;
 	private BlazorCalendar.PriorityLabel PriorityDisplay = PriorityLabel.Code;
 	private bool draggable = true;
 

diff --git a/samples/BlazorWebAssembly/Pages/Index.razor b/samples/BlazorWebAssembly/Pages/Index.razor
diff --git a/samples/BlazorWebAssembly/Pages/Monthly.razor b/samples/BlazorWebAssembly/Pages/Monthly.razor
@@ -38,7 +38,7 @@
 	private DateTime today = DateTime.Today;  
 	private int months = 12;
 	private List<Tasks> TasksList;
-	private string fakeConsole = "";
+	private string fakeConsole = string.Empty;
 	private BlazorCalendar.PriorityLabel PriorityDisplay = PriorityLabel.Code;
 	private bool draggable = true;
 

diff --git a/samples/BlazorWebAssembly/Shared/NavMenu.razor b/samples/BlazorWebAssembly/Shared/NavMenu.razor
@@ -11,14 +11,9 @@
     <nav class="flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Index
+                <span class="oi oi-home" aria-hidden="true"></span> Annualy view
             </NavLink> 
         </div>      
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="annualyview">
-                <span class="oi oi-calendar" aria-hidden="true"></span> Annualy view
-            </NavLink>
-        </div>
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="monthlyview">
                 <span class="oi oi-calendar" aria-hidden="true"></span> Monthly view