From 4d149244db907a373392651f0a36fb31ca769049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 17 Mar 2021 21:54:43 +0300 Subject: [PATCH 01/10] Introduce WebAssembly and Server packages for the Tenant Management Blazor UI --- .../Volo.Abp.TenantManagement.sln | 14 +++++++++ .../AbpTenantManagementBlazorServerModule.cs | 14 +++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ....Abp.TenantManagement.Blazor.Server.csproj | 18 +++++++++++ ...TenantManagementBlazorWebAssemblyModule.cs | 14 +++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...TenantManagement.Blazor.WebAssembly.csproj | 18 +++++++++++ ...anyName.MyProjectName.Blazor.Server.csproj | 2 +- .../MyProjectNameBlazorModule.cs | 4 +-- .../MyCompanyName.MyProjectName.Blazor.csproj | 2 +- .../MyProjectNameBlazorModule.cs | 4 +-- 13 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xsd create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xml create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xsd create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj diff --git a/modules/tenant-management/Volo.Abp.TenantManagement.sln b/modules/tenant-management/Volo.Abp.TenantManagement.sln index 2b345717d7..2fec240db6 100644 --- a/modules/tenant-management/Volo.Abp.TenantManagement.sln +++ b/modules/tenant-management/Volo.Abp.TenantManagement.sln @@ -37,6 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.D EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TenantManagement.Blazor", "src\Volo.Abp.TenantManagement.Blazor\Volo.Abp.TenantManagement.Blazor.csproj", "{02D10CCE-03B6-42BC-8C7B-7F1EC74FCB8C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TenantManagement.Blazor.WebAssembly", "src\Volo.Abp.TenantManagement.Blazor.WebAssembly\Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj", "{62C6DC70-A7DB-4623-A7BD-DB6D679660CA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TenantManagement.Blazor.Server", "src\Volo.Abp.TenantManagement.Blazor.Server\Volo.Abp.TenantManagement.Blazor.Server.csproj", "{F92A9527-A2E2-4062-9A4B-0111C89AE222}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,6 +107,14 @@ Global {02D10CCE-03B6-42BC-8C7B-7F1EC74FCB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU {02D10CCE-03B6-42BC-8C7B-7F1EC74FCB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU {02D10CCE-03B6-42BC-8C7B-7F1EC74FCB8C}.Release|Any CPU.Build.0 = Release|Any CPU + {62C6DC70-A7DB-4623-A7BD-DB6D679660CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62C6DC70-A7DB-4623-A7BD-DB6D679660CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62C6DC70-A7DB-4623-A7BD-DB6D679660CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62C6DC70-A7DB-4623-A7BD-DB6D679660CA}.Release|Any CPU.Build.0 = Release|Any CPU + {F92A9527-A2E2-4062-9A4B-0111C89AE222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F92A9527-A2E2-4062-9A4B-0111C89AE222}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F92A9527-A2E2-4062-9A4B-0111C89AE222}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F92A9527-A2E2-4062-9A4B-0111C89AE222}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -123,6 +135,8 @@ Global {C3BAD6E8-00CD-4283-9416-64287BB5B265} = {C6941869-A9FC-4BEA-AD3F-C1E104826ECA} {F7219BE2-4588-489C-9D31-647C59694C03} = {C6941869-A9FC-4BEA-AD3F-C1E104826ECA} {02D10CCE-03B6-42BC-8C7B-7F1EC74FCB8C} = {799CA525-4748-421A-9892-05C68BB2FA13} + {62C6DC70-A7DB-4623-A7BD-DB6D679660CA} = {799CA525-4748-421A-9892-05C68BB2FA13} + {F92A9527-A2E2-4062-9A4B-0111C89AE222} = {799CA525-4748-421A-9892-05C68BB2FA13} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7C258726-2CE0-44D3-A2D7-71812E8F505C} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs new file mode 100644 index 0000000000..120ac5e345 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs @@ -0,0 +1,14 @@ +using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.TenantManagement.Blazor.Server +{ + [DependsOn( + typeof(AbpTenantManagementBlazorModule), + typeof(AbpAspNetCoreComponentsServerThemingModule) + )] + public class AbpTenantManagementBlazorServerModule : AbpModule + { + + } +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml new file mode 100644 index 0000000000..00e1d9a1c1 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xsd b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/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/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj new file mode 100644 index 0000000000..9763fa5f65 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs new file mode 100644 index 0000000000..585d73a8d9 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs @@ -0,0 +1,14 @@ +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.TenantManagement.Blazor.WebAssembly +{ + [DependsOn( + typeof(AbpTenantManagementBlazorModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + )] + public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule + { + + } +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xsd b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/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/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj new file mode 100644 index 0000000000..9877590de2 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index ebb87ef07a..51dd3c3b81 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -23,7 +23,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index 0a381b889b..83ff915b44 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -36,7 +36,7 @@ using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.SettingManagement.Blazor; using Volo.Abp.Swashbuckle; -using Volo.Abp.TenantManagement.Blazor; +using Volo.Abp.TenantManagement.Blazor.Server; using Volo.Abp.UI; using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation.Urls; @@ -56,7 +56,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server typeof(AbpAccountWebIdentityServerModule), typeof(AbpAspNetCoreComponentsServerBasicThemeModule), typeof(AbpIdentityBlazorModule), - typeof(AbpTenantManagementBlazorModule), + typeof(AbpTenantManagementBlazorServerModule), typeof(AbpSettingManagementBlazorModule) )] public class MyProjectNameBlazorModule : AbpModule diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 27526e5797..9c2698a0d2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -21,7 +21,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 5803abb4c9..224146b0e0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -13,10 +13,10 @@ using Volo.Abp.Autofac.WebAssembly; using Volo.Abp.AutoMapper; using Volo.Abp.Identity.Blazor; using Volo.Abp.Modularity; -using Volo.Abp.TenantManagement.Blazor; using Volo.Abp.UI.Navigation; using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme; using Volo.Abp.SettingManagement.Blazor; +using Volo.Abp.TenantManagement.Blazor.WebAssembly; namespace MyCompanyName.MyProjectName.Blazor { @@ -25,7 +25,7 @@ namespace MyCompanyName.MyProjectName.Blazor typeof(MyProjectNameHttpApiClientModule), typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule), typeof(AbpIdentityBlazorModule), - typeof(AbpTenantManagementBlazorModule), + typeof(AbpTenantManagementBlazorWebAssemblyModule), typeof(AbpSettingManagementBlazorModule) )] public class MyProjectNameBlazorModule : AbpModule From d1e010af266d21818501b273025023d79eecf3f5 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 18 Mar 2021 10:59:07 +0800 Subject: [PATCH 02/10] Introduce WebAssembly and Server packages for the Feature Management Blazor UI --- .../Volo.Abp.FeatureManagement.sln | 20 +++++++++++-- .../AbpFeatureManagementBlazorServerModule.cs | 14 +++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...Abp.FeatureManagement.Blazor.Server.csproj | 18 +++++++++++ ...TenantManagementBlazorWebAssemblyModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...eatureManagement.Blazor.WebAssembly.csproj | 18 +++++++++++ .../FodyWeavers.xml | 4 +-- 10 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xml create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xsd create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xml create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xsd create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj diff --git a/modules/feature-management/Volo.Abp.FeatureManagement.sln b/modules/feature-management/Volo.Abp.FeatureManagement.sln index 7f1c6ae1e0..31dfe377fd 100644 --- a/modules/feature-management/Volo.Abp.FeatureManagement.sln +++ b/modules/feature-management/Volo.Abp.FeatureManagement.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2026 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31105.61 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FeatureManagement.Domain.Shared", "src\Volo.Abp.FeatureManagement.Domain.Shared\Volo.Abp.FeatureManagement.Domain.Shared.csproj", "{D64C1577-4929-4B60-939E-96DE1534891A}" EndProject @@ -35,7 +35,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FeatureManagement. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FeatureManagement.Application.Tests", "test\Volo.Abp.FeatureManagement.Application.Tests\Volo.Abp.FeatureManagement.Application.Tests.csproj", "{13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FeatureManagement.Blazor", "src\Volo.Abp.FeatureManagement.Blazor\Volo.Abp.FeatureManagement.Blazor.csproj", "{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FeatureManagement.Blazor", "src\Volo.Abp.FeatureManagement.Blazor\Volo.Abp.FeatureManagement.Blazor.csproj", "{0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FeatureManagement.Blazor.Server", "src\Volo.Abp.FeatureManagement.Blazor.Server\Volo.Abp.FeatureManagement.Blazor.Server.csproj", "{5B2EA81B-9FAE-456E-B83B-58205AA48752}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FeatureManagement.Blazor.WebAssembly", "src\Volo.Abp.FeatureManagement.Blazor.WebAssembly\Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj", "{A96771F7-65D7-43C2-818E-CF0F5DBC3DC6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -103,6 +107,14 @@ Global {0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F34FFD5-E98F-4F77-AE0B-A790BD5810D5}.Release|Any CPU.Build.0 = Release|Any CPU + {5B2EA81B-9FAE-456E-B83B-58205AA48752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B2EA81B-9FAE-456E-B83B-58205AA48752}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B2EA81B-9FAE-456E-B83B-58205AA48752}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B2EA81B-9FAE-456E-B83B-58205AA48752}.Release|Any CPU.Build.0 = Release|Any CPU + {A96771F7-65D7-43C2-818E-CF0F5DBC3DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A96771F7-65D7-43C2-818E-CF0F5DBC3DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A96771F7-65D7-43C2-818E-CF0F5DBC3DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A96771F7-65D7-43C2-818E-CF0F5DBC3DC6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -123,6 +135,8 @@ Global {AA783A34-86E4-41A5-AE21-5D9FBD98D858} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {13A9EAD6-F3A4-4357-BA4A-A7E8FEB4A264} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D} {0F34FFD5-E98F-4F77-AE0B-A790BD5810D5} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {5B2EA81B-9FAE-456E-B83B-58205AA48752} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {A96771F7-65D7-43C2-818E-CF0F5DBC3DC6} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs new file mode 100644 index 0000000000..7f996bca12 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs @@ -0,0 +1,14 @@ +using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.FeatureManagement.Blazor.Server +{ + [DependsOn( + typeof(AbpFeatureManagementBlazorModule), + typeof(AbpAspNetCoreComponentsServerThemingModule) + )] + public class AbpTenantManagementBlazorServerModule : AbpModule + { + + } +} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xsd b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/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/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj new file mode 100644 index 0000000000..6514a64803 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs new file mode 100644 index 0000000000..c4f316aa9e --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.FeatureManagement.Blazor.WebAssembly +{ + [DependsOn( + typeof(AbpFeatureManagementBlazorModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + )] + public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule + { + } +} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xsd b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/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/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj new file mode 100644 index 0000000000..1a046fcf86 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml index 00e1d9a1c1..bc5a74a236 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/FodyWeavers.xml @@ -1,3 +1,3 @@  - - \ No newline at end of file + + From 8269aea649edd248c30ff9b8dd02d2a077635ec3 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 18 Mar 2021 11:10:29 +0800 Subject: [PATCH 03/10] Introduce WebAssembly and Server packages for the Permission Management Blazor UI --- ...Abp.FeatureManagement.Blazor.Server.csproj | 22 +++++++------- .../Volo.Abp.PermissionManagement.sln | 14 +++++++++ ...pPermissionManagementBlazorServerModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ....PermissionManagement.Blazor.Server.csproj | 18 +++++++++++ ...issionManagementBlazorWebAssemblyModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...issionManagement.Blazor.WebAssembly.csproj | 18 +++++++++++ 10 files changed, 153 insertions(+), 11 deletions(-) create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/AbpPermissionManagementBlazorServerModule.cs create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xml create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xsd create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xml create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xsd create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj index 6514a64803..e8e110ebd2 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/Volo.Abp.FeatureManagement.Blazor.Server.csproj @@ -1,18 +1,18 @@ - - + + - - net5.0 - + + net5.0 + - - - + + + - - - + + + diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.sln b/modules/permission-management/Volo.Abp.PermissionManagement.sln index 535a31fb2f..6cb7292684 100644 --- a/modules/permission-management/Volo.Abp.PermissionManagement.sln +++ b/modules/permission-management/Volo.Abp.PermissionManagement.sln @@ -37,6 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManageme EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Blazor", "src\Volo.Abp.PermissionManagement.Blazor\Volo.Abp.PermissionManagement.Blazor.csproj", "{6F899C50-83BB-43C4-983A-DCCD8FBBF066}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Blazor.Server", "src\Volo.Abp.PermissionManagement.Blazor.Server\Volo.Abp.PermissionManagement.Blazor.Server.csproj", "{88B39D54-5289-4D39-B4B9-E7C264ED2996}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Blazor.WebAssembly", "src\Volo.Abp.PermissionManagement.Blazor.WebAssembly\Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj", "{C8AA18AA-BD1F-4E58-92C6-12F846C02000}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,6 +107,14 @@ Global {6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F899C50-83BB-43C4-983A-DCCD8FBBF066}.Release|Any CPU.Build.0 = Release|Any CPU + {88B39D54-5289-4D39-B4B9-E7C264ED2996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88B39D54-5289-4D39-B4B9-E7C264ED2996}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88B39D54-5289-4D39-B4B9-E7C264ED2996}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88B39D54-5289-4D39-B4B9-E7C264ED2996}.Release|Any CPU.Build.0 = Release|Any CPU + {C8AA18AA-BD1F-4E58-92C6-12F846C02000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8AA18AA-BD1F-4E58-92C6-12F846C02000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8AA18AA-BD1F-4E58-92C6-12F846C02000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8AA18AA-BD1F-4E58-92C6-12F846C02000}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -123,6 +135,8 @@ Global {1CD80519-9431-48DB-B0EA-291A73FF9F49} = {B559B878-38F7-49CC-BC06-43A32D68C1A7} {A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1} = {63DA4A89-5908-4F37-B7E6-525AEEF20C77} {6F899C50-83BB-43C4-983A-DCCD8FBBF066} = {B559B878-38F7-49CC-BC06-43A32D68C1A7} + {88B39D54-5289-4D39-B4B9-E7C264ED2996} = {B559B878-38F7-49CC-BC06-43A32D68C1A7} + {C8AA18AA-BD1F-4E58-92C6-12F846C02000} = {B559B878-38F7-49CC-BC06-43A32D68C1A7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8FC7DF78-5E2D-489F-9D43-147D2ABAA112} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/AbpPermissionManagementBlazorServerModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/AbpPermissionManagementBlazorServerModule.cs new file mode 100644 index 0000000000..fb9f90199e --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/AbpPermissionManagementBlazorServerModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.PermissionManagement.Blazor.Server +{ + [DependsOn( + typeof(AbpPermissionManagementBlazorModule), + typeof(AbpAspNetCoreComponentsServerThemingModule) + )] + public class AbpPermissionManagementBlazorServerModule : AbpModule + { + } +} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xsd b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/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/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj new file mode 100644 index 0000000000..f72b780971 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.Server/Volo.Abp.PermissionManagement.Blazor.Server.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs new file mode 100644 index 0000000000..3561907162 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.PermissionManagement.Blazor.WebAssembly +{ + [DependsOn( + typeof(AbpPermissionManagementBlazorModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + )] + public class AbpPermissionManagementBlazorWebAssemblyModule : AbpModule + { + } +} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xsd b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/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/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj new file mode 100644 index 0000000000..8329b1659e --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + From cfc809fb172e390f64a4175a4f74fb153add594b Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 18 Mar 2021 11:20:32 +0800 Subject: [PATCH 04/10] Introduce WebAssembly and Server packages for the Setting Management Blazor UI --- .../Volo.Abp.SettingManagement.sln | 14 +++++++++ .../AbpSettingManagementBlazorServerModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...Abp.SettingManagement.Blazor.Server.csproj | 18 +++++++++++ ...ettingManagementBlazorWebAssemblyModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...ettingManagement.Blazor.WebAssembly.csproj | 18 +++++++++++ 9 files changed, 142 insertions(+) create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xsd create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xsd create mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj diff --git a/modules/setting-management/Volo.Abp.SettingManagement.sln b/modules/setting-management/Volo.Abp.SettingManagement.sln index b7b5725614..57a34cf8ac 100644 --- a/modules/setting-management/Volo.Abp.SettingManagement.sln +++ b/modules/setting-management/Volo.Abp.SettingManagement.sln @@ -39,6 +39,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{D3222BEC-EDC EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.SettingManagement.DemoApp", "app\Volo.Abp.SettingManagement.DemoApp\Volo.Abp.SettingManagement.DemoApp.csproj", "{8488F380-83DD-4209-80B7-87ACAB83A052}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.SettingManagement.Blazor.Server", "src\Volo.Abp.SettingManagement.Blazor.Server\Volo.Abp.SettingManagement.Blazor.Server.csproj", "{54825027-5569-456A-81D3-0F425FEE4712}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.SettingManagement.Blazor.WebAssembly", "src\Volo.Abp.SettingManagement.Blazor.WebAssembly\Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj", "{9C65F145-6A74-48E4-8950-9E4F83953FDB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +109,14 @@ Global {8488F380-83DD-4209-80B7-87ACAB83A052}.Debug|Any CPU.Build.0 = Debug|Any CPU {8488F380-83DD-4209-80B7-87ACAB83A052}.Release|Any CPU.ActiveCfg = Release|Any CPU {8488F380-83DD-4209-80B7-87ACAB83A052}.Release|Any CPU.Build.0 = Release|Any CPU + {54825027-5569-456A-81D3-0F425FEE4712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54825027-5569-456A-81D3-0F425FEE4712}.Debug|Any CPU.Build.0 = Debug|Any CPU + {54825027-5569-456A-81D3-0F425FEE4712}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54825027-5569-456A-81D3-0F425FEE4712}.Release|Any CPU.Build.0 = Release|Any CPU + {9C65F145-6A74-48E4-8950-9E4F83953FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C65F145-6A74-48E4-8950-9E4F83953FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C65F145-6A74-48E4-8950-9E4F83953FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C65F145-6A74-48E4-8950-9E4F83953FDB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -125,6 +137,8 @@ Global {BCE3E834-B90B-469A-B274-74D401FAFD6E} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA} {F3126FDD-A574-4940-AE06-78898E2DE98F} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA} {8488F380-83DD-4209-80B7-87ACAB83A052} = {D3222BEC-EDCE-4509-9A19-36C43C9A59FB} + {54825027-5569-456A-81D3-0F425FEE4712} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA} + {9C65F145-6A74-48E4-8950-9E4F83953FDB} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {24B3A486-E7CA-4AA5-B76F-27D351A97E59} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs new file mode 100644 index 0000000000..77a5688a67 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.SettingManagement.Blazor.Server +{ + [DependsOn( + typeof(AbpSettingManagementBlazorModule), + typeof(AbpAspNetCoreComponentsServerThemingModule) + )] + public class AbpSettingManagementBlazorServerModule : AbpModule + { + } +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xsd b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/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/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj new file mode 100644 index 0000000000..a1c32a6e73 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs new file mode 100644 index 0000000000..7cc7a0ff35 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.SettingManagement.Blazor.WebAssembly +{ + [DependsOn( + typeof(AbpSettingManagementBlazorModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + )] + public class AbpSettingManagementBlazorWebAssemblyModule : AbpModule + { + } +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xsd b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/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/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj new file mode 100644 index 0000000000..15154e4dc8 --- /dev/null +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + From 21eb8cfb1510f78bfdbe4c7d72e24e59afa7b6a6 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 18 Mar 2021 11:32:31 +0800 Subject: [PATCH 05/10] Introduce WebAssembly and Server packages for the Identity Blazor UI --- modules/identity/Volo.Abp.Identity.sln | 14 +++++++++ .../AbpIdentityBlazorServerModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../Volo.Abp.Identity.Blazor.Server.csproj | 18 +++++++++++ .../AbpIdentityBlazorWebAssemblyModule.cs | 13 ++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...olo.Abp.Identity.Blazor.WebAssembly.csproj | 18 +++++++++++ 9 files changed, 142 insertions(+) create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xml create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xsd create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xml create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xsd create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj diff --git a/modules/identity/Volo.Abp.Identity.sln b/modules/identity/Volo.Abp.Identity.sln index 23336bdc02..bb81ccf749 100644 --- a/modules/identity/Volo.Abp.Identity.sln +++ b/modules/identity/Volo.Abp.Identity.sln @@ -43,6 +43,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.AspNetCor EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor", "src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj", "{3F7BB653-3F3A-4889-B73C-E463F239099A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor.Server", "src\Volo.Abp.Identity.Blazor.Server\Volo.Abp.Identity.Blazor.Server.csproj", "{A5BAC86D-1231-4B95-918E-2011477A81E7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor.WebAssembly", "src\Volo.Abp.Identity.Blazor.WebAssembly\Volo.Abp.Identity.Blazor.WebAssembly.csproj", "{4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -121,6 +125,14 @@ Global {3F7BB653-3F3A-4889-B73C-E463F239099A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F7BB653-3F3A-4889-B73C-E463F239099A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F7BB653-3F3A-4889-B73C-E463F239099A}.Release|Any CPU.Build.0 = Release|Any CPU + {A5BAC86D-1231-4B95-918E-2011477A81E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5BAC86D-1231-4B95-918E-2011477A81E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5BAC86D-1231-4B95-918E-2011477A81E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5BAC86D-1231-4B95-918E-2011477A81E7}.Release|Any CPU.Build.0 = Release|Any CPU + {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -144,6 +156,8 @@ Global {736F91E7-8A70-441B-89DE-0E29A348E718} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} {89C094EB-D80A-4976-9C10-7CE3EBEEE877} = {9FACAF96-A681-4B36-A938-A37DCA0B7EC1} {3F7BB653-3F3A-4889-B73C-E463F239099A} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} + {A5BAC86D-1231-4B95-918E-2011477A81E7} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} + {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {05740D37-83CF-4041-9C2A-D89F1B3DB5A4} diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs new file mode 100644 index 0000000000..f445dd8798 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Identity.Blazor.Server +{ + [DependsOn( + typeof(AbpIdentityBlazorModule), + typeof(AbpAspNetCoreComponentsServerThemingModule) + )] + public class AbpIdentityBlazorServerModule : AbpModule + { + } +} diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xml b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xsd b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/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/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj new file mode 100644 index 0000000000..916e12572a --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs new file mode 100644 index 0000000000..d7d9ed2a44 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Identity.Blazor.WebAssembly +{ + [DependsOn( + typeof(AbpIdentityBlazorModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + )] + public class AbpIdentityBlazorWebAssemblyModule : AbpModule + { + } +} diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xml b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xml new file mode 100644 index 0000000000..bc5a74a236 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xsd b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/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/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj new file mode 100644 index 0000000000..b0e65de973 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj @@ -0,0 +1,18 @@ + + + + + + + net5.0 + + + + + + + + + + + From df1f7e37f09f9e5aeb737946036b2f7559a829fe Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 18 Mar 2021 15:07:41 +0800 Subject: [PATCH 06/10] Update template --- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 6 +++--- .../MyProjectNameBlazorModule.cs | 12 ++++++------ .../MyCompanyName.MyProjectName.Blazor.csproj | 4 ++-- .../MyProjectNameBlazorModule.cs | 7 +++---- .../MyCompanyName.MyProjectName.Blazor.Host.csproj | 2 +- .../MyProjectNameBlazorHostModule.cs | 4 ++-- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 51dd3c3b81..f2e6d9d992 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -22,9 +22,9 @@ - + - + @@ -42,5 +42,5 @@ Always - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index 83ff915b44..27d5a7c800 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -31,10 +31,10 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.AutoMapper; -using Volo.Abp.Identity.Blazor; +using Volo.Abp.Identity.Blazor.Server; using Volo.Abp.Localization; using Volo.Abp.Modularity; -using Volo.Abp.SettingManagement.Blazor; +using Volo.Abp.SettingManagement.Blazor.Server; using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement.Blazor.Server; using Volo.Abp.UI; @@ -52,12 +52,12 @@ namespace MyCompanyName.MyProjectName.Blazor.Server typeof(AbpAutofacModule), typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), - typeof(AbpAspNetCoreSerilogModule), + typeof(AbpAspNetCoreSerilogModule), typeof(AbpAccountWebIdentityServerModule), typeof(AbpAspNetCoreComponentsServerBasicThemeModule), - typeof(AbpIdentityBlazorModule), + typeof(AbpIdentityBlazorServerModule), typeof(AbpTenantManagementBlazorServerModule), - typeof(AbpSettingManagementBlazorModule) + typeof(AbpSettingManagementBlazorServerModule) )] public class MyProjectNameBlazorModule : AbpModule { @@ -114,7 +114,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server bundle.AddFiles("/global-styles.css"); } ); - + //BLAZOR UI options.StyleBundles.Configure( BlazorBasicThemeBundles.Styles.Global, diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 9c2698a0d2..ebbe78f64d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -20,9 +20,9 @@ - + - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 224146b0e0..b7b1460f71 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -11,11 +11,10 @@ using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.Autofac.WebAssembly; using Volo.Abp.AutoMapper; -using Volo.Abp.Identity.Blazor; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme; -using Volo.Abp.SettingManagement.Blazor; +using Volo.Abp.Identity.Blazor.WebAssembly; using Volo.Abp.TenantManagement.Blazor.WebAssembly; namespace MyCompanyName.MyProjectName.Blazor @@ -24,9 +23,9 @@ namespace MyCompanyName.MyProjectName.Blazor typeof(AbpAutofacWebAssemblyModule), typeof(MyProjectNameHttpApiClientModule), typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule), - typeof(AbpIdentityBlazorModule), + typeof(AbpIdentityBlazorWebAssemblyModule), typeof(AbpTenantManagementBlazorWebAssemblyModule), - typeof(AbpSettingManagementBlazorModule) + typeof(AbpSettingManagementBlazorWebAssemblyModule) )] public class MyProjectNameBlazorModule : AbpModule { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj index 63d4a5fcfc..53fd8a054b 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj @@ -20,7 +20,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs index 73aae85a81..045dfa72c9 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs @@ -11,7 +11,7 @@ using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme; using Volo.Abp.Autofac.WebAssembly; using Volo.Abp.AutoMapper; -using Volo.Abp.Identity.Blazor; +using Volo.Abp.Identity.Blazor.WebAssembly; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; @@ -20,7 +20,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Host [DependsOn( typeof(AbpAutofacWebAssemblyModule), typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule), - typeof(AbpIdentityBlazorModule), + typeof(AbpIdentityBlazorWebAssemblyModule), typeof(AbpAccountBlazorModule), typeof(MyProjectNameBlazorModule) )] From d06169bd98f6fdf8c9784227444a0b09451875e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 18 Mar 2021 10:07:50 +0300 Subject: [PATCH 07/10] Add Volo.Abp.TenantManagement.HttpApi.Client package to Volo.Abp.TenantManagement.Blazor.WebAssembly --- .../AbpTenantManagementBlazorWebAssemblyModule.cs | 3 ++- .../Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs index 585d73a8d9..991682b211 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs @@ -5,7 +5,8 @@ namespace Volo.Abp.TenantManagement.Blazor.WebAssembly { [DependsOn( typeof(AbpTenantManagementBlazorModule), - typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule), + typeof(AbpTenantManagementHttpApiClientModule) )] public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule { diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj index 9877590de2..1a8ae8c68c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj @@ -13,6 +13,7 @@ + From 68256d678fad869d95752a57e67822d9499e778c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 18 Mar 2021 10:38:06 +0300 Subject: [PATCH 08/10] Resolved #8112: Blazor.Server and Blazor.WebAssembly packages for the module template. --- .../MyCompanyName.MyProjectName.sln | 14 ++++++++++++++ ...panyName.MyProjectName.Blazor.Server.csproj | 17 +++++++++++++++++ .../MyProjectNameBlazorServerModule.cs | 14 ++++++++++++++ ...ame.MyProjectName.Blazor.WebAssembly.csproj | 18 ++++++++++++++++++ .../MyProjectNameBlazorWebAssemblyModule.cs | 15 +++++++++++++++ .../MyCompanyName.MyProjectName.Blazor.csproj | 4 ++-- .../MyProjectNameBlazorModule.cs | 4 +++- .../_Imports.razor | 2 +- 8 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs diff --git a/templates/module/aspnet-core/MyCompanyName.MyProjectName.sln b/templates/module/aspnet-core/MyCompanyName.MyProjectName.sln index f23f8610d0..8d87117893 100644 --- a/templates/module/aspnet-core/MyCompanyName.MyProjectName.sln +++ b/templates/module/aspnet-core/MyCompanyName.MyProjectName.sln @@ -53,6 +53,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Host", "host\MyCompanyName.MyProjectName.Blazor.Host\MyCompanyName.MyProjectName.Blazor.Host.csproj", "{D7E0F672-F5E2-4338-AFF4-4E5091C55A62}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Server", "src\MyCompanyName.MyProjectName.Blazor.Server\MyCompanyName.MyProjectName.Blazor.Server.csproj", "{299BE52E-823F-408E-9C6D-7E2F81BA34FF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebAssembly", "src\MyCompanyName.MyProjectName.Blazor.WebAssembly\MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj", "{F0EE5760-262D-456A-AA7C-E84F484A05F6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -147,6 +151,14 @@ Global {D7E0F672-F5E2-4338-AFF4-4E5091C55A62}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7E0F672-F5E2-4338-AFF4-4E5091C55A62}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7E0F672-F5E2-4338-AFF4-4E5091C55A62}.Release|Any CPU.Build.0 = Release|Any CPU + {299BE52E-823F-408E-9C6D-7E2F81BA34FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {299BE52E-823F-408E-9C6D-7E2F81BA34FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {299BE52E-823F-408E-9C6D-7E2F81BA34FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {299BE52E-823F-408E-9C6D-7E2F81BA34FF}.Release|Any CPU.Build.0 = Release|Any CPU + {F0EE5760-262D-456A-AA7C-E84F484A05F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0EE5760-262D-456A-AA7C-E84F484A05F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0EE5760-262D-456A-AA7C-E84F484A05F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0EE5760-262D-456A-AA7C-E84F484A05F6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -174,6 +186,8 @@ Global {3D872C41-E226-45C8-89C1-9D3DBD7C73F2} = {E400416D-2895-4512-9D17-90681EEC7E0A} {827FCC18-A22B-4175-82CD-1233F6DEE8FB} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} {D7E0F672-F5E2-4338-AFF4-4E5091C55A62} = {E400416D-2895-4512-9D17-90681EEC7E0A} + {299BE52E-823F-408E-9C6D-7E2F81BA34FF} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {F0EE5760-262D-456A-AA7C-E84F484A05F6} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD} diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj new file mode 100644 index 0000000000..421a6a54e1 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -0,0 +1,17 @@ + + + + + + net5.0 + + + + + + + + + + + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs new file mode 100644 index 0000000000..a2a1fbbed3 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs @@ -0,0 +1,14 @@ +using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.Modularity; + +namespace MyCompanyName.MyProjectName.Blazor.Server +{ + [DependsOn( + typeof(AbpAspNetCoreComponentsServerThemingModule), + typeof(MyProjectNameBlazorModule) + )] + public class MyProjectNameBlazorServerModule : AbpModule + { + + } +} \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj new file mode 100644 index 0000000000..07bb669e81 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj @@ -0,0 +1,18 @@ + + + + + + net5.0 + + + + + + + + + + + + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs new file mode 100644 index 0000000000..d327a462cb --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs @@ -0,0 +1,15 @@ +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.Modularity; + +namespace MyCompanyName.MyProjectName.Blazor.WebAssembly +{ + [DependsOn( + typeof(MyProjectNameBlazorModule), + typeof(MyProjectNameHttpApiClientModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + )] + public class MyProjectNameBlazorWebAssemblyModule : AbpModule + { + + } +} \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 3960b8ea91..aaf6ab24de 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -8,10 +8,10 @@ - + - + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index c0ae0ff01c..defe9b65d5 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.Blazor.Menus; +using Volo.Abp.AspNetCore.Components.Web.Theming; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; @@ -8,7 +9,8 @@ using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName.Blazor { [DependsOn( - typeof(MyProjectNameHttpApiClientModule), + typeof(MyProjectNameApplicationContractsModule), + typeof(AbpAspNetCoreComponentsWebThemingModule), typeof(AbpAutoMapperModule) )] public class MyProjectNameBlazorModule : AbpModule diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor index 4685ac9893..43b30f8498 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.Components.Web -@using Volo.Abp.AspNetCore.Components.WebAssembly +@using Volo.Abp.AspNetCore.Components.Web @using Volo.Abp.BlazoriseUI @using Blazorise @using Blazorise.DataGrid \ No newline at end of file From 044700297bb8d97e5ef60f5cf2785589bf8dcd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 18 Mar 2021 10:38:23 +0300 Subject: [PATCH 09/10] Add fody to the module template. --- templates/module/aspnet-core/common.props | 8 +++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ 45 files changed, 734 insertions(+) create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xsd create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xml create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xsd diff --git a/templates/module/aspnet-core/common.props b/templates/module/aspnet-core/common.props index c1ff420edf..1e88b23715 100644 --- a/templates/module/aspnet-core/common.props +++ b/templates/module/aspnet-core/common.props @@ -5,4 +5,12 @@ $(NoWarn);CS1591;CS0436 module + + + + + All + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xml b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xsd b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/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/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xml b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xsd b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Host.Shared/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/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xml b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xsd b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/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/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xml b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xsd b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/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/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xml b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xsd b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/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/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xml b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xsd b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/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/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xml b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xsd b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/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/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xml b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xsd b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/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/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xml b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xsd b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/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/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xml b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xsd b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/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/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xml b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xml new file mode 100644 index 0000000000..be0de3a908 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xsd b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/FodyWeavers.xsd new file mode 100644 index 0000000000..3f3946e282 --- /dev/null +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/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 From bdd63ac993ad8648fd1d65abc724983ee92087d7 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 18 Mar 2021 15:43:55 +0800 Subject: [PATCH 10/10] Improved --- .../AbpFeatureManagementBlazorServerModule.cs | 2 +- ...le.cs => AbpFeatureManagementBlazorWebAssemblyModule.cs} | 5 +++-- .../Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj | 1 + .../AbpIdentityBlazorServerModule.cs | 2 ++ .../Volo.Abp.Identity.Blazor.Server.csproj | 1 + .../AbpIdentityBlazorWebAssemblyModule.cs | 5 ++++- .../Volo.Abp.Identity.Blazor.WebAssembly.csproj | 2 ++ .../AbpPermissionManagementBlazorWebAssemblyModule.cs | 3 ++- .../Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj | 1 + .../AbpSettingManagementBlazorWebAssemblyModule.cs | 3 ++- .../Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj | 1 + .../AbpTenantManagementBlazorServerModule.cs | 6 ++++-- .../Volo.Abp.TenantManagement.Blazor.Server.csproj | 4 ++++ .../AbpTenantManagementBlazorWebAssemblyModule.cs | 6 ++++-- .../Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj | 6 +++++- .../MyProjectNameBlazorModule.cs | 1 + 16 files changed, 38 insertions(+), 11 deletions(-) rename modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/{AbpTenantManagementBlazorWebAssemblyModule.cs => AbpFeatureManagementBlazorWebAssemblyModule.cs} (54%) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs index 7f996bca12..9ec85033d9 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.Server/AbpFeatureManagementBlazorServerModule.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.FeatureManagement.Blazor.Server typeof(AbpFeatureManagementBlazorModule), typeof(AbpAspNetCoreComponentsServerThemingModule) )] - public class AbpTenantManagementBlazorServerModule : AbpModule + public class AbpFeatureManagementBlazorServerModule : AbpModule { } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpFeatureManagementBlazorWebAssemblyModule.cs similarity index 54% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpFeatureManagementBlazorWebAssemblyModule.cs index c4f316aa9e..f091a8d2a4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/AbpFeatureManagementBlazorWebAssemblyModule.cs @@ -5,9 +5,10 @@ namespace Volo.Abp.FeatureManagement.Blazor.WebAssembly { [DependsOn( typeof(AbpFeatureManagementBlazorModule), - typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule), + typeof(AbpFeatureManagementHttpApiClientModule) )] - public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule + public class AbpFeatureManagementBlazorWebAssemblyModule : AbpModule { } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj index 1a046fcf86..070323dab4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.csproj @@ -9,6 +9,7 @@ + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs index f445dd8798..692551da55 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/AbpIdentityBlazorServerModule.cs @@ -1,10 +1,12 @@ using Volo.Abp.AspNetCore.Components.Server.Theming; using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement.Blazor.Server; namespace Volo.Abp.Identity.Blazor.Server { [DependsOn( typeof(AbpIdentityBlazorModule), + typeof(AbpPermissionManagementBlazorServerModule), typeof(AbpAspNetCoreComponentsServerThemingModule) )] public class AbpIdentityBlazorServerModule : AbpModule diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj index 916e12572a..301c4cc621 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.Server/Volo.Abp.Identity.Blazor.Server.csproj @@ -13,6 +13,7 @@ + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs index d7d9ed2a44..a0f7f8af9e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/AbpIdentityBlazorWebAssemblyModule.cs @@ -1,11 +1,14 @@ using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement.Blazor.WebAssembly; namespace Volo.Abp.Identity.Blazor.WebAssembly { [DependsOn( typeof(AbpIdentityBlazorModule), - typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + typeof(AbpPermissionManagementBlazorWebAssemblyModule), + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule), + typeof(AbpIdentityHttpApiClientModule) )] public class AbpIdentityBlazorWebAssemblyModule : AbpModule { diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj index b0e65de973..84609f6624 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.WebAssembly/Volo.Abp.Identity.Blazor.WebAssembly.csproj @@ -9,10 +9,12 @@ + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs index 3561907162..c6a95860bb 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/AbpPermissionManagementBlazorWebAssemblyModule.cs @@ -5,7 +5,8 @@ namespace Volo.Abp.PermissionManagement.Blazor.WebAssembly { [DependsOn( typeof(AbpPermissionManagementBlazorModule), - typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule), + typeof(AbpPermissionManagementHttpApiClientModule) )] public class AbpPermissionManagementBlazorWebAssemblyModule : AbpModule { diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj index 8329b1659e..d5d11790e7 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.csproj @@ -9,6 +9,7 @@ + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs index 7cc7a0ff35..a1b1ad08b5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs @@ -5,7 +5,8 @@ namespace Volo.Abp.SettingManagement.Blazor.WebAssembly { [DependsOn( typeof(AbpSettingManagementBlazorModule), - typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule), + typeof(AbpSettingManagementHttpApiClientModule) )] public class AbpSettingManagementBlazorWebAssemblyModule : AbpModule { diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj index 15154e4dc8..eef535f9b2 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj @@ -9,6 +9,7 @@ + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs index 120ac5e345..b2829df926 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/AbpTenantManagementBlazorServerModule.cs @@ -1,14 +1,16 @@ using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.FeatureManagement.Blazor.Server; using Volo.Abp.Modularity; namespace Volo.Abp.TenantManagement.Blazor.Server { [DependsOn( typeof(AbpTenantManagementBlazorModule), + typeof(AbpFeatureManagementBlazorServerModule), typeof(AbpAspNetCoreComponentsServerThemingModule) )] public class AbpTenantManagementBlazorServerModule : AbpModule { - + } -} \ No newline at end of file +} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj index 9763fa5f65..1589f70c20 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.csproj @@ -11,6 +11,10 @@ + + + + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs index 991682b211..4621fed18f 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/AbpTenantManagementBlazorWebAssemblyModule.cs @@ -1,15 +1,17 @@ using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.FeatureManagement.Blazor.WebAssembly; using Volo.Abp.Modularity; namespace Volo.Abp.TenantManagement.Blazor.WebAssembly { [DependsOn( typeof(AbpTenantManagementBlazorModule), + typeof(AbpFeatureManagementBlazorWebAssemblyModule), typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule), typeof(AbpTenantManagementHttpApiClientModule) )] public class AbpTenantManagementBlazorWebAssemblyModule : AbpModule { - + } -} \ No newline at end of file +} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj index 1a8ae8c68c..bda4c7dd15 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.WebAssembly/Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj @@ -11,9 +11,13 @@ + + + + - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index b7b1460f71..846c7c10d8 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -15,6 +15,7 @@ using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme; using Volo.Abp.Identity.Blazor.WebAssembly; +using Volo.Abp.SettingManagement.Blazor.WebAssembly; using Volo.Abp.TenantManagement.Blazor.WebAssembly; namespace MyCompanyName.MyProjectName.Blazor