chore: net9

ascott18 · ascott18 · commit 869fc0478403 · 2024-11-14T09:31:13.000-08:00
diff --git a/.github/workflows/part-build.yml b/.github/workflows/part-build.yml
@@ -19,6 +19,7 @@ jobs:
       with:
         dotnet-version: | 
           8.0.x
+          9.0.x
 
     - run: npm ci
       working-directory: src/coalesce-vue
@@ -47,6 +48,7 @@ jobs:
       with:
         dotnet-version: | 
           8.0.x
+          9.0.x
 
     - run: npm ci
       working-directory: src/coalesce-vue
@@ -71,6 +73,7 @@ jobs:
       with:
         dotnet-version: | 
           8.0.x
+          9.0.x
 
     - run: npm ci
       working-directory: src/coalesce-vue
diff --git a/.github/workflows/part-template-build.yml b/.github/workflows/part-template-build.yml
@@ -28,6 +28,7 @@ jobs:
       with:
         dotnet-version: | 
           8.0.x
+          9.0.x
 
     - name: "Set dependency versions"
       if: success() && env.COALESCE_VERSION
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -64,6 +64,7 @@ jobs:
       with:
         dotnet-version: | 
           8.0.x
+          9.0.x
 
     - name: Download Artifacts
       uses: actions/download-artifact@v4
diff --git a/Coalesce.sln b/Coalesce.sln
@@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Coalesce.lutconfig = Coalesce.lutconfig
 		src\Common.props = src\Common.props
 		src\Directory.Build.props = src\Directory.Build.props
-		src\Directory.Packages.props = src\Directory.Packages.props
+		Directory.Packages.props = Directory.Packages.props
 		CHANGELOG.md = CHANGELOG.md
 	EndProjectSection
 EndProject
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,12 +3,12 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <DotNetPackageVersionSpec>6.0.*</DotNetPackageVersionSpec>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
+    <DotNetPackageVersionSpec>8.0.10</DotNetPackageVersionSpec>
   </PropertyGroup>
   <!-- TargetFramework is empty for projects that aren't multi-targeting (i.e. the playground projects) -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == '' ">
-    <DotNetPackageVersionSpec>8.0.10</DotNetPackageVersionSpec>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == '' ">
+    <DotNetPackageVersionSpec>9.0.0</DotNetPackageVersionSpec>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Bogus" Version="35.6.1" />
@@ -41,14 +41,14 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration" Version="2.2.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
   </ItemGroup>
 </Project>
diff --git a/playground/Coalesce.Domain/Case.cs b/playground/Coalesce.Domain/Case.cs
@@ -161,7 +161,7 @@ public async Task UploadImage(AppDbContext db, IFile file)
             }
 
             var content = new byte[file.Length];
-            await file.Content.ReadAsync(content.AsMemory());
+            await file.Content.ReadExactlyAsync(content.AsMemory());
 
             AttachmentContent = new CaseAttachmentContent() { CaseKey = CaseKey, Content = content };
             AttachmentName = file.Name;
diff --git a/playground/Coalesce.Domain/Coalesce.Domain.csproj b/playground/Coalesce.Domain/Coalesce.Domain.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- All these frameworks are included for testing code generation.
     Override the used framework by specifying (framework: "tfm") in coalesce.json. -->
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/playground/Coalesce.Domain/WebShared/DemoMiddleware.cs b/playground/Coalesce.Domain/WebShared/DemoMiddleware.cs
@@ -26,7 +26,7 @@ public async Task Invoke(HttpContext context)
             var cookie = context.Request.Cookies.FirstOrDefault(c => c.Key == "SecurityTestRole");
             if (!cookie.Equals(default(KeyValuePair<string, string>))
                 && validRoles.Contains(cookie.Value)
-                && context.Request.Host.Value.Contains("localhost", System.StringComparison.OrdinalIgnoreCase))
+                && context.Request.Host.Value?.Contains("localhost", System.StringComparison.OrdinalIgnoreCase) == true)
             {
                 if (cookie.Value != "None")
                 {
@@ -39,7 +39,7 @@ public async Task Invoke(HttpContext context)
                 cookie = context.Request.Cookies.FirstOrDefault(c => c.Key == "DemoUserRole");
                 if (!cookie.Equals(default(KeyValuePair<string, string>))
                     && validRoles.Contains(cookie.Value)
-                    && context.Request.Host.Value.Contains("localhost", System.StringComparison.OrdinalIgnoreCase))
+                    && context.Request.Host.Value?.Contains("localhost", System.StringComparison.OrdinalIgnoreCase) == true)
                 {
                     await SignInUser(context, "DemoUser", cookie.Value);
                 }
diff --git a/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj b/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     
     <Nullable>enable</Nullable>
diff --git a/playground/Coalesce.Web.Vue3/src/App.vue b/playground/Coalesce.Web.Vue3/src/App.vue
@@ -20,6 +20,7 @@
       <v-btn variant="text" to="/test">Test</v-btn>
       <v-btn variant="text" to="/test-setup">Test2</v-btn>
       <v-btn variant="text" to="/audit-logs">Audit</v-btn>
+      <v-btn variant="text" to="/swagger">OpenAPI</v-btn>
       <v-btn variant="text" href="/coalesce-security">Security Overview</v-btn>
 
       <v-menu offset-y>
diff --git a/src/Common.props b/src/Common.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/IntelliTect.Coalesce.AuditLogging.Tests/SqlServerAuditTests.cs b/src/IntelliTect.Coalesce.AuditLogging.Tests/SqlServerAuditTests.cs
@@ -5,7 +5,13 @@ namespace IntelliTect.Coalesce.AuditLogging.Tests;
 
 public class SqlServerAuditTests
 {
-    private const string SqlServerConnString = "Server=(localdb)\\MSSQLLocalDB;Database=CoalesceAuditLoggingTests;Trusted_Connection=True;Timeout=5";
+    private const string SqlServerConnString = "Server=(localdb)\\MSSQLLocalDB;Database=CoalesceAuditLoggingTests" +
+#if NET9_0
+"net9" +
+#else
+"net8" +
+#endif
+        ";Trusted_Connection=True;Timeout=5";
 
     [SkippableFact]
     public async Task WithSqlServer_UpdatesExistingRecordForLikeChanges()
diff --git a/src/IntelliTect.Coalesce.CodeGeneration/Analysis/MsBuild/MsBuildProjectContextBuilder.cs b/src/IntelliTect.Coalesce.CodeGeneration/Analysis/MsBuild/MsBuildProjectContextBuilder.cs
@@ -73,7 +73,7 @@ private string InstallTargets()
             {
                 using var stream = thisAssembly.GetManifestResourceStream($"{baseResourceName}.{file.Replace("/", ".")}");
                 var fileBytes = new byte[stream.Length];
-                stream.Read(fileBytes, 0, fileBytes.Length);
+                stream.ReadExactly(fileBytes);
 
                 var filePath = Path.Combine(targetLocation, file);
                 Directory.CreateDirectory(Path.GetDirectoryName(filePath));
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,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
 
diff --git a/src/IntelliTect.Coalesce.Swashbuckle/IntelliTect.Coalesce.Swashbuckle.csproj b/src/IntelliTect.Coalesce.Swashbuckle/IntelliTect.Coalesce.Swashbuckle.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Description>
       Provides Swashbuckle SwaggerGen filters to enhance definitions of Coalesce APIs in OpenAPI documents.
       Add using `services.AddSwaggerGen(c =&gt; c.AddCoalesce() );`.
diff --git a/src/IntelliTect.Coalesce/Mapping/IncludeTree/IncludeTree.cs b/src/IntelliTect.Coalesce/Mapping/IncludeTree/IncludeTree.cs
@@ -87,6 +87,7 @@ private class FakeQueryCompiler : IQueryCompiler
             public Func<QueryContext, TResult> CreateCompiledQuery<TResult>(Expression query) => Throw<Func<QueryContext, TResult>>();
             public TResult Execute<TResult>(Expression query) => Throw<TResult>();
             public TResult ExecuteAsync<TResult>(Expression query, CancellationToken cancellationToken) => Throw<TResult>();
+            public Expression<Func<QueryContext, TResult>> PrecompileQuery<TResult>(Expression query, bool async) => Throw<Expression<Func<QueryContext, TResult>>>();
 
             [DoesNotReturn]
             private T Throw<T>()

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public async Task UploadImage(AppDbContext db, IFile file)`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`var content = new byte[file.Length];`
`164`		`- await file.Content.ReadAsync(content.AsMemory());`
	`164`	`+ await file.Content.ReadExactlyAsync(content.AsMemory());`
`165`	`165`
`166`	`166`	`AttachmentContent = new CaseAttachmentContent() { CaseKey = CaseKey, Content = content };`
`167`	`167`	`AttachmentName = file.Name;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public async Task Invoke(HttpContext context)`
`26`	`26`	`var cookie = context.Request.Cookies.FirstOrDefault(c => c.Key == "SecurityTestRole");`
`27`	`27`	`if (!cookie.Equals(default(KeyValuePair<string, string>))`
`28`	`28`	`&& validRoles.Contains(cookie.Value)`
`29`		`- && context.Request.Host.Value.Contains("localhost", System.StringComparison.OrdinalIgnoreCase))`
	`29`	`+ && context.Request.Host.Value?.Contains("localhost", System.StringComparison.OrdinalIgnoreCase) == true)`
`30`	`30`	`{`
`31`	`31`	`if (cookie.Value != "None")`
`32`	`32`	`{`
`@@ -39,7 +39,7 @@ public async Task Invoke(HttpContext context)`
`39`	`39`	`cookie = context.Request.Cookies.FirstOrDefault(c => c.Key == "DemoUserRole");`
`40`	`40`	`if (!cookie.Equals(default(KeyValuePair<string, string>))`
`41`	`41`	`&& validRoles.Contains(cookie.Value)`
`42`		`- && context.Request.Host.Value.Contains("localhost", System.StringComparison.OrdinalIgnoreCase))`
	`42`	`+ && context.Request.Host.Value?.Contains("localhost", System.StringComparison.OrdinalIgnoreCase) == true)`
`43`	`43`	`{`
`44`	`44`	`await SignInUser(context, "DemoUser", cookie.Value);`
`45`	`45`	`}`