Merge pull request #106 from edandersen/feature/net-8

.NET 8 update

.github/workflows/dotnet-core-pull-request.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/dotnet-core.yml

@@ -1,4 +1,4 @@
-name: .NET 6 & 7
+name: .NET 8
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/master_core-admin-demo.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: dotnet publish
         run: dotnet publish src\DotNetEd.CoreAdmin.DemoAppDotNet6\DotNetEd.CoreAdmin.DemoAppDotNet6.csproj -c Release -o "${{env.DOTNET_ROOT}}\myapp" --framework net7.0

DotNetEd.CoreAdmin.sln

@@ -14,10 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.github\workflows\dotnet-core-pull-request.yml = .github\workflows\dotnet-core-pull-request.yml
 		.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
+		.github\workflows\master_core-admin-demo.yml = .github\workflows\master_core-admin-demo.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetEd.CoreAdmin.DemoAppDotNet6", "src\DotNetEd.CoreAdmin.DemoAppDotNet6\DotNetEd.CoreAdmin.DemoAppDotNet6.csproj", "{A3A57016-920D-4173-B054-891E42769923}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetEd.CoreAdmin.DemoAppDotNet8", "src\DotNetEd.CoreAdmin.DemoAppDotNet8\DotNetEd.CoreAdmin.DemoAppDotNet8.csproj", "{6C4638AD-33BA-4FFD-8608-45F081F17467}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,10 +38,10 @@ Global
 		{DEFCA510-EDB9-4D6C-8DF6-D006504C2046}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DEFCA510-EDB9-4D6C-8DF6-D006504C2046}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DEFCA510-EDB9-4D6C-8DF6-D006504C2046}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3A57016-920D-4173-B054-891E42769923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3A57016-920D-4173-B054-891E42769923}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3A57016-920D-4173-B054-891E42769923}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3A57016-920D-4173-B054-891E42769923}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C4638AD-33BA-4FFD-8608-45F081F17467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C4638AD-33BA-4FFD-8608-45F081F17467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C4638AD-33BA-4FFD-8608-45F081F17467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C4638AD-33BA-4FFD-8608-45F081F17467}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/DotNetEd.CoreAdmin.DemoAppDotNet6/DotNetEd.CoreAdmin.DemoAppDotNet6.csproj → src/DotNetEd.CoreAdmin.DemoAppDotNet8/DotNetEd.CoreAdmin.DemoAppDotNet8.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -17,10 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
-     <PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
+     <PackageReference Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
 
-	</ItemGroup>
+    </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DotNetEd.CoreAdmin\DotNetEd.CoreAdmin.csproj" />

src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Shared/_Layout.cshtml → src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Shared/_Layout.cshtml

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - DotNetEd.CoreAdmin.DemoAppDotNet6</title>
+    <title>@ViewData["Title"] - DotNetEd.CoreAdmin.DemoAppDotNet8</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/DotNetEd.CoreAdmin.DemoAppDotNet6.styles.css" asp-append-version="true" />
@@ -12,7 +12,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index">DotNetEd.CoreAdmin.DemoAppDotNet6</a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index">DotNetEd.CoreAdmin.DemoAppDotNet8</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -38,7 +38,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2021 - DotNetEd.CoreAdmin.DemoAppDotNet6 - <a asp-area="" asp-page="/Privacy">Privacy</a>
+            &copy; 2024
         </div>
     </footer>
 

src/DotNetEd.CoreAdmin/DotNetEd.CoreAdmin.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<PreserveCompilationContext>false</PreserveCompilationContext>
 		<SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking>
 		<PackageId>CoreAdmin</PackageId>
-		<PackageVersion>2.7.1</PackageVersion>
-		<Description>Automagically add an Admin Panel to your .NET 6 or .NET 7 web app.</Description>
+		<PackageVersion>3.0.0</PackageVersion>
+		<Description>Automagically add an Admin Panel to your .NET 8 web app.</Description>
 		<Title>Core Admin Panel for ASP.NET Core</Title>
 		<Authors>edandersen</Authors>
-		<Copyright>Copyright ©2022 Ed Andersen</Copyright>
+		<Copyright>Copyright ©2024 Ed Andersen</Copyright>
 		<PackageProjectUrl>https://github.com/edandersen/core-admin</PackageProjectUrl>
 		<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
 		<Nullable>disable</Nullable>
@@ -44,8 +44,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-		<PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+		<PackageReference Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
 		<PackageReference Include="NonFactors.Grid.Core.Mvc6" Version="7.2.0" />
 	</ItemGroup>
 

src/DotNetEd.CoreAdmin/Views/CoreAdminData/Index.cshtml

@@ -2,7 +2,7 @@
 @using Microsoft.Extensions.Localization
 @using NonFactors.Mvc.Grid
 @using System.Linq.Expressions
-@using Microsoft.EntityFrameworkCore
+@using Microsoft.EntityFrameworkCore;
 @using System.ComponentModel.DataAnnotations;
 @using System.Reflection
 @inject IEnumerable<DotNetEd.CoreAdmin.CoreAdminOptions> CoreAdminOptions

tests/DotNetEd.CoreAdmin.IntegrationTestApp/DotNetEd.CoreAdmin.IntegrationTestApp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 

tests/DotNetEd.CoreAdmin.IntegrationTests/DotNetEd.CoreAdmin.IntegrationTests.csproj

@@ -1,22 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>annotations</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>