Skip to content

Commit ec8e7b2

Browse files
ascott18ascott18
authored
feat: target net10 (#633)
1 parent be2608d commit ec8e7b2

File tree

41 files changed

+403
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+403
-122
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 6.1.0
2+
- Added support for .NET 10
3+
14
# 6.0.4
25
- AuditLogging: Stored procedure cache was not being correctly persisted to avoid redundant `SELECT OBJECT_DEFINITION` queries.
36
- Added `CoalesceOptions.PreventAspNetBrowserRefresh()` utility method to block unwanted `aspnetcore-browser-refresh.js` script.

‎Directory.Packages.props‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,38 @@
88
</PropertyGroup>
99
<!-- TargetFramework is empty for projects that aren't multi-targeting (i.e. the playground
1010
projects) -->
11-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == '' ">
11+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0'">
1212
<DotNetPackageVersionSpec>9.0.7</DotNetPackageVersionSpec>
1313
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == '' ">
15+
<DotNetPackageVersionSpec>10.0.0</DotNetPackageVersionSpec>
16+
</PropertyGroup>
17+
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
19+
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.24" />
20+
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.24" />
21+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
22+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.3" />
23+
</ItemGroup>
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0'">
25+
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.24" />
26+
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.24" />
27+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
28+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.3" />
29+
</ItemGroup>
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0'">
31+
<PackageVersion Include="Microsoft.OpenApi" Version="2.3.9" />
32+
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.24" />
33+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.1" />
34+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
35+
</ItemGroup>
36+
1437
<ItemGroup>
1538
<PackageVersion Include="Bogus" Version="35.6.1" />
1639
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
1740
<PackageVersion Include="GenFu" Version="1.4.22" />
1841
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="2.3.0" />
42+
<PackageVersion Include=" Microsoft.Build.Tasks.Core " Version="17.14.28" />
1943
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(DotNetPackageVersionSpec)" />
2044
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(DotNetPackageVersionSpec)" />
2145
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(DotNetPackageVersionSpec)" />
@@ -24,7 +48,6 @@
2448
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
2549
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
2650
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
27-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
2851
<PackageVersion Include="Microsoft.DotNet.Cli.Utils" Version="2.0.0" />
2952
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(DotNetPackageVersionSpec)" />
3053
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(DotNetPackageVersionSpec)" />
@@ -33,8 +56,6 @@
3356
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(DotNetPackageVersionSpec)" />
3457
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(DotNetPackageVersionSpec)" />
3558
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
36-
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.24" />
37-
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.24" />
3859
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.60.0" />
3960
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Core" Version="1.60.0" />
4061
<PackageVersion Include="Moq" Version="4.20.72" />
@@ -43,7 +64,6 @@
4364
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
4465
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.7" />
4566
<PackageVersion Include="Scalar.AspNetCore" Version="2.8.10" />
46-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.3" />
4767
<PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
4868
<PackageVersion Include="xunit" Version="2.9.2" />
4969
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />

‎coalesce-vue3.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"webProject": {
33
"projectFile": "./playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj",
4-
"framework": "net9.0"
4+
"framework": "net10.0"
55
},
66
"dataProject": {
77
"projectFile": "./playground/Coalesce.Domain/Coalesce.Domain.csproj",
8-
"framework": "net9.0"
8+
"framework": "net10.0"
99
},
1010
//"rootTypesWhitelist": [
1111
// "CaseDto"
1212
//],
1313
"rootGenerator": "Vue"
14-
}
14+
}

‎docs/stacks/agnostic/generation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Coalesce's code generation is run via a dotnet CLI tool, ``dotnet coalesce``. In
1010
``` xml
1111
<Project Sdk="Microsoft.NET.Sdk.Web">
1212
<PropertyGroup>
13-
<TargetFramework>net8.0</TargetFramework>
13+
<TargetFramework>net10.0</TargetFramework>
1414

1515
<!-- Necessary to use DotNetCliToolReference with modern framework versions -->
16-
<DotnetCliToolTargetFramework>net8.0</DotnetCliToolTargetFramework>
16+
<DotnetCliToolTargetFramework>net10.0</DotnetCliToolTargetFramework>
1717
</PropertyGroup>
1818

1919
...

‎docs/topics/coalesce-json.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A full example of a `coalesce.json` file, along with an explanation of each prop
2626

2727
// Optional: Framework to use when evaluating & building dependencies.
2828
// Not needed if your project only specifies a single framework - only required for multi-targeting projects.
29-
"framework": "net8.0",
29+
"framework": "net10.0",
3030

3131
// Optional: Build configuration to use when evaluating & building dependencies.
3232
// Defaults to "Debug".
@@ -43,7 +43,7 @@ A full example of a `coalesce.json` file, along with an explanation of each prop
4343

4444
// Optional: Framework to use when evaluating & building dependencies.
4545
// Not needed if your project only specifies a single framework - only required for multi-targeting projects.
46-
"framework": "net8.0",
46+
"framework": "net10.0",
4747

4848
// Optional: Build configuration to use when evaluating & building dependencies.
4949
// Defaults to "Release".

‎playground/Coalesce.Domain/Coalesce.Domain.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<!-- All these frameworks are included for testing code generation.
44
Override the used framework by specifying (framework: "tfm") in coalesce.json. -->
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
6-
6+
<InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.OpenApi.Generated</InterceptorsNamespaces>
7+
78
<Nullable>enable</Nullable>
89
<ImplicitUsings>true</ImplicitUsings>
910
<UserSecretsId>9383b630-8d8c-43f5-afd7-46f1a33f2aa9</UserSecretsId>
@@ -18,4 +19,4 @@
1819
<ProjectReference Include="..\..\src\IntelliTect.Coalesce.Swashbuckle\IntelliTect.Coalesce.Swashbuckle.csproj" />
1920
</ItemGroup>
2021

21-
</Project>
22+
</Project>

‎playground/Coalesce.Web.Vue3/Controllers/HomeController.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public HomeController(IWebHostEnvironment hostingEnvironment)
1515

1616
public IActionResult Index()
1717
{
18-
1918
IFileProvider provider = new PhysicalFileProvider(hostingEnvironment.WebRootPath);
2019
IFileInfo fileInfo = provider.GetFileInfo("index.html");
2120
if (!fileInfo.Exists)

‎playground/Coalesce.Web.Vue3/Pages/TestPage.cshtml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@page
2+
@model Coalesce.Web.Vue.Pages.TestPageModel
3+
@{
4+
}
5+
6+
<!DOCTYPE html>
7+
<html>
8+
9+
<head>
10+
<title>Test Page</title>
11+
</head>
12+
13+
<body>
14+
<h1>Test Razor Page</h1>
15+
<p>This is a test page.</p>
16+
</body>
17+
18+
</html>

‎playground/Coalesce.Web.Vue3/Pages/TestPage.cshtml.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using Microsoft.AspNetCore.Mvc.RazorPages;
2+
3+
namespace Coalesce.Web.Vue.Pages;
4+
5+
public class TestPageModel : PageModel
6+
{
7+
public void OnGet()
8+
{
9+
}
10+
}

0 commit comments

Comments
 (0)