From 5e8caa9bb8cb712433c88e58a5859c692250dbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Mon, 14 Oct 2024 14:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8A=20=E7=A7=BB=E9=99=A4=20`.NET6`=20?= =?UTF-8?q?=E5=92=8C=20`.NET7`=20=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/Directory.Build.props | 3 +- ...ion.Extras.Authentication.JwtBearer.csproj | 8 ------ ...rion.Extras.DatabaseAccessor.Dapper.csproj | 10 +------ ...ion.Extras.DatabaseAccessor.MongoDB.csproj | 10 +------ ...on.Extras.DatabaseAccessor.SqlSugar.csproj | 10 +------ ...Extras.DependencyModel.CodeAnalysis.csproj | 14 ---------- .../Furion.Extras.Logging.Serilog.csproj | 12 +------- .../Furion.Extras.ObjectMapper.Mapster.csproj | 14 +--------- ...Extras.DependencyModel.CodeAnalysis.csproj | 12 -------- .../src/.template.config/template.json | 18 +----------- .../FurionApi.Application.csproj | 14 ---------- .../src/FurionApi.Core/FurionApi.Core.csproj | 12 -------- .../FurionApi.Database.Migrations.csproj | 8 ------ .../FurionApi.EntityFramework.Core.csproj | 8 ------ .../FurionApi.Web.Core.csproj | 12 -------- .../FurionApi.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionApp.Application.csproj | 14 ---------- .../src/FurionApp.Core/FurionApp.Core.csproj | 12 -------- .../FurionApp.Database.Migrations.csproj | 8 ------ .../FurionApp.EntityFramework.Core.csproj | 8 ------ .../FurionApp.Web.Core.csproj | 12 -------- .../FurionApp.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionBlazor.Application.csproj | 12 -------- .../FurionBlazor.Core.csproj | 10 ------- .../FurionBlazor.Database.Migrations.csproj | 8 ------ .../FurionBlazor.EntityFramework.Core.csproj | 8 ------ .../FurionBlazor.Web.Core.csproj | 10 ------- .../FurionBlazor.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionBlazorApi.Application.csproj | 14 ---------- .../FurionBlazorApi.Core.csproj | 12 -------- ...FurionBlazorApi.Database.Migrations.csproj | 8 ------ ...urionBlazorApi.EntityFramework.Core.csproj | 8 ------ .../FurionBlazorApi.Web.Core.csproj | 12 -------- .../FurionBlazorApi.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionMvc.Application.csproj | 12 -------- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 10 ------- .../FurionMvc.Database.Migrations.csproj | 8 ------ .../FurionMvc.EntityFramework.Core.csproj | 8 ------ .../FurionMvc.Web.Core.csproj | 10 ------- .../FurionMvc.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionRazor.Application.csproj | 12 -------- .../FurionRazor.Core/FurionRazor.Core.csproj | 10 ------- .../FurionRazor.Database.Migrations.csproj | 8 ------ .../FurionRazor.EntityFramework.Core.csproj | 8 ------ .../FurionRazor.Web.Core.csproj | 10 ------- .../FurionRazor.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionRazorApi.Application.csproj | 14 ---------- .../FurionRazorApi.Core.csproj | 12 -------- .../FurionRazorApi.Database.Migrations.csproj | 8 ------ ...FurionRazorApi.EntityFramework.Core.csproj | 8 ------ .../FurionRazorApi.Web.Core.csproj | 12 -------- .../FurionRazorApi.Web.Entry.csproj | 28 ------------------- .../src/.template.config/template.json | 18 +----------- .../FurionApi.Application.csproj | 14 ---------- .../src/FurionApi.Core/FurionApi.Core.csproj | 12 -------- .../FurionApi.Web.Core.csproj | 12 -------- .../FurionApi.Web.Entry.csproj | 14 ---------- .../src/.template.config/template.json | 18 +----------- .../FurionApp.Application.csproj | 14 ---------- .../src/FurionApp.Core/FurionApp.Core.csproj | 12 -------- .../FurionApp.Web.Core.csproj | 12 -------- .../FurionApp.Web.Entry.csproj | 14 ---------- .../src/.template.config/template.json | 18 +----------- .../FurionBlazor.Application.csproj | 12 -------- .../FurionBlazor.Core.csproj | 10 ------- .../FurionBlazor.Web.Core.csproj | 10 ------- .../FurionBlazor.Web.Entry.csproj | 14 ---------- .../src/.template.config/template.json | 18 +----------- .../FurionBlazorApi.Application.csproj | 14 ---------- .../FurionBlazorApi.Core.csproj | 12 -------- .../FurionBlazorApi.Web.Core.csproj | 12 -------- .../FurionBlazorApi.Web.Entry.csproj | 14 ---------- .../src/.template.config/template.json | 18 +----------- .../FurionMvc.Application.csproj | 12 -------- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 10 ------- .../FurionMvc.Web.Core.csproj | 10 ------- .../FurionMvc.Web.Entry.csproj | 14 ---------- .../src/.template.config/template.json | 18 +----------- .../FurionRazor.Application.csproj | 12 -------- .../FurionRazor.Core/FurionRazor.Core.csproj | 10 ------- .../FurionRazor.Web.Core.csproj | 10 ------- .../FurionRazor.Web.Entry.csproj | 14 ---------- .../src/.template.config/template.json | 18 +----------- .../FurionRazorApi.Application.csproj | 14 ---------- .../FurionRazorApi.Core.csproj | 12 -------- .../FurionRazorApi.Web.Core.csproj | 12 -------- .../FurionRazorApi.Web.Entry.csproj | 14 ---------- tools/Furion.Tools/Directory.Build.props | 3 +- 94 files changed, 23 insertions(+), 1227 deletions(-) diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index c42a908521..67db377264 100644 --- a/framework/Directory.Build.props +++ b/framework/Directory.Build.props @@ -1,8 +1,9 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 4.9.5.15 enable + enable 百小僧 百签科技（广东）有限公司 Furion diff --git a/framework/Furion.Extras.Authentication.JwtBearer/Furion.Extras.Authentication.JwtBearer.csproj b/framework/Furion.Extras.Authentication.JwtBearer/Furion.Extras.Authentication.JwtBearer.csproj index e239cafd20..9f1188dd50 100644 --- a/framework/Furion.Extras.Authentication.JwtBearer/Furion.Extras.Authentication.JwtBearer.csproj +++ b/framework/Furion.Extras.Authentication.JwtBearer/Furion.Extras.Authentication.JwtBearer.csproj @@ -4,14 +4,6 @@ Furion Jwt 授权验证拓展插件。 - - - - - - - - diff --git a/framework/Furion.Extras.DatabaseAccessor.Dapper/Furion.Extras.DatabaseAccessor.Dapper.csproj b/framework/Furion.Extras.DatabaseAccessor.Dapper/Furion.Extras.DatabaseAccessor.Dapper.csproj index 3eb6500f54..4743022055 100644 --- a/framework/Furion.Extras.DatabaseAccessor.Dapper/Furion.Extras.DatabaseAccessor.Dapper.csproj +++ b/framework/Furion.Extras.DatabaseAccessor.Dapper/Furion.Extras.DatabaseAccessor.Dapper.csproj @@ -4,16 +4,8 @@ Furion 数据库访问器 Dapper 插件。 - - - - - - - - - + diff --git a/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj b/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj index f358cc3765..5ff7023e3e 100644 --- a/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj +++ b/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj @@ -4,16 +4,8 @@ Furion 数据库访问器 MongoDB 插件。 - - - - - - - - - + diff --git a/framework/Furion.Extras.DatabaseAccessor.SqlSugar/Furion.Extras.DatabaseAccessor.SqlSugar.csproj b/framework/Furion.Extras.DatabaseAccessor.SqlSugar/Furion.Extras.DatabaseAccessor.SqlSugar.csproj index b5a0faa52e..360c2f1acb 100644 --- a/framework/Furion.Extras.DatabaseAccessor.SqlSugar/Furion.Extras.DatabaseAccessor.SqlSugar.csproj +++ b/framework/Furion.Extras.DatabaseAccessor.SqlSugar/Furion.Extras.DatabaseAccessor.SqlSugar.csproj @@ -4,16 +4,8 @@ Furion 数据库访问器 SqlSugar 插件。 - - - - - - - - - + diff --git a/framework/Furion.Extras.DependencyModel.CodeAnalysis/Furion.Extras.DependencyModel.CodeAnalysis.csproj b/framework/Furion.Extras.DependencyModel.CodeAnalysis/Furion.Extras.DependencyModel.CodeAnalysis.csproj index 5226f27144..b96abf736e 100644 --- a/framework/Furion.Extras.DependencyModel.CodeAnalysis/Furion.Extras.DependencyModel.CodeAnalysis.csproj +++ b/framework/Furion.Extras.DependencyModel.CodeAnalysis/Furion.Extras.DependencyModel.CodeAnalysis.csproj @@ -4,20 +4,6 @@ Furion 程序集扫描和代码分析拓展插件。 - - - - - - - - - - - - - - diff --git a/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj b/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj index 7faa35e7e1..9106194373 100644 --- a/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj +++ b/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj @@ -5,19 +5,9 @@ 0618 - - - - - - - - - - - + diff --git a/framework/Furion.Extras.ObjectMapper.Mapster/Furion.Extras.ObjectMapper.Mapster.csproj b/framework/Furion.Extras.ObjectMapper.Mapster/Furion.Extras.ObjectMapper.Mapster.csproj index c667b9947f..005fa0f768 100644 --- a/framework/Furion.Extras.ObjectMapper.Mapster/Furion.Extras.ObjectMapper.Mapster.csproj +++ b/framework/Furion.Extras.ObjectMapper.Mapster/Furion.Extras.ObjectMapper.Mapster.csproj @@ -4,22 +4,10 @@ Furion 对象映射 Mapster 插件。 - - - - - - - - - - - - - + diff --git a/framework/Furion.Pure.Extras.DependencyModel.CodeAnalysis/Furion.Pure.Extras.DependencyModel.CodeAnalysis.csproj b/framework/Furion.Pure.Extras.DependencyModel.CodeAnalysis/Furion.Pure.Extras.DependencyModel.CodeAnalysis.csproj index 666a8b5833..a4d9632797 100644 --- a/framework/Furion.Pure.Extras.DependencyModel.CodeAnalysis/Furion.Pure.Extras.DependencyModel.CodeAnalysis.csproj +++ b/framework/Furion.Pure.Extras.DependencyModel.CodeAnalysis/Furion.Pure.Extras.DependencyModel.CodeAnalysis.csproj @@ -4,18 +4,6 @@ Furion 程序集扫描和代码分析拓展插件。 - - - - - - - - - - - - diff --git a/templates/FurionApiTemplate/src/.template.config/template.json b/templates/FurionApiTemplate/src/.template.config/template.json index 9928b92337..a5d72ad59e 100644 --- a/templates/FurionApiTemplate/src/.template.config/template.json +++ b/templates/FurionApiTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj b/templates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj index cda492514d..97d6cdb8c0 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApi.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionApi.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index 13921ea752..5df0caf7af 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApi.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApi.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionApiTemplate/src/FurionApi.Database.Migrations/FurionApi.Database.Migrations.csproj b/templates/FurionApiTemplate/src/FurionApi.Database.Migrations/FurionApi.Database.Migrations.csproj index bfe1afed49..77c482cc0b 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Database.Migrations/FurionApi.Database.Migrations.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Database.Migrations/FurionApi.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionApiTemplate/src/FurionApi.EntityFramework.Core/FurionApi.EntityFramework.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.EntityFramework.Core/FurionApi.EntityFramework.Core.csproj index 3cb7328288..26cd12c7ba 100644 --- a/templates/FurionApiTemplate/src/FurionApi.EntityFramework.Core/FurionApi.EntityFramework.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.EntityFramework.Core/FurionApi.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj index 732403e0d4..089bb5cd69 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApi.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApi.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj b/templates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj index 20907f95dd..3870112a7b 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -28,20 +14,6 @@ true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/FurionAppTemplate/src/.template.config/template.json b/templates/FurionAppTemplate/src/.template.config/template.json index e2f358ff35..30be87efcf 100644 --- a/templates/FurionAppTemplate/src/.template.config/template.json +++ b/templates/FurionAppTemplate/src/.template.config/template.json @@ -24,14 +24,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -42,15 +34,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj b/templates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj index 538a8a3dcf..6275aefc5f 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApp.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionApp.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index e56c2f1fb3..c4ff5817a5 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApp.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApp.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionAppTemplate/src/FurionApp.Database.Migrations/FurionApp.Database.Migrations.csproj b/templates/FurionAppTemplate/src/FurionApp.Database.Migrations/FurionApp.Database.Migrations.csproj index 8fcf713f8c..b99cc8d4ca 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Database.Migrations/FurionApp.Database.Migrations.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Database.Migrations/FurionApp.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionAppTemplate/src/FurionApp.EntityFramework.Core/FurionApp.EntityFramework.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.EntityFramework.Core/FurionApp.EntityFramework.Core.csproj index 645b1924c7..a465776abf 100644 --- a/templates/FurionAppTemplate/src/FurionApp.EntityFramework.Core/FurionApp.EntityFramework.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.EntityFramework.Core/FurionApp.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj index 43642fe3b1..bfe456a19d 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApp.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApp.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj b/templates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj index 1527e62118..d75155e251 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -28,20 +14,6 @@ true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/FurionBlazorTemplate/src/.template.config/template.json b/templates/FurionBlazorTemplate/src/.template.config/template.json index 646ff5594e..04f8b40335 100644 --- a/templates/FurionBlazorTemplate/src/.template.config/template.json +++ b/templates/FurionBlazorTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj index 6ed9107055..3acb8c6adc 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - enable - - - - net7.0 - 1701;1702;1591 - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 12f0098d6d..4d4bdb6ecb 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Database.Migrations/FurionBlazor.Database.Migrations.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Database.Migrations/FurionBlazor.Database.Migrations.csproj index 053960d99f..3d30813f1e 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Database.Migrations/FurionBlazor.Database.Migrations.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Database.Migrations/FurionBlazor.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.EntityFramework.Core/FurionBlazor.EntityFramework.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.EntityFramework.Core/FurionBlazor.EntityFramework.Core.csproj index dca65b742a..5dfec3d396 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.EntityFramework.Core/FurionBlazor.EntityFramework.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.EntityFramework.Core/FurionBlazor.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj index 7606cb0b85..9fc50156ba 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj index c1c1bed89b..064fb8ec8d 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -28,20 +14,6 @@ true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json b/templates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json index 3e122d2c98..2f49ff5296 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json +++ b/templates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj index e6405082c0..3c60a35997 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionBlazorApi.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionBlazorApi.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 8783a3d79c..06c918692e 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionBlazorApi.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionBlazorApi.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Database.Migrations/FurionBlazorApi.Database.Migrations.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Database.Migrations/FurionBlazorApi.Database.Migrations.csproj index a6136dca68..89e866c060 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Database.Migrations/FurionBlazorApi.Database.Migrations.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Database.Migrations/FurionBlazorApi.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.EntityFramework.Core/FurionBlazorApi.EntityFramework.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.EntityFramework.Core/FurionBlazorApi.EntityFramework.Core.csproj index 6ecfecc30a..4fa9d0166e 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.EntityFramework.Core/FurionBlazorApi.EntityFramework.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.EntityFramework.Core/FurionBlazorApi.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj index 248c286adf..e3def0a7a2 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionBlazorApi.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionBlazorApi.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj index d46fdb61f2..eeb917145e 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -28,20 +14,6 @@ true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/FurionMvcTemplate/src/.template.config/template.json b/templates/FurionMvcTemplate/src/.template.config/template.json index 7ddca26b5b..6d96e8f0ab 100644 --- a/templates/FurionMvcTemplate/src/.template.config/template.json +++ b/templates/FurionMvcTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj index 963e80d06b..e6f0ee1ef2 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - enable - - - - net7.0 - 1701;1702;1591 - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 12f0098d6d..4d4bdb6ecb 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Database.Migrations/FurionMvc.Database.Migrations.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Database.Migrations/FurionMvc.Database.Migrations.csproj index acaea8757a..3e96b8c7cc 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Database.Migrations/FurionMvc.Database.Migrations.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Database.Migrations/FurionMvc.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.EntityFramework.Core/FurionMvc.EntityFramework.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.EntityFramework.Core/FurionMvc.EntityFramework.Core.csproj index 7c88e54f30..8f50bb25e5 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.EntityFramework.Core/FurionMvc.EntityFramework.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.EntityFramework.Core/FurionMvc.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj index a41ec1754b..42aeb1f84b 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj index f0b1aa8111..8cc3a4c6e5 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -28,20 +14,6 @@ true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/FurionRazorTemplate/src/.template.config/template.json b/templates/FurionRazorTemplate/src/.template.config/template.json index d42d8ac9ed..491ff1bc2b 100644 --- a/templates/FurionRazorTemplate/src/.template.config/template.json +++ b/templates/FurionRazorTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj index d87a93af25..255d446cc8 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - enable - - - - net7.0 - 1701;1702;1591 - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 12f0098d6d..4d4bdb6ecb 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Database.Migrations/FurionRazor.Database.Migrations.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Database.Migrations/FurionRazor.Database.Migrations.csproj index 9039cf9ef0..203ddc0357 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Database.Migrations/FurionRazor.Database.Migrations.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Database.Migrations/FurionRazor.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.EntityFramework.Core/FurionRazor.EntityFramework.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.EntityFramework.Core/FurionRazor.EntityFramework.Core.csproj index dffee41aca..3fca9e499f 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.EntityFramework.Core/FurionRazor.EntityFramework.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.EntityFramework.Core/FurionRazor.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj index 90c616e523..3b8ab02f8b 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj index 70cd412d12..42539f698e 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -36,20 +22,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/FurionRazorWithWebApiTemplate/src/.template.config/template.json b/templates/FurionRazorWithWebApiTemplate/src/.template.config/template.json index a33862508d..b433d1ee09 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/.template.config/template.json +++ b/templates/FurionRazorWithWebApiTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj index 0e4ffd4302..74facab78b 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionRazorApi.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionRazorApi.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 7bfd422940..21a289641e 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionRazorApi.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionRazorApi.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Database.Migrations/FurionRazorApi.Database.Migrations.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Database.Migrations/FurionRazorApi.Database.Migrations.csproj index a14517697c..ce4670d67f 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Database.Migrations/FurionRazorApi.Database.Migrations.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Database.Migrations/FurionRazorApi.Database.Migrations.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.EntityFramework.Core/FurionRazorApi.EntityFramework.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.EntityFramework.Core/FurionRazorApi.EntityFramework.Core.csproj index a4de4846c4..1f9006d80b 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.EntityFramework.Core/FurionRazorApi.EntityFramework.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.EntityFramework.Core/FurionRazorApi.EntityFramework.Core.csproj @@ -1,13 +1,5 @@  - - net6.0 - - - - net7.0 - - net8.0 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj index aea09304a5..6ce7aba7a7 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionRazorApi.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionRazorApi.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj index 15762b04a3..8d7d8163e8 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable @@ -36,20 +22,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionApiTemplate/src/.template.config/template.json index 4e8f28b249..996cf22d5d 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/.template.config/template.json @@ -23,14 +23,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -41,15 +33,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj index cda492514d..97d6cdb8c0 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Application/FurionApi.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApi.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionApi.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index 09ced20d68..78e9155631 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApi.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApi.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj index 565b58eea4..733a3e6c7c 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Core/FurionApi.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApi.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApi.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj index e873d4b96f..be256d814a 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionAppTemplate/src/.template.config/template.json index dba1788e5c..47ff589f46 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/.template.config/template.json @@ -25,14 +25,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -43,15 +35,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj index 538a8a3dcf..6275aefc5f 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Application/FurionApp.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApp.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionApp.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index b56627a31c..accab53970 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApp.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApp.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj index c4e9240192..340e3eb328 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Core/FurionApp.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionApp.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionApp.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj index c8786c38c2..1ced764707 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Web.Entry/FurionApp.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/.template.config/template.json index 11faa16217..eebcc88694 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj index 6ed9107055..3acb8c6adc 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Application/FurionBlazor.Application.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - enable - - - - net7.0 - 1701;1702;1591 - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 3f89d84824..c6f7415caa 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj index ba38086708..934c38d526 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Core/FurionBlazor.Web.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj index 7e21d6f4b6..ad3f8b6ab3 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Web.Entry/FurionBlazor.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json index bb3869a640..62cab308b0 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj index e6405082c0..3c60a35997 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Application/FurionBlazorApi.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionBlazorApi.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionBlazorApi.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index b6782b5da5..d01c2d2a94 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionBlazorApi.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionBlazorApi.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj index c9ed53147a..86550bc66a 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Core/FurionBlazorApi.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionBlazorApi.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionBlazorApi.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj index 0869f689f0..f376f389fd 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Web.Entry/FurionBlazorApi.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionMvcTemplate/src/.template.config/template.json index 1324a0138d..2d98d94b2d 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj index 963e80d06b..e6f0ee1ef2 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Application/FurionMvc.Application.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - enable - - - - net7.0 - 1701;1702;1591 - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 3f89d84824..c6f7415caa 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj index 888b710983..2c586bcd99 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Core/FurionMvc.Web.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj index 0379af0b71..f835ed022e 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Web.Entry/FurionMvc.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionRazorTemplate/src/.template.config/template.json index 34238c5516..4a8ed301a9 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj index d87a93af25..255d446cc8 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Application/FurionRazor.Application.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - enable - - - - net7.0 - 1701;1702;1591 - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 3f89d84824..c6f7415caa 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj index 0d9ac151f7..75c0a20cbd 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Core/FurionRazor.Web.Core.csproj @@ -1,15 +1,5 @@  - - net6.0 - 1701;1702;1591 - - - - net7.0 - 1701;1702;1591 - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj index d8a06acf28..dbeda3404d 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Web.Entry/FurionRazor.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/.template.config/template.json b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/.template.config/template.json index 6c7c70d89d..af4a204732 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/.template.config/template.json +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/.template.config/template.json @@ -16,14 +16,6 @@ "type": "parameter", "datatype": "choice", "choices": [ - { - "choice": "net6", - "description": ".NET6 脚手架" - }, - { - "choice": "net7", - "description": ".NET7 脚手架" - }, { "choice": "net8", "description": ".NET8 脚手架" @@ -34,15 +26,7 @@ } ], "defaultValue": "net8", - "description": "选择要创建的 .NET6-9 脚手架" - }, - "net6": { - "type": "computed", - "value": "(framework == \"net6\")" - }, - "net7": { - "type": "computed", - "value": "(framework == \"net7\")" + "description": "选择要创建的 .NET8-9 脚手架" }, "net8": { "type": "computed", diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj index 0e4ffd4302..74facab78b 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Application/FurionRazorApi.Application.csproj @@ -1,19 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionRazorApi.Application.xml - enable - - - - net7.0 - 1701;1702;1591 - FurionRazorApi.Application.xml - enable - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 4de6913f11..4bc40639e2 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionRazorApi.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionRazorApi.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj index 36b6a82718..e50da73dc3 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Core/FurionRazorApi.Web.Core.csproj @@ -1,17 +1,5 @@  - - net6.0 - 1701;1702;1591 - FurionRazorApi.Web.Core.xml - - - - net7.0 - 1701;1702;1591 - FurionRazorApi.Web.Core.xml - - net8.0 1701;1702;1591 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj index de59d573c8..e3cfa5196b 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Web.Entry/FurionRazorApi.Web.Entry.csproj @@ -1,19 +1,5 @@  - - net6.0 - enable - en-US - true - - - - net7.0 - enable - en-US - true - - net8.0 enable diff --git a/tools/Furion.Tools/Directory.Build.props b/tools/Furion.Tools/Directory.Build.props index 559dc39c1f..f4d56ed728 100644 --- a/tools/Furion.Tools/Directory.Build.props +++ b/tools/Furion.Tools/Directory.Build.props @@ -1,8 +1,9 @@  - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 4.9.5.15 enable + enable 百小僧 百签科技（广东）有限公司 Furion -- Gitee