Skip to content

feat!: upgrade to .NET 10 (LTS) #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cct08311github merged 6 commits into from
Mar 20, 2026
+29 −29
Merged

feat!: upgrade to .NET 10 (LTS) #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f6a8e6
fix(ci): add dotnet10 branch to CI triggers (#674)
claude Mar 20, 2026
60a134a
fix(security): upgrade packages with known vulnerabilities (#677)
claude Mar 20, 2026
bb4603b
chore: add .claude/worktrees/ to .gitignore
claude Mar 20, 2026
2a0e9df
fix: resolve .NET 10 build compatibility issues (#675)
claude Mar 20, 2026
2a0f43e
fix: EF Core 10 API + test package upgrades
claude Mar 20, 2026
1f3390d
fix: resolve .NET 10 test compatibility issues (#676)
claude Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: WTM Build and Test
on:
workflow_dispatch:
push:
branches: [ dotnet8, "feature/**", "feat/**" ]
branches: [ dotnet8, dotnet10, "feature/**", "feat/**" ]
pull_request:
branches: [ dotnet8 ]
branches: [ dotnet8, dotnet10 ]
jobs:
release-tooling-test:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# wtm custom
.worktrees/
.claude/worktrees/

demo/WalkingTec.Mvvm.Demo/wwwroot/layuiadminsrc
.Publish/
Expand Down Expand Up @@ -281,4 +282,4 @@ __pycache__/
/demo/WalkingTec.Mvvm.VueDemo/ClientApp/yarn.lock
*.lock
/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/dist
.superpowers/
.superpowers/
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
- **BaseImportVM — 行內錯誤清單**：新增 `InlineErrors` 屬性（最多 `InlineErrorLimit` 筆，預設 50）供 API 端點直接回傳驗證錯誤（#615）。
- **BaseTemplateVM — 欄位說明列**：`ShowDescriptionRow = true`（預設）時，於模板第二行插入淺綠色斜體說明列，標示 Required/Optional、資料類型、min/max 限制；匯入時自動識別並跳過說明列（v2 標記）（#615）。

### Fixed
- **Test suite — EF Core 10 API**：`DataContext` 中 `modelBuilder.Model.SetMaxIdentifierLength(30)` 改為 `modelBuilder.HasMaxIdentifierLength(30)`，修正 EF Core 10 將內部 API 設為不可存取的問題（#676）。
- **Test suite — MSTest / Test.Sdk 版本**：`MSTest.TestAdapter` / `MSTest.TestFramework` 從 3.2.2 升至 3.6.4；`Microsoft.NET.Test.Sdk` 從 17.9.0 升至 17.12.0，確保與 .NET 10 測試主機相容（#676）。
- **Test suite — coverlet / xunit runner**：`coverlet.collector` 從 6.0.2 升至 6.0.4；`xunit.runner.visualstudio` 從 2.8.2 升至 2.8.3，修正與 Test.Sdk 17.12.0 的相容性（#676）。
- **Test suite — Serilog Sinks**：`Serilog.Sinks.InMemory` 從 0.11.0 升至 1.0.0，解決與 `Serilog.AspNetCore 10.0.0`（使用 Serilog 4.x）的型別衝突（#676）。

### Deprecated
- **Workflow API**：內建 Elsa workflow 整合（`IWorkflow`、`FrameworkWorkflow`、`ApproveTimeLine`、`ApproveInfo`、`FlowInfoTagHelper`、`IBaseCRUDVM` 工作流程方法、`DataContext.FrameworkWorkflows`）標記為 `[Obsolete]`，將於下一個主版本移除（#586）。
- **遷移指引**：若仍需工作流程功能，請直接引用 Elsa 或改用其他工作流程引擎；移除 `IWorkflow` 介面實作及相關 TagHelper。
Expand Down
2 changes: 1 addition & 1 deletion src/WalkingTec.Mvvm.Core/DataContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
{
if (DBType == DBTypeEnum.Oracle)
{
modelBuilder.Model.SetMaxIdentifierLength(30);
modelBuilder.HasMaxIdentifierLength(30);
// [Elsa removed] table mappings
// modelBuilder.Entity<Elsa_Bookmark>().ToTable("Bookmarks");
// modelBuilder.Entity<Elsa_Trigger>().ToTable("Triggers");
Expand Down
1 change: 0 additions & 1 deletion src/WalkingTec.Mvvm.Core/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public static List<Assembly> GetAllAssembly()
"Npgsql.",
"NPOI.",
"netstandard",
"MySqlConnector",
"VueCliMiddleware"
};

Expand Down
1 change: 0 additions & 1 deletion src/WalkingTec.Mvvm.Core/WalkingTec.Mvvm.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<PackageReference Include="Oracle.EntityFrameworkCore" Version="10.23.60" />
<PackageReference Include="MySql.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Quartz" Version="3.16.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/WalkingTec.Mvvm.Mvc.Tests/WalkingTec.Mvvm.Mvc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
5 changes: 2 additions & 3 deletions src/WalkingTec.Mvvm.Mvc/Filters/SwaggerFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using Swashbuckle.AspNetCore.SwaggerGen;
using WalkingTec.Mvvm.Core;

namespace WalkingTec.Mvvm.Mvc.Filters
{
public class SwaggerFilter : ISchemaFilter
{
public void Apply(OpenApiSchema schema, SchemaFilterContext context)
public void Apply(IOpenApiSchema schema, SchemaFilterContext context)
{
var type = context.Type;
if(type == typeof(List<ComboSelectListItem>))
Expand Down
16 changes: 6 additions & 10 deletions src/WalkingTec.Mvvm.Mvc/Helper/FrameworkServiceExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Auth;
using WalkingTec.Mvvm.Core.Extensions;
Expand Down Expand Up @@ -785,16 +785,12 @@ public static IServiceCollection AddWtmSwagger(this IServiceCollection services,

};
c.AddSecurityDefinition("Bearer", bearer);
var sr = new OpenApiSecurityRequirement();
sr.Add(new OpenApiSecurityScheme
c.AddSecurityRequirement(_ =>
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme,
Id = "Bearer"
}
}, new string[] { });
c.AddSecurityRequirement(sr);
var sr = new OpenApiSecurityRequirement();
sr.Add(new OpenApiSecuritySchemeReference("Bearer"), new List<string>());
return sr;
});
c.SchemaFilter<SwaggerFilter>();
if (useFullName == true)
{
Expand Down
14 changes: 7 additions & 7 deletions test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
referenced with Include in individual .csproj files.

Shared versions:
Microsoft.NET.Test.Sdk 17.9.0
MSTest.TestAdapter 3.2.2
MSTest.TestFramework 3.2.2
Microsoft.NET.Test.Sdk 17.12.0
MSTest.TestAdapter 3.6.4
MSTest.TestFramework 3.6.4
Moq 4.20.72
FluentAssertions 6.12.2
coverlet.collector 6.0.2
coverlet.collector 6.0.4

To add a new shared package, add an Update line here and
Include (without Version) in each consuming .csproj.
-->
<PropertyGroup>
<MoqVersion>4.20.72</MoqVersion>
<FluentAssertionsVersion>6.12.2</FluentAssertionsVersion>
<MSTestVersion>3.2.2</MSTestVersion>
<TestSdkVersion>17.9.0</TestSdkVersion>
<CoverletVersion>6.0.2</CoverletVersion>
<MSTestVersion>3.6.4</MSTestVersion>
<TestSdkVersion>17.12.0</TestSdkVersion>
<CoverletVersion>6.0.4</CoverletVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion test/WalkingTec.Mvvm.Core.Test/WalkingTec.Mvvm.Core.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
<PackageReference Include="Serilog.Sinks.InMemory" Version="0.11.0" />
<PackageReference Include="Serilog.Sinks.InMemory" Version="1.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
</ItemGroup>

Expand Down
Loading