From 310e19398d58245abae0fb7e5290501f95da8ce8 Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Fri, 5 Jul 2024 16:30:23 +0300 Subject: [PATCH 1/2] Revert "#pragma warning disable DX0004, DX0010" This reverts commit f9a9c8fec59a3611c524223887b6bf408a6ef910. --- .../Async/ReflectionAsyncAdapter.cs | 8 -------- net/DevExtreme.AspNet.Data/QueryProviderInfo.cs | 4 ---- net/DevExtreme.AspNet.Data/Types/DynamicClassBridge.cs | 4 ---- 3 files changed, 16 deletions(-) diff --git a/net/DevExtreme.AspNet.Data/Async/ReflectionAsyncAdapter.cs b/net/DevExtreme.AspNet.Data/Async/ReflectionAsyncAdapter.cs index e97c6047..f944801f 100644 --- a/net/DevExtreme.AspNet.Data/Async/ReflectionAsyncAdapter.cs +++ b/net/DevExtreme.AspNet.Data/Async/ReflectionAsyncAdapter.cs @@ -64,9 +64,7 @@ static class EF6Methods { public static readonly MethodInfo CountAsyncMethod; public static readonly MethodInfo ToListAsyncMethod; static EF6Methods() { -#pragma warning disable DX0004 var extensionsType = Type.GetType("System.Data.Entity.QueryableExtensions, EntityFramework"); -#pragma warning restore DX0004 CountAsyncMethod = FindCountAsyncMethod(extensionsType); ToListAsyncMethod = FindToListAsyncMethod(extensionsType); } @@ -76,9 +74,7 @@ static class EFCoreMethods { public static readonly MethodInfo CountAsyncMethod; public static readonly MethodInfo ToListAsyncMethod; static EFCoreMethods() { -#pragma warning disable DX0004 var extensionsType = Type.GetType("Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions, Microsoft.EntityFrameworkCore"); -#pragma warning restore DX0004 CountAsyncMethod = FindCountAsyncMethod(extensionsType); ToListAsyncMethod = FindToListAsyncMethod(extensionsType); } @@ -88,9 +84,7 @@ static class NHMethods { public static readonly MethodInfo CountAsyncMethod; public static readonly MethodInfo ToListAsyncMethod; static NHMethods() { -#pragma warning disable DX0004 var extensionsType = Type.GetType("NHibernate.Linq.LinqExtensionMethods, NHibernate"); -#pragma warning restore DX0004 CountAsyncMethod = FindCountAsyncMethod(extensionsType); ToListAsyncMethod = FindToListAsyncMethod(extensionsType); } @@ -101,9 +95,7 @@ static class XpoMethods { public static readonly MethodInfo ToArrayAsyncMethod; static XpoMethods() { var asm = Array.Find(AppDomain.CurrentDomain.GetAssemblies(), a => a.FullName.StartsWith("DevExpress.Xpo.v")); -#pragma warning disable DX0004 var extensionsType = asm.GetType("DevExpress.Xpo.XPQueryExtensions"); -#pragma warning restore DX0004 CountAsyncMethod = FindCountAsyncMethod(extensionsType); ToArrayAsyncMethod = FindToArrayAsyncMethod(extensionsType); } diff --git a/net/DevExtreme.AspNet.Data/QueryProviderInfo.cs b/net/DevExtreme.AspNet.Data/QueryProviderInfo.cs index 5192b614..1aa740b0 100644 --- a/net/DevExtreme.AspNet.Data/QueryProviderInfo.cs +++ b/net/DevExtreme.AspNet.Data/QueryProviderInfo.cs @@ -38,16 +38,12 @@ public QueryProviderInfo(IQueryProvider provider) { switch(providerAssembly.GetName().Name) { case "LinqKit.Microsoft.EntityFrameworkCore": IsEFCore = true; -#pragma warning disable DX0010 providerAssembly = Assembly.Load("Microsoft.EntityFrameworkCore"); -#pragma warning restore DX0010 break; case "LinqKit.EntityFramework": IsEFClassic = true; -#pragma warning disable DX0010 providerAssembly = Assembly.Load("EntityFramework"); -#pragma warning restore DX0010 break; } } diff --git a/net/DevExtreme.AspNet.Data/Types/DynamicClassBridge.cs b/net/DevExtreme.AspNet.Data/Types/DynamicClassBridge.cs index fd17d69b..2be429dc 100644 --- a/net/DevExtreme.AspNet.Data/Types/DynamicClassBridge.cs +++ b/net/DevExtreme.AspNet.Data/Types/DynamicClassBridge.cs @@ -16,14 +16,10 @@ static readonly MethodInfo static DynamicClassBridge() { try { -#pragma warning disable DX0010 var assembly = Assembly.Load("System.Linq.Dynamic.Core"); -#pragma warning restore DX0010 -#pragma warning disable DX0004 FACTORY_TYPE = assembly.GetType("System.Linq.Dynamic.Core.DynamicClassFactory"); CLASS_TYPE = assembly.GetType("System.Linq.Dynamic.Core.DynamicClass"); PROP_TYPE = assembly.GetType("System.Linq.Dynamic.Core.DynamicProperty"); -#pragma warning restore DX0004 CREATE_TYPE_METHOD = FACTORY_TYPE.GetMethod("CreateType"); INDEXER_METHOD = CLASS_TYPE.GetMethod("get_Item"); } catch(FileNotFoundException x) { From 3eca026e5d452f4d593e8e58ec4b888a735cf20b Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:18:45 +0300 Subject: [PATCH 2/2] describe suppression reason --- net/DevExtreme.AspNet.Data.Tests.NH/RemoteGroupingStress.cs | 2 +- net/DevExtreme.AspNet.Data.Tests.Xpo/RemoteGroupingStress.cs | 2 +- net/DevExtreme.AspNet.Data.Tests/ResponseModelTests.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/RemoteGroupingStress.cs b/net/DevExtreme.AspNet.Data.Tests.NH/RemoteGroupingStress.cs index 089ed37f..a3c259b7 100644 --- a/net/DevExtreme.AspNet.Data.Tests.NH/RemoteGroupingStress.cs +++ b/net/DevExtreme.AspNet.Data.Tests.NH/RemoteGroupingStress.cs @@ -30,7 +30,7 @@ public DataItemMap() { //Map(i => i.DateO); //used by all fixtures, requires nh feature support (see skip) } } -#pragma warning disable xUnit1004 +#pragma warning disable xUnit1004 // skip until external / dependency reason is resolved [Fact(Skip = "Skip until https://github.com/nhibernate/nhibernate-core/issues/2912 is implemented?")] #pragma warning restore xUnit1004 public async Task Scenario() { diff --git a/net/DevExtreme.AspNet.Data.Tests.Xpo/RemoteGroupingStress.cs b/net/DevExtreme.AspNet.Data.Tests.Xpo/RemoteGroupingStress.cs index f072a33f..43c22c7d 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Xpo/RemoteGroupingStress.cs +++ b/net/DevExtreme.AspNet.Data.Tests.Xpo/RemoteGroupingStress.cs @@ -55,7 +55,7 @@ public DateOnly DateO { } //#endif } -#pragma warning disable xUnit1004 +#pragma warning disable xUnit1004 // skip until external / dependency reason is resolved [Fact(Skip = "Skip until proper DevExpress.Xpo dll / nupkg with Date Time Only support?")] #pragma warning restore xUnit1004 public async Task Scenario() { diff --git a/net/DevExtreme.AspNet.Data.Tests/ResponseModelTests.cs b/net/DevExtreme.AspNet.Data.Tests/ResponseModelTests.cs index f74293c7..31bcff21 100644 --- a/net/DevExtreme.AspNet.Data.Tests/ResponseModelTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/ResponseModelTests.cs @@ -6,7 +6,7 @@ namespace DevExtreme.AspNet.Data.Tests { public class ResponseModelTests { -#pragma warning disable xUnit1004 +#pragma warning disable xUnit1004 // skip until external / dependency reason is resolved [Fact(Skip = "Skip until consolidation or target bump to net7 and ShouldSerialize")] #pragma warning restore xUnit1004 public void EmptyLoadResultSerialization() {