Merge pull request #27 from soenneker/master

Adds .NET 8 support
JustinWilkinson · Dec 1, 2023 · 228b983 · 228b983
2 parents 3eb1e59 + 8c85692
commit 228b983
Show file tree

Hide file tree

Showing 33 changed files with 690 additions and 635 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup .NET Core 3.1
         uses: actions/setup-dotnet@v1
@@ -41,6 +41,11 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
+      - name: Setup .NET 8.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
       - name: Install dependencies
         run: dotnet restore
 
@@ -55,12 +60,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Setup .NET Core 7.0
+      - name: Setup .NET Core 8.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/DataTables.Blazor.Demo.Server/DataTables.Blazor.Demo.Server.csproj b/DataTables.Blazor.Demo.Server/DataTables.Blazor.Demo.Server.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/DataTables.Blazor.Demo.Server/packages.lock.json b/DataTables.Blazor.Demo.Server/packages.lock.json
diff --git a/DataTables.Blazor.Demo/DataTables.Blazor.Demo.csproj b/DataTables.Blazor.Demo/DataTables.Blazor.Demo.csproj
@@ -1,18 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
         <IsPublishable>false</IsPublishable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5"
-                          PrivateAssets="all" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
         <PackageReference Include="RazorTabs" Version="2.0.0" />
-        <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/DataTables.Blazor.Demo/Pages/Index.razor b/DataTables.Blazor.Demo/Pages/Index.razor
@@ -580,7 +580,7 @@ private record Weather
 
     private readonly DataTableOptions _buttonsDemoOptions = new DataTableOptions
     {
-        DOM = "Bfrtip",
+        Dom = "Bfrtip",
         Buttons = new List<object>
         {
             "colvis"
@@ -596,7 +596,7 @@ private record Weather
 
     private readonly DataTableOptions _eventsDemoOptions = new DataTableOptions
     {
-        DOM = "Bfrtip", 
+        Dom = "Bfrtip", 
         RowId = "id",
         Buttons = new List<object>
         {

diff --git a/DataTables.Blazor.Demo/Shared/MainLayout.razor b/DataTables.Blazor.Demo/Shared/MainLayout.razor
@@ -1,4 +1,5 @@
 @inherits LayoutComponentBase
+@using DataTables.Blazor.Demo.Shared
 
 <div class="sidebar">
     <NavMenu />

diff --git a/DataTables.Blazor.Demo/Shared/NavMenu.razor b/DataTables.Blazor.Demo/Shared/NavMenu.razor
@@ -1,4 +1,6 @@
-<div class="top-row pl-4 navbar navbar-dark">
+@using Microsoft.AspNetCore.Components.Web
+
+<div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">DataTables.Blazor.Demo</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>