Skip to content

Commit ba08c5c

Browse files
kant2002kant2002
committed
Fix bunch of annontations
1 parent 1bcdb23 commit ba08c5c

File tree

11 files changed

+181
-22
lines changed

11 files changed

+181
-22
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<DocumentationFile>$(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml</DocumentationFile>
1919
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2020
<Product>Core $(BaseProduct)</Product>
21-
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
22-
<NoWarn>$(NoWarn);IL2026;IL2057;IL2067;IL2070;IL2072;IL2075;IL2077;IL2080;IL2093;IL2111</NoWarn>
21+
<EnableTrimAnalyzer Condition="$(TargetFramework)=='net6.0'">true</EnableTrimAnalyzer>
22+
<NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
2323
</PropertyGroup>
2424
<PropertyGroup>
2525
<DebugType>portable</DebugType>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDataReader.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Data.Common;
1010
using System.Data.SqlTypes;
1111
using System.Diagnostics;
12+
using System.Diagnostics.CodeAnalysis;
1213
using System.Globalization;
1314
using System.IO;
1415
using System.Reflection;
@@ -438,6 +439,10 @@ internal void Bind(TdsParserStateObject stateObj)
438439
_defaultLCID = _parser.DefaultLCID;
439440
}
440441

442+
#if NET6_0_OR_GREATER
443+
[SuppressMessage("ReflectionAnalysis", "IL2111",
444+
Justification = "System.Type.TypeInitializer would not be used in dataType and providerSpecificDataType columns.")]
445+
#endif
441446
internal DataTable BuildSchemaTable()
442447
{
443448
_SqlMetaDataSet md = this.MetaData;
@@ -1232,6 +1237,11 @@ override public IEnumerator GetEnumerator()
12321237
}
12331238

12341239
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldType/*' />
1240+
#if NET6_0_OR_GREATER
1241+
[SuppressMessage("ReflectionAnalysis", "IL2093:MismatchOnMethodReturnValueBetweenOverrides",
1242+
Justification = "Annotations for DbDataReader was not shipped in net6.0")]
1243+
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
1244+
#endif
12351245
override public Type GetFieldType(int i)
12361246
{
12371247
SqlStatistics statistics = null;
@@ -1248,6 +1258,9 @@ override public Type GetFieldType(int i)
12481258
}
12491259
}
12501260

1261+
#if NET6_0_OR_GREATER
1262+
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
1263+
#endif
12511264
private Type GetFieldTypeInternal(_SqlMetaData metaData)
12521265
{
12531266
Type fieldType = null;

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Data.Common;
1111
using System.Data.SqlTypes;
1212
using System.Diagnostics;
13+
using System.Diagnostics.CodeAnalysis;
1314
using System.Globalization;
1415
using System.Security;
1516
using System.Security.Authentication;
@@ -564,6 +565,9 @@ public void CopyFrom(SqlMetaDataXmlSchemaCollection original)
564565

565566
sealed internal class SqlMetaDataUdt
566567
{
568+
#if NET6_0_OR_GREATER
569+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
570+
#endif
567571
internal Type Type;
568572
internal string DatabaseName;
569573
internal string SchemaName;

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6+
using System.Diagnostics.CodeAnalysis;
67
using System.Linq;
78
using System.Reflection;
89
using System.Text.RegularExpressions;
@@ -154,7 +155,11 @@ private static SqlRetryLogicBaseProvider ResolveRetryLogicProvider(string config
154155
return null;
155156
}
156157

157-
private static object CreateInstance(Type type, string retryMethodName, SqlRetryLogicOption option)
158+
private static object CreateInstance(
159+
#if NET6_0_OR_GREATER
160+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicMethods)]
161+
#endif
162+
Type type, string retryMethodName, SqlRetryLogicOption option)
158163
{
159164
string methodName = nameof(CreateInstance);
160165
SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Entry point.", TypeName, methodName);

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiMetaData.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Data;
88
using System.Data.SqlTypes;
99
using System.Diagnostics;
10+
using System.Diagnostics.CodeAnalysis;
1011
using System.Globalization;
1112

1213
namespace Microsoft.Data.SqlClient.Server
@@ -228,6 +229,9 @@ internal SmiMetaData(
228229
byte scale,
229230
long localeId,
230231
SqlCompareOptions compareOptions,
232+
#if NET6_0_OR_GREATER
233+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
234+
#endif
231235
Type userDefinedType
232236
)
233237
: this(
@@ -253,6 +257,9 @@ internal SmiMetaData(
253257
byte scale,
254258
long localeId,
255259
SqlCompareOptions compareOptions,
260+
#if NET6_0_OR_GREATER
261+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
262+
#endif
256263
Type userDefinedType,
257264
bool isMultiValued,
258265
IList<SmiExtendedMetaData> fieldTypes,
@@ -282,6 +289,9 @@ internal SmiMetaData(
282289
byte scale,
283290
long localeId,
284291
SqlCompareOptions compareOptions,
292+
#if NET6_0_OR_GREATER
293+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
294+
#endif
285295
Type userDefinedType,
286296
string udtAssemblyQualifiedName,
287297
bool isMultiValued,
@@ -759,6 +769,9 @@ internal SmiExtendedMetaData(
759769
byte scale,
760770
long localeId,
761771
SqlCompareOptions compareOptions,
772+
#if NET6_0_OR_GREATER
773+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
774+
#endif
762775
Type userDefinedType,
763776
string name,
764777
string typeSpecificNamePart1,
@@ -792,6 +805,9 @@ internal SmiExtendedMetaData(
792805
byte scale,
793806
long localeId,
794807
SqlCompareOptions compareOptions,
808+
#if NET6_0_OR_GREATER
809+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
810+
#endif
795811
Type userDefinedType,
796812
bool isMultiValued,
797813
IList<SmiExtendedMetaData> fieldMetaData,
@@ -829,6 +845,9 @@ internal SmiExtendedMetaData(
829845
byte scale,
830846
long localeId,
831847
SqlCompareOptions compareOptions,
848+
#if NET6_0_OR_GREATER
849+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
850+
#endif
832851
Type userDefinedType,
833852
string udtAssemblyQualifiedName,
834853
bool isMultiValued,
@@ -903,6 +922,9 @@ internal SmiParameterMetaData(
903922
byte scale,
904923
long localeId,
905924
SqlCompareOptions compareOptions,
925+
#if NET6_0_OR_GREATER
926+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
927+
#endif
906928
Type userDefinedType,
907929
bool isMultiValued,
908930
IList<SmiExtendedMetaData> fieldMetaData,
@@ -942,6 +964,9 @@ internal SmiParameterMetaData(
942964
byte scale,
943965
long localeId,
944966
SqlCompareOptions compareOptions,
967+
#if NET6_0_OR_GREATER
968+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
969+
#endif
945970
Type userDefinedType,
946971
string udtAssemblyQualifiedName,
947972
bool isMultiValued,
@@ -1020,6 +1045,9 @@ internal SmiStorageMetaData(
10201045
byte scale,
10211046
long localeId,
10221047
SqlCompareOptions compareOptions,
1048+
#if NET6_0_OR_GREATER
1049+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
1050+
#endif
10231051
Type userDefinedType,
10241052
string name,
10251053
string typeSpecificNamePart1,
@@ -1069,6 +1097,9 @@ internal SmiStorageMetaData(
10691097
byte scale,
10701098
long localeId,
10711099
SqlCompareOptions compareOptions,
1100+
#if NET6_0_OR_GREATER
1101+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
1102+
#endif
10721103
Type userDefinedType,
10731104
bool isMultiValued,
10741105
IList<SmiExtendedMetaData> fieldMetaData,
@@ -1123,6 +1154,9 @@ internal SmiStorageMetaData(
11231154
byte scale,
11241155
long localeId,
11251156
SqlCompareOptions compareOptions,
1157+
#if NET6_0_OR_GREATER
1158+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
1159+
#endif
11261160
Type userDefinedType,
11271161
string udtAssemblyQualifiedName,
11281162
bool isMultiValued,
@@ -1233,6 +1267,9 @@ internal SmiQueryMetaData(
12331267
byte scale,
12341268
long localeId,
12351269
SqlCompareOptions compareOptions,
1270+
#if NET6_0_OR_GREATER
1271+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
1272+
#endif
12361273
Type userDefinedType,
12371274
string name,
12381275
string typeSpecificNamePart1,
@@ -1290,6 +1327,9 @@ internal SmiQueryMetaData(
12901327
byte scale,
12911328
long localeId,
12921329
SqlCompareOptions compareOptions,
1330+
#if NET6_0_OR_GREATER
1331+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
1332+
#endif
12931333
Type userDefinedType,
12941334
bool isMultiValued,
12951335
IList<SmiExtendedMetaData> fieldMetaData,
@@ -1352,6 +1392,9 @@ internal SmiQueryMetaData(
13521392
byte scale,
13531393
long localeId,
13541394
SqlCompareOptions compareOptions,
1395+
#if NET6_0_OR_GREATER
1396+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
1397+
#endif
13551398
Type userDefinedType,
13561399
string udtAssemblyQualifiedName,
13571400
bool isMultiValued,

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System;
66
using System.Data;
77
using System.Data.SqlTypes;
8+
using System.Diagnostics.CodeAnalysis;
89
using Microsoft.Data.Common;
910
using Microsoft.Data.ProviderBase;
1011

@@ -51,6 +52,9 @@ public virtual string GetDataTypeName(int ordinal)
5152
}
5253

5354
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetFieldType/*' />
55+
#if NET6_0_OR_GREATER
56+
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
57+
#endif
5458
public virtual Type GetFieldType(int ordinal) => GetFieldTypeFrameworkSpecific(ordinal);
5559

5660
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetValue/*' />

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.netcore.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
using System;
66
using System.Data;
77
using System.Data.SqlTypes;
8+
using System.Diagnostics.CodeAnalysis;
89
using Microsoft.Data.Common;
910

1011
namespace Microsoft.Data.SqlClient.Server
1112
{
1213
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/SqlDataRecord/*' />
1314
public partial class SqlDataRecord : IDataRecord
14-
{
15+
{
16+
#if NET6_0_OR_GREATER
17+
[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
18+
#endif
1519
private Type GetFieldTypeFrameworkSpecific(int ordinal)
1620
=> MetaType.GetMetaTypeFromSqlDbType(GetSqlMetaData(ordinal).SqlDbType, false).ClassType;
1721

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlMetaData.cs‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Globalization;
88
using System.Data.SqlTypes;
99
using Microsoft.Data.Common;
10+
using System.Diagnostics.CodeAnalysis;
1011

1112
namespace Microsoft.Data.SqlClient.Server
1213
{
@@ -237,14 +238,22 @@ int sortOrdinal
237238

238239
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml' path='docs/members[@name="SqlMetaData"]/ctorNameDbTypeUserDefinedType/*' />
239240
// udt ctor without tvp extended properties
240-
public SqlMetaData(string name, SqlDbType dbType, Type userDefinedType)
241+
public SqlMetaData(string name, SqlDbType dbType,
242+
#if NET6_0_OR_GREATER
243+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
244+
#endif
245+
Type userDefinedType)
241246
{
242247
Construct(name, dbType, userDefinedType, null, DefaultUseServerDefault, DefaultIsUniqueKey, DefaultColumnSortOrder, DefaultSortOrdinal);
243248
}
244249

245250
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml' path='docs/members[@name="SqlMetaData"]/ctorNameDbTypeUserDefinedTypeServerTypeName/*' />
246251
// udt ctor without tvp extended properties
247-
public SqlMetaData(string name, SqlDbType dbType, Type userDefinedType, string serverTypeName)
252+
public SqlMetaData(string name, SqlDbType dbType,
253+
#if NET6_0_OR_GREATER
254+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
255+
#endif
256+
Type userDefinedType, string serverTypeName)
248257
{
249258
Construct(name, dbType, userDefinedType, serverTypeName, DefaultUseServerDefault, DefaultIsUniqueKey, DefaultColumnSortOrder, DefaultSortOrdinal);
250259
}
@@ -253,7 +262,10 @@ public SqlMetaData(string name, SqlDbType dbType, Type userDefinedType, string s
253262
// udt ctor
254263
public SqlMetaData(
255264
string name,
256-
SqlDbType dbType,
265+
SqlDbType dbType,
266+
#if NET6_0_OR_GREATER
267+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
268+
#endif
257269
Type userDefinedType,
258270
string serverTypeName,
259271
bool useServerDefault,
@@ -345,6 +357,9 @@ public SqlMetaData(
345357
byte scale,
346358
long locale,
347359
SqlCompareOptions compareOptions,
360+
#if NET6_0_OR_GREATER
361+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
362+
#endif
348363
Type userDefinedType
349364
) : this(
350365
name,
@@ -373,6 +388,9 @@ public SqlMetaData(
373388
byte scale,
374389
long localeId,
375390
SqlCompareOptions compareOptions,
391+
#if NET6_0_OR_GREATER
392+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
393+
#endif
376394
Type userDefinedType,
377395
bool useServerDefault,
378396
bool isUniqueKey,
@@ -874,7 +892,10 @@ int sortOrdinal
874892
// Construction for Udt type
875893
private void Construct(
876894
string name,
877-
SqlDbType dbType,
895+
SqlDbType dbType,
896+
#if NET6_0_OR_GREATER
897+
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
898+
#endif
878899
Type userDefinedType,
879900
string serverTypeName,
880901
bool useServerDefault,

0 commit comments

Comments
 (0)