Skip to content

Commit 6fc5882

Browse files
committed
删除AttributeCtorTargets特性
1 parent 3278946 commit 6fc5882

File tree

9 files changed

+21
-72
lines changed

9 files changed

+21
-72
lines changed

WebApiClient.Analyzers/AttributeCtorTargets.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

WebApiClient.Analyzers/WebApiClientHtttApi.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Microsoft.CodeAnalysis.CSharp;
33
using Microsoft.CodeAnalysis.CSharp.Syntax;
44
using Microsoft.CodeAnalysis.Diagnostics;
5+
using System;
56
using System.Collections.Generic;
67
using System.Linq;
78

@@ -207,7 +208,7 @@ private IEnumerable<AttributeData> GetInterfaceDiagnosticAttributes(ITypeSymbol
207208
{
208209
foreach (var attribuete in interfaceSymbol.GetAttributes())
209210
{
210-
if (this.CtorAttribueIsDefind(attribuete, AttributeCtorTargets.Interface) == false)
211+
if (this.CtorAttribueIsDefind(attribuete, AttributeTargets.Interface) == false)
211212
{
212213
yield return attribuete;
213214
}
@@ -223,7 +224,7 @@ private IEnumerable<AttributeData> GetMethodDiagnosticAttributes(IMethodSymbol m
223224
{
224225
foreach (var methodAttribuete in methodSymbol.GetAttributes())
225226
{
226-
if (this.CtorAttribueIsDefind(methodAttribuete, AttributeCtorTargets.Method) == false)
227+
if (this.CtorAttribueIsDefind(methodAttribuete, AttributeTargets.Method) == false)
227228
{
228229
yield return methodAttribuete;
229230
}
@@ -233,7 +234,7 @@ private IEnumerable<AttributeData> GetMethodDiagnosticAttributes(IMethodSymbol m
233234
{
234235
foreach (var parameterAttribute in parameter.GetAttributes())
235236
{
236-
if (this.CtorAttribueIsDefind(parameterAttribute, AttributeCtorTargets.Parameter) == false)
237+
if (this.CtorAttribueIsDefind(parameterAttribute, AttributeTargets.Parameter) == false)
237238
{
238239
yield return parameterAttribute;
239240
}
@@ -248,7 +249,7 @@ private IEnumerable<AttributeData> GetMethodDiagnosticAttributes(IMethodSymbol m
248249
/// <param name="attributeData"></param>
249250
/// <param name="targets">指定目标</param>
250251
/// <returns></returns>
251-
private bool CtorAttribueIsDefind(AttributeData attributeData, AttributeCtorTargets targets)
252+
private bool CtorAttribueIsDefind(AttributeData attributeData, AttributeTargets targets)
252253
{
253254
var ctorAttributes = attributeData.AttributeConstructor?.GetAttributes();
254255
if (ctorAttributes.HasValue == false)
@@ -270,7 +271,7 @@ private bool CtorAttribueIsDefind(AttributeData attributeData, AttributeCtorTarg
270271
return true;
271272
}
272273

273-
var ctorTargets = (AttributeCtorTargets)arg.Value;
274+
var ctorTargets = (AttributeTargets)arg.Value;
274275
return ctorTargets.HasFlag(targets);
275276
}
276277
}

WebApiClient/Attributes/AttributeCtorTargets.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

WebApiClient/Attributes/AttributeCtorUsageAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ public sealed class AttributeCtorUsageAttribute : Attribute
1111
/// <summary>
1212
/// 获取使用范围
1313
/// </summary>
14-
public AttributeCtorTargets Targets { get; }
14+
public AttributeTargets Targets { get; }
1515

1616
/// <summary>
1717
/// 特性的构造函数使用范围
1818
/// </summary>
1919
/// <param name="targets">使用范围</param>
20-
public AttributeCtorUsageAttribute(AttributeCtorTargets targets)
20+
public AttributeCtorUsageAttribute(AttributeTargets targets)
2121
{
2222
this.Targets = targets;
2323
}

WebApiClient/Attributes/FormFieldAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class FormFieldAttribute : ApiActionAttribute, IApiParameterAttribute, II
2929
/// <summary>
3030
/// 表示参数值作为x-www-form-urlencoded的字段
3131
/// </summary>
32-
[AttributeCtorUsage(AttributeCtorTargets.Parameter)]
32+
[AttributeCtorUsage(AttributeTargets.Parameter)]
3333
public FormFieldAttribute()
3434
{
3535
}
@@ -40,7 +40,7 @@ public FormFieldAttribute()
4040
/// <param name="name">字段名称</param>
4141
/// <param name="value">字段的值</param>
4242
/// <exception cref="ArgumentNullException"></exception>
43-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
43+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
4444
public FormFieldAttribute(string name, object value)
4545
{
4646
if (string.IsNullOrEmpty(name))

WebApiClient/Attributes/HeaderAttribute.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class HeaderAttribute : ApiActionAttribute, IApiParameterAttribute
3434
/// 将参数值设置到Header
3535
/// </summary>
3636
/// <param name="name">header名称</param>
37-
[AttributeCtorUsage(AttributeCtorTargets.Parameter)]
37+
[AttributeCtorUsage(AttributeTargets.Parameter)]
3838
public HeaderAttribute(HttpRequestHeader name)
3939
: this(RequestHeader.GetName(name), null)
4040
{
@@ -45,7 +45,7 @@ public HeaderAttribute(HttpRequestHeader name)
4545
/// </summary>
4646
/// <param name="name">header名称</param>
4747
/// <exception cref="ArgumentNullException"></exception>
48-
[AttributeCtorUsage(AttributeCtorTargets.Parameter)]
48+
[AttributeCtorUsage(AttributeTargets.Parameter)]
4949
public HeaderAttribute(string name)
5050
: this(name, null)
5151
{
@@ -56,7 +56,7 @@ public HeaderAttribute(string name)
5656
/// </summary>
5757
/// <param name="name">header名称</param>
5858
/// <param name="value">header值</param>
59-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
59+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
6060
public HeaderAttribute(HttpRequestHeader name, string value)
6161
: this(RequestHeader.GetName(name), value)
6262
{
@@ -68,7 +68,7 @@ public HeaderAttribute(HttpRequestHeader name, string value)
6868
/// <param name="name">header名称</param>
6969
/// <param name="value">header值</param>
7070
/// <exception cref="ArgumentNullException"></exception>
71-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
71+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
7272
public HeaderAttribute(string name, string value)
7373
{
7474
if (string.IsNullOrEmpty(name))

WebApiClient/Attributes/MulitpartTextAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class MulitpartTextAttribute : ApiActionAttribute, IApiParameterAttribute
2929
/// <summary>
3030
/// 表示参数值作为multipart/form-data表单的一个文本项
3131
/// </summary>
32-
[AttributeCtorUsage(AttributeCtorTargets.Parameter)]
32+
[AttributeCtorUsage(AttributeTargets.Parameter)]
3333
public MulitpartTextAttribute()
3434
{
3535
}
@@ -40,7 +40,7 @@ public MulitpartTextAttribute()
4040
/// <param name="name">字段名称</param>
4141
/// <param name="value">字段的值</param>
4242
/// <exception cref="ArgumentNullException"></exception>
43-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
43+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
4444
public MulitpartTextAttribute(string name, object value)
4545
{
4646
if (string.IsNullOrEmpty(name))

WebApiClient/Attributes/TagsAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TagsAttribute : ApiActionAttribute, IApiParameterAttribute
2525
/// </summary>
2626
/// <param name="key">Tags的key</param>
2727
/// <exception cref="ArgumentNullException"></exception>
28-
[AttributeCtorUsage(AttributeCtorTargets.Parameter)]
28+
[AttributeCtorUsage(AttributeTargets.Parameter)]
2929
public TagsAttribute(string key)
3030
: this(key, null)
3131
{
@@ -37,7 +37,7 @@ public TagsAttribute(string key)
3737
/// <param name="key">Tags的key</param>
3838
/// <param name="value">固定的值</param>
3939
/// <exception cref="ArgumentNullException"></exception>
40-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
40+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
4141
public TagsAttribute(string key, object value)
4242
{
4343
this.key = key ?? throw new ArgumentNullException(nameof(key));

WebApiClient/Attributes/TimeoutAttribute.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class TimeoutAttribute : ApiActionAttribute, IApiParameterAttribute
2222
/// 表示将参数值作为请求的超时时间
2323
/// 支持参数类型为数值类型和TimeSpan类型,以及他们的可空类型
2424
/// </summary>
25-
[AttributeCtorUsage(AttributeCtorTargets.Parameter)]
25+
[AttributeCtorUsage(AttributeTargets.Parameter)]
2626
public TimeoutAttribute()
2727
{
2828
}
@@ -31,7 +31,7 @@ public TimeoutAttribute()
3131
/// 指定请求的超时时间
3232
/// </summary>
3333
/// <param name="milliseconds">超时时间的毫秒数</param>
34-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
34+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
3535
public TimeoutAttribute(int milliseconds)
3636
: this((double)milliseconds)
3737
{
@@ -41,7 +41,7 @@ public TimeoutAttribute(int milliseconds)
4141
/// 指定请求的超时时间
4242
/// </summary>
4343
/// <param name="milliseconds">超时时间的毫秒数</param>
44-
[AttributeCtorUsage(AttributeCtorTargets.Interface | AttributeCtorTargets.Method)]
44+
[AttributeCtorUsage(AttributeTargets.Interface | AttributeTargets.Method)]
4545
public TimeoutAttribute(double milliseconds)
4646
{
4747
this.TimeSpan = System.TimeSpan.FromMilliseconds(milliseconds);

0 commit comments

Comments
 (0)