feat: support net8.0 (#317)

IntelliTect · Sep 21, 2023 · e1ef02d · e1ef02d
1 parent 20527c5
commit e1ef02d
Show file tree

Hide file tree

Showing 27 changed files with 93 additions and 121 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,6 @@
 # Suppress: EC112
 
-[*.{vue,ts,js,scss,html,csproj,md}]
+[*.{vue,ts,js,scss,html,csproj,md,props}]
 indent_style = space
 indent_size = 2
 

diff --git a/.github/workflows/part-build.yml b/.github/workflows/part-build.yml
@@ -100,6 +100,8 @@ jobs:
           2.2.x
           6.0.x
           7.0.x
+          8.0.x
+        include-prerelease: true
 
     - run: npm ci
       working-directory: src/coalesce-vue
@@ -133,6 +135,8 @@ jobs:
         dotnet-version: | 
           6.0.x
           7.0.x
+          8.0.x
+        include-prerelease: true
 
     - run: npm ci
     - run: npx gulp coalesce
@@ -156,6 +160,8 @@ jobs:
         dotnet-version: | 
           6.0.x
           7.0.x
+          8.0.x
+        include-prerelease: true
 
     - run: npm ci
       working-directory: src/coalesce-vue
@@ -180,7 +186,9 @@ jobs:
     - run: npm i -g npm@9.5.0 # Pin NPM to avoid breaking changes like https://github.com/nodejs/node/issues/46542
     - uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: | 
+          8.0.x
+        include-prerelease: true
 
     - run: npm ci
       working-directory: src/coalesce-vue

diff --git a/coalesce-vue3.json b/coalesce-vue3.json
@@ -1,11 +1,11 @@
 {
   "webProject": {
     "projectFile": "./playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj",
-    "framework": "net7.0"
+    "framework": "net8.0"
   },
   "dataProject": {
     "projectFile": "./playground/Coalesce.Domain/Coalesce.Domain.csproj",
-    "framework": "net7.0"
+    "framework": "net8.0"
   },
   //"rootTypesWhitelist": [
   //  "CaseDto"

diff --git a/playground/Coalesce.Domain/Case.cs b/playground/Coalesce.Domain/Case.cs
@@ -231,6 +231,8 @@ public override IQueryable<Case> GetQuery(IDataSourceParameters parameters) => D
         [Coalesce]
         public static CaseSummary GetCaseSummary(AppDbContext db)
         {
+            int[] a = [1, 2, 3, 4, 5, 6, 7, 8];
+
             return CaseSummary.GetCaseSummary(db);
         }
     }

diff --git a/playground/Coalesce.Domain/Coalesce.Domain.csproj b/playground/Coalesce.Domain/Coalesce.Domain.csproj
@@ -9,7 +9,7 @@
       dotnet ef database update - -framework netcoreapp2.1 
       (no space between the dashes; space is there because double dash is illegal in XML comments).
     -->
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -32,6 +32,12 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.*" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.*-*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.*-*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*-*" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="GenFu" Version="1.4.22" />
     <PackageReference Include="Bogus" Version="34.0.2" />

diff --git a/playground/Coalesce.Domain/MyDataSource.cs b/playground/Coalesce.Domain/MyDataSource.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Linq;
-using System.Linq.Dynamic.Core;
 using IntelliTect.Coalesce.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;

diff --git a/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj b/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
 
     <Nullable>enable</Nullable>
-    <LangVersion>11.0</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/playground/Coalesce.Web.Vue3/package.json b/playground/Coalesce.Web.Vue3/package.json
@@ -11,7 +11,7 @@
     "dev": "vite",
     "lint:fix": "eslint src --fix",
     "test": "vitest",
-    "coalesce": "dotnet run --project ../../src/IntelliTect.Coalesce.DotnetTool --framework net7.0 -- ../../coalesce-vue3.json"
+    "coalesce": "dotnet run --project ../../src/IntelliTect.Coalesce.DotnetTool --framework net8.0 -- ../../coalesce-vue3.json"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.15.4",

diff --git a/playground/Directory.Build.props b/playground/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
   </PropertyGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,7 @@
     <Product>Coalesce Web Framework</Product>
     <Copyright>Copyright IntelliTect © 2020, All Rights Reserved.</Copyright>
     <DefaultLanguage>en-US</DefaultLanguage>
-    
+
     <!-- CS1591: Missing XML comment for publicly visible type or member -->
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -21,7 +21,7 @@
     <RepositoryUrl>https://github.com/IntelliTect/Coalesce</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
 
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
 
@@ -34,10 +34,20 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <DotNetPackageVersionSpec>6.0.*</DotNetPackageVersionSpec>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <DotNetPackageVersionSpec>7.0.*</DotNetPackageVersionSpec>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <DotNetPackageVersionSpec>8.0.*-*</DotNetPackageVersionSpec>
+  </PropertyGroup>
+
   <ItemGroup>
     <SourceRoot Include="$(MSBuildThisFileDirectory)/../"/>
   </ItemGroup>
-  
+
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
@@ -64,4 +74,5 @@
       <IncludeAssets>analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+
 </Project>
diff --git a/...ntelliTect.Coalesce.CodeGeneration.Tests/IntelliTect.Coalesce.CodeGeneration.Tests.csproj b/...ntelliTect.Coalesce.CodeGeneration.Tests/IntelliTect.Coalesce.CodeGeneration.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/IntelliTect.Coalesce.CodeGeneration.Tests/TargetClassesFullGenerationTest.cs b/src/IntelliTect.Coalesce.CodeGeneration.Tests/TargetClassesFullGenerationTest.cs
@@ -33,6 +33,7 @@ public async Task VueOutputCompiles()
             await Task.WhenAll(
                 Task.Run(() => AssertVueSuiteTypescriptOutputCompiles(suite, "4.9")),
                 Task.Run(() => AssertVueSuiteTypescriptOutputCompiles(suite, "5")),
+                Task.Run(() => AssertVueSuiteTypescriptOutputCompiles(suite, "5.2")),
                 Task.Run(() => AssertSuiteCSharpOutputCompiles(suite))
             );
         }

diff --git a/src/IntelliTect.Coalesce.DotnetCliTool/IntelliTect.Coalesce.DotnetCliTool.csproj b/src/IntelliTect.Coalesce.DotnetCliTool/IntelliTect.Coalesce.DotnetCliTool.csproj
@@ -10,23 +10,28 @@
   -->
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net6.0;net7.0;net8.0</TargetFrameworks>
 
     <!--    
 	    Suppress warnings about 2.1 being abandoned. 
 	    This was the last version to officially support DotNetCliToolReference,
-		so we keep building for this target framework because it doesn't require
-		hacky workarounds (<DotnetCliToolTargetFramework>) in the consuming project.
-	-->
-	<CheckEolTargetFramework Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">false</CheckEolTargetFramework>
-	  
+		  so we keep building for this target framework because it doesn't require
+		  hacky workarounds (<DotnetCliToolTargetFramework>) in the consuming project.
+	  -->
+	  <CheckEolTargetFramework Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">false</CheckEolTargetFramework>
+    
     <PlatformTarget>AnyCPU</PlatformTarget>
 
     <AssemblyName>dotnet-coalesce</AssemblyName>
     <PackageId>IntelliTect.Coalesce.Tools</PackageId>
     <PackageType>DotnetCliTool</PackageType>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <!-- Supress vulnerability warnings about .NET Core 2.1 -->
+    <PackageReference Update="Microsoft.NETCore.App" NoWarn="NU1902;NU1903"  />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="../IntelliTect.Coalesce.DotnetTool/*.cs" />
   </ItemGroup>

diff --git a/src/IntelliTect.Coalesce.DotnetTool/IntelliTect.Coalesce.DotnetTool.csproj b/src/IntelliTect.Coalesce.DotnetTool/IntelliTect.Coalesce.DotnetTool.csproj
@@ -6,7 +6,7 @@
     https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools-how-to-create
     -->
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>coalesce</ToolCommandName>

diff --git a/src/IntelliTect.Coalesce.Swashbuckle.Tests/IntelliTect.Coalesce.Swashbuckle.Tests.csproj b/src/IntelliTect.Coalesce.Swashbuckle.Tests/IntelliTect.Coalesce.Swashbuckle.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
 
@@ -12,13 +12,6 @@
     <ProjectReference Include="..\IntelliTect.Coalesce.Swashbuckle\IntelliTect.Coalesce.Swashbuckle.csproj" />
     <ProjectReference Include="..\IntelliTect.Coalesce.CodeGeneration.Tests\IntelliTect.Coalesce.CodeGeneration.Tests.csproj" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.*" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.4.0" />
@@ -30,6 +23,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(DotNetPackageVersionSpec)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/IntelliTect.Coalesce.Tests/IntelliTect.Coalesce.Tests.csproj b/src/IntelliTect.Coalesce.Tests/IntelliTect.Coalesce.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -10,16 +10,10 @@
     <ProjectReference Include="..\IntelliTect.Coalesce\IntelliTect.Coalesce.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.*" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.*" />
-  </ItemGroup>
-
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(DotNetPackageVersionSpec)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(DotNetPackageVersionSpec)" />
+
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

diff --git a/src/IntelliTect.Coalesce.Tests/Util/ReflectionRepositoryFactory.cs b/src/IntelliTect.Coalesce.Tests/Util/ReflectionRepositoryFactory.cs
@@ -4,7 +4,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/src/IntelliTect.Coalesce.Vue/DevMiddleware/NodeScriptRunner.cs b/src/IntelliTect.Coalesce.Vue/DevMiddleware/NodeScriptRunner.cs
@@ -1,19 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.NodeServices.Npm;
-using Microsoft.AspNetCore.NodeServices.Util;
-using Microsoft.AspNetCore.SpaServices.Extensions.Util;
-using Microsoft.AspNetCore.SpaServices.Util;
-using Microsoft.Extensions.Logging;
-
 
 namespace IntelliTect.Coalesce.Vue.DevMiddleware
 {

diff --git a/src/IntelliTect.Coalesce.Vue/IntelliTect.Coalesce.Vue.csproj b/src/IntelliTect.Coalesce.Vue/IntelliTect.Coalesce.Vue.csproj
@@ -2,21 +2,16 @@
 
 	<PropertyGroup>
 		<Description>Vue.js shared code for server projects for IntelliTect.Coalesce</Description>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<LangVersion>10.0</LangVersion>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\IntelliTect.Coalesce\IntelliTect.Coalesce.csproj" />
 	</ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.*" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.*" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="$(DotNetPackageVersionSpec)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/IntelliTect.Coalesce/Api/Controllers/ApiActionFilter.cs b/src/IntelliTect.Coalesce/Api/Controllers/ApiActionFilter.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Linq.Dynamic.Core;
 using IntelliTect.Coalesce.Models;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

diff --git a/src/IntelliTect.Coalesce/Api/Controllers/BaseApiController.cs b/src/IntelliTect.Coalesce/Api/Controllers/BaseApiController.cs
@@ -6,11 +6,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Dynamic.Core;
 using System.Net;
 using System.Threading.Tasks;
 

diff --git a/src/IntelliTect.Coalesce/Api/DataSources/ProjectedDtoDataSource.cs b/src/IntelliTect.Coalesce/Api/DataSources/ProjectedDtoDataSource.cs
@@ -3,19 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using IntelliTect.Coalesce.TypeDefinition;
-using Microsoft.EntityFrameworkCore.Query.Internal;
-using IntelliTect.Coalesce.Mapping.IncludeTrees;
-using IntelliTect.Coalesce.Mapping;
-using IntelliTect.Coalesce.Api;
-using IntelliTect.Coalesce.Utilities;
-using System.Collections.ObjectModel;
-using IntelliTect.Coalesce.Api.DataSources;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace IntelliTect.Coalesce
 {