From 7018f6e90ca10f6e9ec37d45a2d3746c7c302f77 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Fri, 10 Mar 2023 20:43:14 +0800 Subject: [PATCH] fix(type): fix nullable-type-match --- ...LINGYUN.MicroService.WebhooksManagement.sln | 18 +++++++++++++++++- .../Queryable/DynamicQueryableAppService.cs | 2 +- .../Reflection/NullableTypeExtensions.cs | 12 ++++++++++++ .../Expressions/ObjectQueryableExtensions.cs | 1 + .../Reflection/NullableTypeExtensions.cs | 9 --------- 5 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN/Linq/Dynamic/Queryable/Reflection/NullableTypeExtensions.cs delete mode 100644 aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Reflection/NullableTypeExtensions.cs diff --git a/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln b/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln index 2a98f1a0f..0f1e76342 100644 --- a/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln +++ b/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln @@ -43,7 +43,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.WebhooksManagement.DbMigrator", "migrations\LY.MicroService.WebhooksManagement.DbMigrator\LY.MicroService.WebhooksManagement.DbMigrator.csproj", "{3BC77471-D273-4C9C-8985-7FE450DA4686}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LY.MicroService.WebhooksManagement.EntityFrameworkCore", "migrations\LY.MicroService.WebhooksManagement.EntityFrameworkCore\LY.MicroService.WebhooksManagement.EntityFrameworkCore.csproj", "{CC0BF1BE-A938-4BED-B5DD-AEA0235FF978}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.WebhooksManagement.EntityFrameworkCore", "migrations\LY.MicroService.WebhooksManagement.EntityFrameworkCore\LY.MicroService.WebhooksManagement.EntityFrameworkCore.csproj", "{CC0BF1BE-A938-4BED-B5DD-AEA0235FF978}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "job", "job", "{C8BF949C-3370-4727-BA20-5AB13CF9AAD6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks.Abstractions", "modules\task-management\LINGYUN.Abp.BackgroundTasks.Abstractions\LINGYUN.Abp.BackgroundTasks.Abstractions.csproj", "{8BFCE8C7-D41A-4D9C-9567-4155B7AC79FE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks", "modules\task-management\LINGYUN.Abp.BackgroundTasks\LINGYUN.Abp.BackgroundTasks.csproj", "{B01A8350-EFA3-4080-9CD6-0E991F99578E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -119,6 +125,14 @@ Global {CC0BF1BE-A938-4BED-B5DD-AEA0235FF978}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC0BF1BE-A938-4BED-B5DD-AEA0235FF978}.Release|Any CPU.ActiveCfg = Release|Any CPU {CC0BF1BE-A938-4BED-B5DD-AEA0235FF978}.Release|Any CPU.Build.0 = Release|Any CPU + {8BFCE8C7-D41A-4D9C-9567-4155B7AC79FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BFCE8C7-D41A-4D9C-9567-4155B7AC79FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BFCE8C7-D41A-4D9C-9567-4155B7AC79FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BFCE8C7-D41A-4D9C-9567-4155B7AC79FE}.Release|Any CPU.Build.0 = Release|Any CPU + {B01A8350-EFA3-4080-9CD6-0E991F99578E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B01A8350-EFA3-4080-9CD6-0E991F99578E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B01A8350-EFA3-4080-9CD6-0E991F99578E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B01A8350-EFA3-4080-9CD6-0E991F99578E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -141,6 +155,8 @@ Global {BBF1C93D-EF73-4B00-919F-5E7F360BDB03} = {FB7A9794-06D2-42CF-939E-4626497B97BD} {3BC77471-D273-4C9C-8985-7FE450DA4686} = {2868332B-7D4F-4B43-8FC3-BA5CACC36C7E} {CC0BF1BE-A938-4BED-B5DD-AEA0235FF978} = {2868332B-7D4F-4B43-8FC3-BA5CACC36C7E} + {8BFCE8C7-D41A-4D9C-9567-4155B7AC79FE} = {C8BF949C-3370-4727-BA20-5AB13CF9AAD6} + {B01A8350-EFA3-4080-9CD6-0E991F99578E} = {C8BF949C-3370-4727-BA20-5AB13CF9AAD6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {80ED12A5-C899-459F-A181-ADCC9D680DE5} diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs index fb479f56d..13930e794 100644 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs @@ -1,10 +1,10 @@ using LINGYUN.Linq.Dynamic.Queryable; +using LINGYUN.Linq.Dynamic.Queryable.Reflection; using Microsoft.Extensions.Options; using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Reflection; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN/Linq/Dynamic/Queryable/Reflection/NullableTypeExtensions.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN/Linq/Dynamic/Queryable/Reflection/NullableTypeExtensions.cs new file mode 100644 index 000000000..f9996f765 --- /dev/null +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN/Linq/Dynamic/Queryable/Reflection/NullableTypeExtensions.cs @@ -0,0 +1,12 @@ +using System; + +namespace LINGYUN.Linq.Dynamic.Queryable.Reflection; + +public static class NullableTypeExtensions +{ + public static bool IsNullableType(this Type theType) => + theType.IsGenericType(typeof(Nullable<>)); + + public static bool IsGenericType(this Type type, Type genericType) => + type.IsGenericType && type.GetGenericTypeDefinition() == genericType; +} diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Linq/Expressions/ObjectQueryableExtensions.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Linq/Expressions/ObjectQueryableExtensions.cs index 9334c1123..2e27e6a2d 100644 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Linq/Expressions/ObjectQueryableExtensions.cs +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Linq/Expressions/ObjectQueryableExtensions.cs @@ -1,4 +1,5 @@ using LINGYUN.Linq.Dynamic.Queryable; +using LINGYUN.Linq.Dynamic.Queryable.Reflection; using System.Collections.Generic; using System.Reflection; diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Reflection/NullableTypeExtensions.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Reflection/NullableTypeExtensions.cs deleted file mode 100644 index d1d92ffea..000000000 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/System/Reflection/NullableTypeExtensions.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace System.Reflection; - -public static class NullableTypeExtensions -{ - public static bool IsNullableType(this Type theType) - { - return (theType.IsGenericType && theType.GetGenericTypeDefinition().Equals(typeof(Nullable<>))); - } -}