Skip to content

Commit 7e148e9

Browse files
stratosbluestratosblue
committed
add tfm net8.0; remove tfm netcoreapp3.1 and net5.0;
1 parent dc3c6e8 commit 7e148e9

File tree

15 files changed

+133
-59
lines changed

15 files changed

+133
-59
lines changed

‎.github/workflows/PublishNugetPackage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET SDK
1616
uses: actions/setup-dotnet@v3
1717
with:
18-
dotnet-version: '7.0.x'
18+
dotnet-version: '8.0.x'
1919
- name: restore dependencies
2020
run: dotnet restore
2121
- name: build

‎CodeMaid.config‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5+
<section name="SteveCadwallader.CodeMaid.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<SteveCadwallader.CodeMaid.Properties.Settings>
10+
<setting name="Reorganizing_MemberTypeFields" serializeAs="String">
11+
<value>Fields||3||字段</value>
12+
</setting>
13+
<setting name="Reorganizing_MemberTypeProperties" serializeAs="String">
14+
<value>Properties||4||属性</value>
15+
</setting>
16+
<setting name="Reorganizing_MemberTypeMethods" serializeAs="String">
17+
<value>Methods||9||方法</value>
18+
</setting>
19+
<setting name="Reorganizing_MemberTypeDelegates" serializeAs="String">
20+
<value>Delegates||1||委托</value>
21+
</setting>
22+
<setting name="Reorganizing_MemberTypeEvents" serializeAs="String">
23+
<value>Events||2||事件</value>
24+
</setting>
25+
<setting name="Reorganizing_MemberTypeInterfaces" serializeAs="String">
26+
<value>Interfaces||8||接口</value>
27+
</setting>
28+
<setting name="Reorganizing_MemberTypeConstructors" serializeAs="String">
29+
<value>Constructors||6||构造函数</value>
30+
</setting>
31+
<setting name="Reorganizing_MemberTypeEnums" serializeAs="String">
32+
<value>Enums||10||枚举</value>
33+
</setting>
34+
<setting name="Reorganizing_MemberTypeDestructors" serializeAs="String">
35+
<value>Destructors||7||析构函数</value>
36+
</setting>
37+
<setting name="Reorganizing_MemberTypeIndexers" serializeAs="String">
38+
<value>Indexers||5||索引器</value>
39+
</setting>
40+
<setting name="Reorganizing_MemberTypeClasses" serializeAs="String">
41+
<value>Classes||12||类</value>
42+
</setting>
43+
<setting name="Reorganizing_MemberTypeStructs" serializeAs="String">
44+
<value>Structs||11||结构体</value>
45+
</setting>
46+
<setting name="Reorganizing_RegionsInsertNewRegions" serializeAs="String">
47+
<value>True</value>
48+
</setting>
49+
<setting name="Reorganizing_RunAtStartOfCleanup" serializeAs="String">
50+
<value>True</value>
51+
</setting>
52+
<setting name="Reorganizing_RegionsRemoveExistingRegions" serializeAs="String">
53+
<value>False</value>
54+
</setting>
55+
<setting name="Digging_PrimarySortOrder" serializeAs="String">
56+
<value>0</value>
57+
</setting>
58+
<setting name="Reorganizing_RegionsIncludeAccessLevel" serializeAs="String">
59+
<value>True</value>
60+
</setting>
61+
<setting name="General_Font" serializeAs="String">
62+
<value>Consolas</value>
63+
</setting>
64+
<setting name="Reorganizing_ReverseOrderByAccessLevel" serializeAs="String">
65+
<value>False</value>
66+
</setting>
67+
<setting name="Reorganizing_ExplicitMembersAtEnd" serializeAs="String">
68+
<value>True</value>
69+
</setting>
70+
<setting name="General_Theme" serializeAs="String">
71+
<value>1</value>
72+
</setting>
73+
<setting name="Cleaning_AutoSaveAndCloseIfOpenedByCleanup" serializeAs="String">
74+
<value>False</value>
75+
</setting>
76+
<setting name="Collapsing_CollapseSolutionWhenOpened" serializeAs="String">
77+
<value>False</value>
78+
</setting>
79+
<setting name="Collapsing_KeepSoloProjectExpanded" serializeAs="String">
80+
<value>False</value>
81+
</setting>
82+
<setting name="Cleaning_RemoveEndOfFileTrailingNewLine" serializeAs="String">
83+
<value>False</value>
84+
</setting>
85+
<setting name="Cleaning_InsertEndOfFileTrailingNewLine" serializeAs="String">
86+
<value>True</value>
87+
</setting>
88+
<setting name="Cleaning_InsertBlankLinePaddingBeforePropertiesSingleLine"
89+
serializeAs="String">
90+
<value>True</value>
91+
</setting>
92+
<setting name="Cleaning_InsertBlankLinePaddingBeforeFieldsSingleLine"
93+
serializeAs="String">
94+
<value>True</value>
95+
</setting>
96+
<setting name="Feature_SettingCleanupOnSave" serializeAs="String">
97+
<value>True</value>
98+
</setting>
99+
<setting name="Finding_TemporarilyOpenSolutionFolders" serializeAs="String">
100+
<value>False</value>
101+
</setting>
102+
<setting name="Progressing_HideBuildProgressOnBuildStop" serializeAs="String">
103+
<value>True</value>
104+
</setting>
105+
<setting name="Feature_FindInSolutionExplorer" serializeAs="String">
106+
<value>False</value>
107+
</setting>
108+
</SteveCadwallader.CodeMaid.Properties.Settings>
109+
</userSettings>
110+
</configuration>

‎Cuture.AspNetCore.ResponseAutoWrapper.sln‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cuture.AspNetCore.ResponseA
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseAutoWrapper.BenchmarkHost", "test\ResponseAutoWrapper.BenchmarkHost\ResponseAutoWrapper.BenchmarkHost.csproj", "{5D1825E3-5801-45B2-9423-8BE58E69C1AC}"
2727
EndProject
28-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{08A4E6D1-373E-4E59-B0AD-E78E711793F3}"
29-
EndProject
30-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{10375BEE-CD2F-4DE6-891F-26590777E429}"
31-
ProjectSection(SolutionItems) = preProject
32-
.github\workflows\PublishNugetPackage.yml = .github\workflows\PublishNugetPackage.yml
33-
EndProjectSection
34-
EndProject
35-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomStructureWebApplication", "sample\CustomStructureWebApplication\CustomStructureWebApplication.csproj", "{ADD4ADD6-A3FF-44FE-AEE8-B8758E1F13F5}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomStructureWebApplication", "sample\CustomStructureWebApplication\CustomStructureWebApplication.csproj", "{ADD4ADD6-A3FF-44FE-AEE8-B8758E1F13F5}"
3629
EndProject
3730
Global
3831
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -74,8 +67,6 @@ Global
7467
{69144DD5-E0FB-4FCF-8763-579D0A16E7D5} = {617DB063-D28A-4F46-A93F-FF89ADD787AC}
7568
{BB62B5BF-27B1-4DEC-90EC-75E48B11E886} = {E536BBD4-DBE4-4C31-A179-837B78A29A8B}
7669
{5D1825E3-5801-45B2-9423-8BE58E69C1AC} = {64317A26-58AF-45C1-A285-4EBB0A678BCC}
77-
{08A4E6D1-373E-4E59-B0AD-E78E711793F3} = {20964519-17B2-4D4B-9E75-E83D57AAB3B7}
78-
{10375BEE-CD2F-4DE6-891F-26590777E429} = {08A4E6D1-373E-4E59-B0AD-E78E711793F3}
7970
{ADD4ADD6-A3FF-44FE-AEE8-B8758E1F13F5} = {617DB063-D28A-4F46-A93F-FF89ADD787AC}
8071
EndGlobalSection
8172
GlobalSection(ExtensibilityGlobals) = postSolution

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
44

55
<Nullable>enable</Nullable>
66
<LangVersion>latest</LangVersion>

‎README.MD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
![执行流程概览](./execution_flow.png)
1818

1919
## 2. 注意项
20-
- 目标框架`net6.0`、`net5.0`、`netcoreapp3.1`
20+
- 目标框架`net6.0+`
2121
- 包装功能由两个包装器实现：
2222
- 基于`ResultFilter`的`ActionResult`包装器：针对方法的返回值包装；
2323
- 基于`中间件`的包装器：针对异常、非200响应包装；

‎sample/CustomStructureWebApplication/CustomStructureWebApplication.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55

66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
77
</PropertyGroup>

‎sample/SimpleWebApplication/SimpleWebApplication.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55

66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
77
</PropertyGroup>

‎src/Cuture.AspNetCore.ResponseAutoWrapper/Cuture.AspNetCore.ResponseAutoWrapper.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<IsPackable>true</IsPackable>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010

11-
<Version>1.1.1</Version>
12-
<Description>用于`asp.net core`的响应和异常自动包装器，使`Action`提供一致的响应内容格式</Description>
11+
<Version>1.2.0</Version>
12+
<Description>Response and exception automatic wrapper for `asp.net core` to provide a consistent response content format for `Action`. 用于`asp.net core`的响应和异常自动包装器，使`Action`提供一致的响应内容格式。</Description>
1313

1414
<PackageIdPrefix>Cuture.AspNetCore.ResponseAutoWrapper</PackageIdPrefix>
1515
<Authors>Stratos</Authors>

‎src/Cuture.AspNetCore.ResponseAutoWrapper/Extensions/ServiceCollectionResponseAutoWrapperExtensions.cs‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
using Microsoft.Extensions.DependencyInjection.Extensions;
1212
using Microsoft.Extensions.Options;
1313

14-
#if NET5_0_OR_GREATER
1514
using Microsoft.AspNetCore.Authorization;
16-
#endif
1715

1816
namespace Microsoft.Extensions.DependencyInjection;
1917

@@ -95,15 +93,8 @@ public static IResponseAutoWrapperBuilder<TResponse, TCode, TMessage> AddRespons
9593
public static IResponseAutoWrapperBuilder<TResponse, TCode, TMessage> AddResponseAutoWrapper<TResponse, TCode, TMessage>(this IServiceCollection services, ResponseAutoWrapperOptions options)
9694
where TResponse : class
9795
{
98-
if (services is null)
99-
{
100-
throw new ArgumentNullException(nameof(services));
101-
}
102-
103-
if (options is null)
104-
{
105-
throw new ArgumentNullException(nameof(options));
106-
}
96+
ArgumentNullException.ThrowIfNull(services);
97+
ArgumentNullException.ThrowIfNull(options);
10798

10899
services.AddControllers();
109100

@@ -119,12 +110,10 @@ public static IResponseAutoWrapperBuilder<TResponse, TCode, TMessage> AddRespons
119110
options.Filters.AddService<ResponseAutoWrapResultFilter<TResponse, TCode, TMessage>>(Constants.DefaultFilterOrder);
120111
});
121112

122-
#if NET5_0_OR_GREATER
123113
if (options.HandleAuthorizationResult)
124114
{
125115
services.TryAddEnumerable(ServiceDescriptor.Singleton<IAuthorizationMiddlewareResultHandler, AutoWrapperAuthorizationMiddlewareResultHandler>());
126116
}
127-
#endif
128117

129118
if (options.HandleInvalidModelState)
130119
{

‎src/Cuture.AspNetCore.ResponseAutoWrapper/Microsoft.AspNetCore/Authorization/AutoWrapperAuthorizationMiddlewareResultHandler.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if NET5_0_OR_GREATER
2-
using System.Threading.Tasks;
1+
using System.Threading.Tasks;
32

43
using Microsoft.AspNetCore.Authorization.Policy;
54
using Microsoft.AspNetCore.Http;
@@ -33,4 +32,3 @@ public Task HandleAsync(RequestDelegate next, HttpContext context, Authorization
3332

3433
#endregion Public 方法
3534
}
36-
#endif

0 commit comments

Comments
 (0)