diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index c42a908521952f290749a82b8dd1734049c48b57..67db377264762e0ccda69358316c87b7b566b1fc 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 e239cafd2021b4f7915974c78d3694258c132a89..9f1188dd50e1ed24fa7d0641549966b5c370da7a 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 3eb6500f5469cf6d1032c3e6252c51767b929a49..474302205579b1e1b6307eb0f9179b649719c5b1 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 f358cc376539dc64cbd45c82fdc6372d5393c22a..5ff7023e3e25562bb0f9bc2d593491a3d1831d72 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 b5a0faa52e67e6341a290c3a094a0667d1bb648c..360c2f1acb02e815e413f0dccbbd0c5f539ace17 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 5226f27144227d62698f298a3f0f3327e91d130a..b96abf736efe2578c2240d35eb3b56ccfae7247f 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 7faa35e7e131e7e0f601adee4f9e1ba963ecb5b1..9106194373ba47d3128ebc5fc7905f20d2f421c5 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 c667b9947f27645777354932e26220546758a4a0..005fa0f768866f57238648ce8415ca2f74799462 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 666a8b58332199b963fd7bf3256db16f36189ca8..a4d96327976c300fda0b847de411567af9bbb2e7 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 9928b923371dc87542dca48b8f9225f20f395a9f..a5d72ad59e6f04f884ba58b0f079cc6b0fbdfa9c 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 cda492514d5cdcdc901337ba33a2c5e384579a68..97d6cdb8c0bcd0f5f4bc24c710fea60c52baa417 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 13921ea752cda1280e492a1ea287fb66230bb594..5df0caf7af2a8fedda2658e40ee7d2735ef878b3 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 bfe1afed494a56b2fded654fcdae41f12bb57cc4..77c482cc0b7c901f219401d575be88519ee54cb5 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 3cb7328288c00b2c4ec5f46e7b1540b1e1ec7962..26cd12c7ba714be2bd015ec423fbc860b3e6241c 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 732403e0d437bef070868243f7fe767f7f5de599..089bb5cd6952d851a9e89b20cdcbfb3ab293238a 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 20907f95dd286a0af63c260406c19594738c8d6b..3870112a7b6e51a8b570e27d083a8c87f27f021d 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 e2f358ff3541296a324da94da8888cfa3c197220..30be87efcf411052b2a5ed94105a306a98a6fb7e 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 538a8a3dcf80bae0ea603a183b5a1f28da10ab5c..6275aefc5f5f9848fa8a4353f50dde9379b538e1 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 e56c2f1fb3423e2cdd69d86adaa09efeac456e62..c4ff5817a54b729efa55b0ce93da61166c0f7b5d 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 8fcf713f8cb08cac9685bbe7ec277babe3edd351..b99cc8d4ca9a4184f8b298dca2f36f0d3a4d8d13 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 645b1924c7fdbcc991ad38314f173bb494e8b8c4..a465776abfb6ed90a8f0bea4b9a077142775f3f4 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 43642fe3b1863a9677b6cb3c6104630bd868faa3..bfe456a19daa0c354bee1408a38743e8b3defa17 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 1527e62118aea5879959e230024a32c69afe246c..d75155e2517a6c3f8c1ead52fa0b9da94df75b0f 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 646ff5594e2687e593479389d6ed3c7f36eaca91..04f8b40335d7be809013026fb0614bd66bb9d55f 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 6ed91070556ce4854e208c218a8b754d30754ca9..3acb8c6adc65b83e37274cf9e9f012b7fb3ef817 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 12f0098d6de54b55e93d3e7f8ef8bbad2cb504a2..4d4bdb6ecb9e50af8bcfbb9146ba40eaadc9a58f 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 053960d99f8e40e76d3691f045891679e190e8ad..3d30813f1e197b26a8fb77883ef6437fb696964c 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 dca65b742a8b84bfd401e627eb373e2eac92ac17..5dfec3d396ec7001620f3df142917fb9b3a112a7 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 7606cb0b85332d3fd1faa77db07d26c2cd1db1cd..9fc50156ba4676a278420206803088307a42657e 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 c1c1bed89bcdf1f0a6a2d789fa9d474ecff87080..064fb8ec8dbfebb20924dff8a7118fcaf510573a 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 3e122d2c98441a33f01f2b8a35270b2b13d49b74..2f49ff5296e8fbc63a4d13423c5c20cc6f390c7e 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 e6405082c0becb450ae472aa01b42fbf0572e1b0..3c60a35997c78cc9421ed7135732a9cdcd499c16 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 8783a3d79c6982c308a3b03201fe3b56280348ad..06c918692ee2ed59b92cbf47d9992823643f9518 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 a6136dca68c1b85f305ceab89d57b148d5c90a58..89e866c060ba9870f11b0a3491df1c1476cd4c7f 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 6ecfecc30a563594845c23fdd9e15cef8734b516..4fa9d0166e5d65f08efbc36337bc4017b87a070c 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 248c286adf6f2c93a7ba1c5209aa2ae13facbff0..e3def0a7a20bc28d5a53c92c9d9ece3ea95f9755 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 d46fdb61f2e599188e5a771a3caed771874a3ce5..eeb917145ecc654b9d2af999f9fcfd2ff5c98fd8 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 7ddca26b5be69dd29f4a39ca7d041f718b39a551..6d96e8f0ab788a938768df04ba103da768752f1a 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 963e80d06be2a89c2d0250f9edf1a8a98d948af0..e6f0ee1ef2d271ab3cd0347f89bd551d0b267ee3 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 12f0098d6de54b55e93d3e7f8ef8bbad2cb504a2..4d4bdb6ecb9e50af8bcfbb9146ba40eaadc9a58f 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 acaea8757a032bbd9a7675e97d5c2d2f8ea23659..3e96b8c7cc19e22cb33772ab0901fdb159291db9 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 7c88e54f30d201675474f9b25c70c2dcc5003e51..8f50bb25e588e72902bb349d4c815dd7daf074ca 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 a41ec1754b5c37c7b4939b967652cd037309dc97..42aeb1f84b56d8ef4dc4780500e919e8857f6616 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 f0b1aa8111d10f24794b478238687545c582426f..8cc3a4c6e5813edd0931b0540d763f2d077154dc 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 d42d8ac9ed0e1a2e1e7ab7d16986e9277c83a362..491ff1bc2b11fb14908f326a33220c25e94e4e37 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 d87a93af25987ac0c3b0466f48cd62e7829f8b23..255d446cc88794def4f4c44d1af8f1946dfdec2a 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 12f0098d6de54b55e93d3e7f8ef8bbad2cb504a2..4d4bdb6ecb9e50af8bcfbb9146ba40eaadc9a58f 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 9039cf9ef0efbac92aee2522f11e32973c7904d6..203ddc035768046389a15ef67e3129175c320a8e 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 dffee41aca050acf29f9a867b5bcc02751de17f3..3fca9e499fb89587dcdd5d24934f4dd21366045d 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 90c616e5231f5970593e4a4d758c4cfe6299eeef..3b8ab02f8ba7d73344dc32a01558671cdf19463c 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 70cd412d120fbefa39fdabcee8c7ca2c851a4dde..42539f698e9253c090b9536a2a4204dfdbd1e2e6 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 a33862508d03e28656d89f991e1d773e5058a98d..b433d1ee09ceb76af2fff173d027008bd2071bbb 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 0e4ffd4302259ba899dfe1c41dc286f137d1ee51..74facab78be9bd4ae50180ca1361fb923d403b86 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 7bfd422940a020e08dd9723c3904c2bf19cce0fb..21a289641e6be71dee081f8cb2ef0a27399fd433 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 a14517697cd63dc6dab94eb6bf09572caf7407a6..ce4670d67f8e60847ff3eb76154271f487619ee2 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 a4de4846c4826c8da2fa9367d6b4f01dcad39162..1f9006d80bc9548233ea96e400e7b6594a41ceec 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 aea09304a5b2e73660201b7d2ad5bf2892631384..6ce7aba7a79fa9cc3cd7a0b3cfed67faf740f696 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 15762b04a3a1c87ebcfbebc1b1ce56cbc55e5f9b..8d7d8163e8112fe69436024f65fe9e3d44b80984 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 4e8f28b2497b132309d7d0b7ed6adf1a1236be82..996cf22d5d88ee20a0631bfd39c05ae85d4fd04c 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 cda492514d5cdcdc901337ba33a2c5e384579a68..97d6cdb8c0bcd0f5f4bc24c710fea60c52baa417 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 09ced20d685e64134b96b14c89be6cd9600f4d68..78e91556312ed28289205a66c6e1659e3b6bf181 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 565b58eea43d72e9ec4b7b09f78333cb9c116d0e..733a3e6c7c79601ecd611138e4111a03ce3ffc11 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 e873d4b96f26fbc697306201f3ed1f692aa025ac..be256d814ad8a841756cb1d809610f6f5bf48bba 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 dba1788e5c1963ba774b5a1db8b8866dfb26fd4d..47ff589f4622b9cbf71c7ff2187c829f89a39e39 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 538a8a3dcf80bae0ea603a183b5a1f28da10ab5c..6275aefc5f5f9848fa8a4353f50dde9379b538e1 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 b56627a31c3ec695347af4b3be996041482ec46d..accab53970051c5841907510c70548f92ad04de8 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 c4e9240192d830548c6008d44c6b0a98a617b06d..340e3eb328da643d7c2b8cf0dd9697cf4dd09f45 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 c8786c38c2930332eb519dcce688eeece5511761..1ced764707831d704e981f451409050179909311 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 11faa162173a32b2a66a281d34b2de6d088455ce..eebcc8869457aa125a183758f419904c27c4c0b0 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 6ed91070556ce4854e208c218a8b754d30754ca9..3acb8c6adc65b83e37274cf9e9f012b7fb3ef817 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 3f89d84824d55d7459929854af9c2432c97d3f6c..c6f7415caa161aee94403e68e9cc2645120618af 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 ba380867084818cce5bc4ab44ca26b0ae085f3bd..934c38d526e45a00f04102495dc5edc83a341f73 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 7e21d6f4b6eca3db406c919e12b50ca37d305532..ad3f8b6ab39c6c9c5b84cf12f0fcabaddeea55f3 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 bb3869a6401eef85473252e0a8d9b4f20cc06998..62cab308b09274842353bca83b3521d34cad0658 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 e6405082c0becb450ae472aa01b42fbf0572e1b0..3c60a35997c78cc9421ed7135732a9cdcd499c16 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 b6782b5da5d133ce6e2d536d948757f6ec5b8b12..d01c2d2a949b019560f6aa7b0f3d1d78dca4f633 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 c9ed53147afd291e84336e9d9cf89527880ad1a8..86550bc66a337b91ecb8ec131f77c7ebb64cabd1 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 0869f689f0c0fcb4dbca9f586cf0c23cecac73f0..f376f389fd85918ba0456f40eec2f71ec685c5cf 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 1324a0138df309fa115a27fb116d8d9a8c31782e..2d98d94b2de38b78004d4f0694fc70ed498a7522 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 963e80d06be2a89c2d0250f9edf1a8a98d948af0..e6f0ee1ef2d271ab3cd0347f89bd551d0b267ee3 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 3f89d84824d55d7459929854af9c2432c97d3f6c..c6f7415caa161aee94403e68e9cc2645120618af 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 888b710983890fe2b900c27aefcf20bd6d20529e..2c586bcd990bd1a4b7ebe3f4c44a12578294f3d4 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 0379af0b71292e62a25d5db0df99735f53b8ad6a..f835ed022e32a9e3a82d25a68bb5174a9241849a 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 34238c55166b8c69d8fd8ed7e001237ebeb6817c..4a8ed301a925d470cc9401d78106ef69251d643c 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 d87a93af25987ac0c3b0466f48cd62e7829f8b23..255d446cc88794def4f4c44d1af8f1946dfdec2a 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 3f89d84824d55d7459929854af9c2432c97d3f6c..c6f7415caa161aee94403e68e9cc2645120618af 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 0d9ac151f723ea500039c87883d1d5f1845b37b6..75c0a20cbd19d55d223fee198080f1c00ae44723 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 d8a06acf2869b9a4c3ba4b03275576364a2f9a87..dbeda3404dcdbaca2bedd54c108c7f2eaaed91fa 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 6c7c70d89d18b60b01edb354266e109409287ea3..af4a2047320a592a85ed022529c746e297cca44b 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 0e4ffd4302259ba899dfe1c41dc286f137d1ee51..74facab78be9bd4ae50180ca1361fb923d403b86 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 4de6913f118cf81da165f11ef1946e0d401a5816..4bc40639e2d3e2aa7938efa91fe4c840189c2790 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 36b6a8271873739d0ab5cee930fff9ac4ffc3d80..e50da73dc334fe5b692142139c8212e15c8764ba 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 de59d573c88803240adb149ffab3eee299342c9a..e3cfa5196b17c584c848e9b8181b02dc2fa0942b 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 559dc39c1fbea44b8afffa5201cbe4a3290e39a3..f4d56ed7282774572c59405c1fac538c626042fc 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