From dea2bba8390fc30a9e538d25930442d27c72c0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 16 Sep 2021 10:51:54 +0300 Subject: [PATCH] #8771 Introduced Volo.Abp.Auditing.Contracts package to reduce dependencies. --- framework/Volo.Abp.sln | 7 +++++ .../ApplicationConfigurationDto.cs | 1 - .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../Volo.Abp.Auditing.Contracts.csproj | 21 +++++++++++++ .../Auditing/AbpAuditingContractsModule.cs | 9 ++++++ .../Volo/Abp/Auditing/AuditedAttribute.cs | 0 .../Abp/Auditing/DisableAuditingAttribute.cs | 0 .../Volo/Abp/Auditing/IAuditedObject.cs | 0 .../Volo/Abp/Auditing/IAuditingEnabled.cs | 0 .../Abp/Auditing/ICreationAuditedObject.cs | 0 .../Abp/Auditing/IDeletionAuditedObject.cs | 0 .../Volo/Abp/Auditing/IFullAuditedObject.cs | 0 .../Volo/Abp/Auditing/IHasCreationTime.cs | 0 .../Volo/Abp/Auditing/IHasDeletionTime.cs | 0 .../Volo/Abp/Auditing/IHasModificationTime.cs | 0 .../Volo/Abp/Auditing/IMayHaveCreator.cs | 0 .../Auditing/IModificationAuditedObject.cs | 0 .../Volo/Abp/Auditing/IMustHaveCreator.cs | 0 .../Volo.Abp.Auditing.csproj | 1 + .../Volo/Abp/Auditing/AbpAuditingModule.cs | 3 +- .../Volo/Abp}/ISoftDelete.cs | 2 +- .../Volo.Abp.Ddd.Application.Contracts.csproj | 2 +- .../AbpDddApplicationContractsModule.cs | 4 +-- nupkg/common.ps1 | 1 + 25 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xml create mode 100644 framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xsd create mode 100644 framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.csproj create mode 100644 framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/AbpAuditingContractsModule.cs rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/AuditedAttribute.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/DisableAuditingAttribute.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IAuditedObject.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IAuditingEnabled.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/ICreationAuditedObject.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IDeletionAuditedObject.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IFullAuditedObject.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IHasCreationTime.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IHasDeletionTime.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IHasModificationTime.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IMayHaveCreator.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IModificationAuditedObject.cs (100%) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/IMustHaveCreator.cs (100%) rename framework/src/{Volo.Abp.Data/Volo/Abp/Data => Volo.Abp.Core/Volo/Abp}/ISoftDelete.cs (87%) diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index 8d5432f4c6..e47fccb8f2 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -385,6 +385,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MongoDB.Tests.Seco EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Threading.Tests", "test\Volo.Abp.Threading.Tests\Volo.Abp.Threading.Tests.csproj", "{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Auditing.Contracts", "src\Volo.Abp.Auditing.Contracts\Volo.Abp.Auditing.Contracts.csproj", "{508B6355-AD28-4E60-8549-266D21DBF2CF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1147,6 +1149,10 @@ Global {7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Release|Any CPU.Build.0 = Release|Any CPU + {508B6355-AD28-4E60-8549-266D21DBF2CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {508B6355-AD28-4E60-8549-266D21DBF2CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {508B6355-AD28-4E60-8549-266D21DBF2CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {508B6355-AD28-4E60-8549-266D21DBF2CF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1341,6 +1347,7 @@ Global {75D8DADB-3FA9-4C1D-B23A-DBFD08133B7C} = {447C8A77-E5F0-4538-8687-7383196D04EA} {90B1866A-EF99-40B9-970E-B898E5AA523F} = {447C8A77-E5F0-4538-8687-7383196D04EA} {7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {508B6355-AD28-4E60-8549-266D21DBF2CF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs index 0001f56c1c..6a4aa49a1b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs @@ -1,7 +1,6 @@ using System; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending; using Volo.Abp.AspNetCore.Mvc.MultiTenancy; -using Volo.Abp.Timing; namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations { diff --git a/framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xml b/framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xsd b/framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/framework/src/Volo.Abp.Auditing.Contracts/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.csproj b/framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.csproj new file mode 100644 index 0000000000..e11f6aeeda --- /dev/null +++ b/framework/src/Volo.Abp.Auditing.Contracts/Volo.Abp.Auditing.Contracts.csproj @@ -0,0 +1,21 @@ + + + + + + + netstandard2.0 + Volo.Abp.Auditing.Contracts + Volo.Abp.Auditing.Contracts + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/AbpAuditingContractsModule.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/AbpAuditingContractsModule.cs new file mode 100644 index 0000000000..3bd0b5aba6 --- /dev/null +++ b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/AbpAuditingContractsModule.cs @@ -0,0 +1,9 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Auditing +{ + public class AbpAuditingContractsModule : AbpModule + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditedAttribute.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/AuditedAttribute.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditedAttribute.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/AuditedAttribute.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/DisableAuditingAttribute.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/DisableAuditingAttribute.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/DisableAuditingAttribute.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/DisableAuditingAttribute.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IAuditedObject.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IAuditedObject.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IAuditedObject.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IAuditingEnabled.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IAuditingEnabled.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IAuditingEnabled.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IAuditingEnabled.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICreationAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/ICreationAuditedObject.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICreationAuditedObject.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/ICreationAuditedObject.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IDeletionAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IDeletionAuditedObject.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IFullAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IFullAuditedObject.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IFullAuditedObject.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IFullAuditedObject.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IHasCreationTime.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasCreationTime.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IHasCreationTime.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasCreationTime.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IHasDeletionTime.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IHasDeletionTime.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IHasModificationTime.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IHasModificationTime.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IMayHaveCreator.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IMayHaveCreator.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IMayHaveCreator.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IMayHaveCreator.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IModificationAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IModificationAuditedObject.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IMustHaveCreator.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IMustHaveCreator.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IMustHaveCreator.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IMustHaveCreator.cs diff --git a/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj b/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj index 4ac2420c8f..5bdc6f89c5 100644 --- a/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj +++ b/framework/src/Volo.Abp.Auditing/Volo.Abp.Auditing.csproj @@ -15,6 +15,7 @@ + diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs index b49d072b0e..322429c48a 100644 --- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs +++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingModule.cs @@ -15,7 +15,8 @@ namespace Volo.Abp.Auditing typeof(AbpTimingModule), typeof(AbpSecurityModule), typeof(AbpThreadingModule), - typeof(AbpMultiTenancyModule) + typeof(AbpMultiTenancyModule), + typeof(AbpAuditingContractsModule) )] public class AbpAuditingModule : AbpModule { diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/ISoftDelete.cs b/framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs similarity index 87% rename from framework/src/Volo.Abp.Data/Volo/Abp/Data/ISoftDelete.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs index 29a1610051..cc0d0bdef9 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/ISoftDelete.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp //TODO: Change namespace to Volo.Abp.Data +namespace Volo.Abp { /// /// Used to standardize soft deleting entities. diff --git a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj index 6668f9c649..a955026b52 100644 --- a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj +++ b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo.Abp.Ddd.Application.Contracts.csproj @@ -20,7 +20,7 @@ - + diff --git a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/AbpDddApplicationContractsModule.cs b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/AbpDddApplicationContractsModule.cs index a8c0eb84b4..5ee61c40f5 100644 --- a/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/AbpDddApplicationContractsModule.cs +++ b/framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/AbpDddApplicationContractsModule.cs @@ -7,8 +7,8 @@ using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Application { [DependsOn( - typeof(AbpAuditingModule), - typeof(AbpLocalizationModule) + typeof(AbpLocalizationModule), + typeof(AbpAuditingContractsModule) )] public class AbpDddApplicationContractsModule : AbpModule { diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index b71ebccfd0..df0d99b19c 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -58,6 +58,7 @@ $projects = ( "framework/src/Volo.Abp.AspNetCore.Serilog", "framework/src/Volo.Abp.AspNetCore.SignalR", "framework/src/Volo.Abp.AspNetCore.TestBase", + "framework/src/Volo.Abp.Auditing.Contracts", "framework/src/Volo.Abp.Auditing", "framework/src/Volo.Abp.Authorization", "framework/src/Volo.Abp.Authorization.Abstractions",