Create baskets plugin module

plugins/Baskets/host/EasyAbp.EShop.Plugins.Baskets.Host.Shared/EasyAbp.EShop.Plugins.Baskets.Host.Shared.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
 </Project>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp.EShop.Plugins.Baskets.Application.Contracts.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/BasketsApplicationContractsModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationContractsModule.cs

@@ -5,11 +5,11 @@ using Volo.Abp.Authorization;
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsDomainSharedModule),
+        typeof(EShopPluginsBasketsDomainSharedModule),
         typeof(AbpDddApplicationContractsModule),
         typeof(AbpAuthorizationModule)
         )]
-    public class BasketsApplicationContractsModule : AbpModule
+    public class EShopPluginsBasketsApplicationContractsModule : AbpModule
     {
 
     }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Permissions/BasketsPermissions.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/Permissions/BasketsPermissions.cs

@@ -4,7 +4,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.Permissions
 {
     public class BasketsPermissions
     {
-        public const string GroupName = "Baskets";
+        public const string GroupName = "EasyAbp.EShop.Plugins.Baskets";
 
         public static string[] GetAll()
         {

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/ISampleAppService.cs

@@ -1,12 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace EasyAbp.EShop.Plugins.Baskets.Samples
-{
-    public interface ISampleAppService : IApplicationService
-    {
-        Task<SampleDto> GetAsync();
-
-        Task<SampleDto> GetAuthorizedAsync();
-    }
-}

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/Samples/SampleDto.cs

@@ -1,7 +0,0 @@
-namespace EasyAbp.EShop.Plugins.Baskets.Samples
-{
-    public class SampleDto
-    {
-        public int Value { get; set; }
-    }
-}

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp.EShop.Plugins.Baskets.Application.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsAppService.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketsAppService.cs

@@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Plugins.Baskets
         protected BasketsAppService()
         {
             LocalizationResource = typeof(BasketsResource);
-            ObjectMapperContext = typeof(BasketsApplicationModule);
+            ObjectMapperContext = typeof(EShopPluginsBasketsApplicationModule);
         }
     }
 }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/BasketsApplicationModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsApplicationModule.cs

@@ -6,19 +6,19 @@ using Volo.Abp.Application;
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsDomainModule),
+        typeof(EShopPluginsBasketsDomainModule),
-        typeof(BasketsApplicationContractsModule),
+        typeof(EShopPluginsBasketsApplicationContractsModule),
         typeof(AbpDddApplicationModule),
         typeof(AbpAutoMapperModule)
         )]
-    public class BasketsApplicationModule : AbpModule
+    public class EShopPluginsBasketsApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<BasketsApplicationModule>();
+            context.Services.AddAutoMapperObjectMapper<EShopPluginsBasketsApplicationModule>();
             Configure<AbpAutoMapperOptions>(options =>
             {
-                options.AddMaps<BasketsApplicationModule>(validate: true);
+                options.AddMaps<EShopPluginsBasketsApplicationModule>(validate: true);
             });
         }
     }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/Samples/SampleAppService.cs

@@ -1,29 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-
-namespace EasyAbp.EShop.Plugins.Baskets.Samples
-{
-    public class SampleAppService : BasketsAppService, ISampleAppService
-    {
-        public Task<SampleDto> GetAsync()
-        {
-            return Task.FromResult(
-                new SampleDto
-                {
-                    Value = 42
-                }
-            );
-        }
-
-        [Authorize]
-        public Task<SampleDto> GetAuthorizedAsync()
-        {
-            return Task.FromResult(
-                new SampleDto
-                {
-                    Value = 42
-                }
-            );
-        }
-    }
-}

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
@@ -17,8 +17,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <EmbeddedResource Include="Localization\Baskets\*.json" />
+    <EmbeddedResource Include="EasyAbp\EShop\Plugins\Baskets\Localization\*.json" />
-    <Content Remove="Localization\Baskets\*.json" />
+    <Content Remove="EasyAbp\EShop\Plugins\Baskets\Localization\*.json" />
   </ItemGroup>
 
 </Project>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/BasketsDomainSharedModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainSharedModule.cs

@@ -11,13 +11,13 @@ namespace EasyAbp.EShop.Plugins.Baskets
     [DependsOn(
         typeof(AbpValidationModule)
     )]
-    public class BasketsDomainSharedModule : AbpModule
+    public class EShopPluginsBasketsDomainSharedModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<BasketsDomainSharedModule>();
+                options.FileSets.AddEmbedded<EShopPluginsBasketsDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
@@ -25,12 +25,12 @@ namespace EasyAbp.EShop.Plugins.Baskets
                 options.Resources
                     .Add<BasketsResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/Baskets");
+                    .AddVirtualJson("/EasyAbp/EShop/Plugins/Baskets/Localization");
             });
 
             Configure<AbpExceptionLocalizationOptions>(options =>
             {
-                options.MapCodeNamespace("Baskets", typeof(BasketsResource));
+                options.MapCodeNamespace("EasyAbp.EShop.Plugins.Baskets", typeof(BasketsResource));
             });
         }
     }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/Localization/BasketsResource.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/BasketsResource.cs

@@ -2,7 +2,7 @@
 
 namespace EasyAbp.EShop.Plugins.Baskets.Localization
 {
-    [LocalizationResourceName("Baskets")]
+    [LocalizationResourceName("EShopPluginsBaskets")]
     public class BasketsResource
     {
         

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp.EShop.Plugins.Baskets.Domain.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItem.cs

@@ -0,0 +1,41 @@
+using System;
+using JetBrains.Annotations;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
+
+namespace EasyAbp.EShop.Plugins.Baskets.BasketItems
+{
+    public class BasketItem : CreationAuditedAggregateRoot<Guid>, IMultiTenant
+    {
+        public virtual Guid? TenantId { get; protected set; }
+        
+        [NotNull]
+        public virtual string BasketLabel { get; protected set; }
+        
+        public virtual Guid UserId { get; protected set; }
+        
+        public virtual Guid ProductId { get; protected set; }
+        
+        public virtual Guid ProductSkuId { get; protected set; }
+        
+        public virtual int Quantity { get; protected set; }
+        
+        [CanBeNull]
+        public virtual string MediaResources { get; protected set; }
+        
+        [NotNull]
+        public virtual string ProductName { get; protected set; }
+        
+        [NotNull]
+        public virtual string SkuDescription { get; protected set; }
+
+        [NotNull]
+        public virtual string Currency { get; protected set; }
+        
+        public virtual decimal UnitPrice { get; protected set; }
+        
+        public virtual decimal TotalPrice { get; protected set; }
+        
+        public virtual decimal TotalDiscount { get; protected set; }
+    }
+}

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDbProperties.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketsDbProperties.cs

@@ -2,10 +2,10 @@
 {
     public static class BasketsDbProperties
     {
-        public static string DbTablePrefix { get; set; } = "Baskets";
+        public static string DbTablePrefix { get; set; } = "EShopPluginsBaskets";
 
         public static string DbSchema { get; set; } = null;
 
-        public const string ConnectionStringName = "Baskets";
+        public const string ConnectionStringName = "EShopPluginsBaskets";
     }
 }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/BasketsDomainModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsDomainModule.cs

@@ -3,9 +3,9 @@
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsDomainSharedModule)
+        typeof(EShopPluginsBasketsDomainSharedModule)
         )]
-    public class BasketsDomainModule : AbpModule
+    public class EShopPluginsBasketsDomainModule : AbpModule
     {
 
     }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/Settings/BasketsSettings.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/Settings/BasketsSettings.cs

@@ -2,7 +2,7 @@
 {
     public static class BasketsSettings
     {
-        public const string GroupName = "Baskets";
+        public const string GroupName = "EasyAbp.EShop.Plugins.Baskets";
 
         /* Add constants for setting names. Example:
          * public const string MySettingName = GroupName + ".MySettingName";

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,4 +12,8 @@
     <ProjectReference Include="..\EasyAbp.EShop.Plugins.Baskets.Domain\EasyAbp.EShop.Plugins.Baskets.Domain.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="EasyAbp\EShop\Plugins\Baskets" />
+  </ItemGroup>
+
 </Project>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContext.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContext.cs

@@ -21,7 +21,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore
         {
             base.OnModelCreating(builder);
 
-            builder.ConfigureBaskets();
+            builder.ConfigurePluginsBaskets();
         }
     }
 }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/BasketsDbContextModelCreatingExtensions.cs

@@ -6,7 +6,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore
 {
     public static class BasketsDbContextModelCreatingExtensions
     {
-        public static void ConfigureBaskets(
+        public static void ConfigurePluginsBaskets(
             this ModelBuilder builder,
             Action<BasketsModelBuilderConfigurationOptions> optionsAction = null)
         {

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EntityFrameworkCore/BasketsEntityFrameworkCoreModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/EntityFrameworkCore/EShopPluginsBasketsEntityFrameworkCoreModule.cs

@@ -5,10 +5,10 @@ using Volo.Abp.Modularity;
 namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(BasketsDomainModule),
+        typeof(EShopPluginsBasketsDomainModule),
         typeof(AbpEntityFrameworkCoreModule)
     )]
-    public class BasketsEntityFrameworkCoreModule : AbpModule
+    public class EShopPluginsBasketsEntityFrameworkCoreModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/BasketsHttpApiClientModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiClientModule.cs

@@ -5,16 +5,16 @@ using Volo.Abp.Modularity;
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsApplicationContractsModule),
+        typeof(EShopPluginsBasketsApplicationContractsModule),
         typeof(AbpHttpClientModule))]
-    public class BasketsHttpApiClientModule : AbpModule
+    public class EShopPluginsBasketsHttpApiClientModule : AbpModule
     {
-        public const string RemoteServiceName = "Baskets";
+        public const string RemoteServiceName = "EShopPluginsBaskets";
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddHttpClientProxies(
-                typeof(BasketsApplicationContractsModule).Assembly,
+                typeof(EShopPluginsBasketsApplicationContractsModule).Assembly,
                 RemoteServiceName
             );
         }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp.EShop.Plugins.Baskets.HttpApi.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/BasketsHttpApiModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/EasyAbp/EShop/Plugins/Baskets/EShopPluginsBasketsHttpApiModule.cs

@@ -8,15 +8,15 @@ using Microsoft.Extensions.DependencyInjection;
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsApplicationContractsModule),
+        typeof(EShopPluginsBasketsApplicationContractsModule),
         typeof(AbpAspNetCoreMvcModule))]
-    public class BasketsHttpApiModule : AbpModule
+    public class EShopPluginsBasketsHttpApiModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             PreConfigure<IMvcBuilder>(mvcBuilder =>
             {
-                mvcBuilder.AddApplicationPartIfNotExists(typeof(BasketsHttpApiModule).Assembly);
+                mvcBuilder.AddApplicationPartIfNotExists(typeof(EShopPluginsBasketsHttpApiModule).Assembly);
             });
         }
 

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.HttpApi/Samples/SampleController.cs

@@ -1,33 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp;
-
-namespace EasyAbp.EShop.Plugins.Baskets.Samples
-{
-    [RemoteService]
-    [Route("api/Baskets/sample")]
-    public class SampleController : BasketsController, ISampleAppService
-    {
-        private readonly ISampleAppService _sampleAppService;
-
-        public SampleController(ISampleAppService sampleAppService)
-        {
-            _sampleAppService = sampleAppService;
-        }
-
-        [HttpGet]
-        public async Task<SampleDto> GetAsync()
-        {
-            return await _sampleAppService.GetAsync();
-        }
-
-        [HttpGet]
-        [Route("authorized")]
-        [Authorize]
-        public async Task<SampleDto> GetAuthorizedAsync()
-        {
-            return await _sampleAppService.GetAsync();
-        }
-    }
-}

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,4 +12,8 @@
     <ProjectReference Include="..\EasyAbp.EShop.Plugins.Baskets.Domain\EasyAbp.EShop.Plugins.Baskets.Domain.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="EasyAbp\EShop\Plugins\Baskets" />
+  </ItemGroup>
+
 </Project>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/MongoDB/BasketsMongoDbModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/EasyAbp/EShop/Plugins/Baskets/MongoDB/EShopPluginsBasketsMongoDbModule.cs

@@ -5,10 +5,10 @@ using Volo.Abp.MongoDB;
 namespace EasyAbp.EShop.Plugins.Baskets.MongoDB
 {
     [DependsOn(
-        typeof(BasketsDomainModule),
+        typeof(EShopPluginsBasketsDomainModule),
         typeof(AbpMongoDbModule)
         )]
-    public class BasketsMongoDbModule : AbpModule
+    public class EShopPluginsBasketsMongoDbModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.MongoDB/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/BasketsWebModule.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EShopPluginsBasketsWebModule.cs

@@ -13,22 +13,22 @@ using EasyAbp.EShop.Plugins.Baskets.Permissions;
 namespace EasyAbp.EShop.Plugins.Baskets.Web
 {
     [DependsOn(
-        typeof(BasketsHttpApiModule),
+        typeof(EShopPluginsBasketsHttpApiModule),
         typeof(AbpAspNetCoreMvcUiThemeSharedModule),
         typeof(AbpAutoMapperModule)
         )]
-    public class BasketsWebModule : AbpModule
+    public class EShopPluginsBasketsWebModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
             {
-                options.AddAssemblyResource(typeof(BasketsResource), typeof(BasketsWebModule).Assembly);
+                options.AddAssemblyResource(typeof(BasketsResource), typeof(EShopPluginsBasketsWebModule).Assembly);
             });
 
             PreConfigure<IMvcBuilder>(mvcBuilder =>
             {
-                mvcBuilder.AddApplicationPartIfNotExists(typeof(BasketsWebModule).Assembly);
+                mvcBuilder.AddApplicationPartIfNotExists(typeof(EShopPluginsBasketsWebModule).Assembly);
             });
         }
 
@@ -41,13 +41,13 @@ namespace EasyAbp.EShop.Plugins.Baskets.Web
 
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<BasketsWebModule>();
+                options.FileSets.AddEmbedded<EShopPluginsBasketsWebModule>();
             });
 
-            context.Services.AddAutoMapperObjectMapper<BasketsWebModule>();
+            context.Services.AddAutoMapperObjectMapper<EShopPluginsBasketsWebModule>();
             Configure<AbpAutoMapperOptions>(options =>
             {
-                options.AddMaps<BasketsWebModule>(validate: true);
+                options.AddMaps<EShopPluginsBasketsWebModule>(validate: true);
             });
 
             Configure<RazorPagesOptions>(options =>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/EasyAbp.EShop.Plugins.Baskets.Web.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -31,6 +31,14 @@
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="wwwroot\**\*.*" />
+    <Content Update="Pages\EShop\Plugins\Baskets\Index.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Pages\EShop\Plugins\Baskets\_ViewImports.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenus.cs

@@ -2,7 +2,7 @@
 {
     public class BasketsMenus
     {
-        private const string Prefix = "Baskets";
+        private const string Prefix = "EasyAbp.EShop.Plugins.Baskets";
 
         //Add your menu items here...
         //public const string Home = Prefix + ".MyNewMenuItem";

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/BasketsPageModel.cs

@@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.Web.Pages
         protected BasketsPageModel()
         {
             LocalizationResourceType = typeof(BasketsResource);
-            ObjectMapperContext = typeof(BasketsWebModule);
+            ObjectMapperContext = typeof(EShopPluginsBasketsWebModule);
         }
     }
 }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml

@@ -1,7 +1,7 @@
 @page
 @using Microsoft.Extensions.Localization
 @using EasyAbp.EShop.Plugins.Baskets.Localization
-@model EasyAbp.EShop.Plugins.Baskets.Web.Pages.Baskets.IndexModel
+@model EasyAbp.EShop.Plugins.Baskets.Web.Pages.EShop.Plugins.Baskets.IndexModel
 @inject IStringLocalizer<BasketsResource> L
 @{
 }

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/Baskets/Index.cshtml.cs → plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/Index.cshtml.cs

@@ -1,4 +1,4 @@
-namespace EasyAbp.EShop.Plugins.Baskets.Web.Pages.Baskets
+namespace EasyAbp.EShop.Plugins.Baskets.Web.Pages.EShop.Plugins.Baskets
 {
     public class IndexModel : BasketsPageModel
     {

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/BasketsApplicationTestModule.cs

@@ -3,7 +3,7 @@
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsApplicationModule),
+        typeof(EShopPluginsBasketsApplicationModule),
         typeof(BasketsDomainTestModule)
         )]
     public class BasketsApplicationTestModule : AbpModule

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/Samples/SampleAppService_Tests.cs

@@ -1,30 +0,0 @@
-using System.Threading.Tasks;
-using Shouldly;
-using Xunit;
-
-namespace EasyAbp.EShop.Plugins.Baskets.Samples
-{
-    public class SampleAppService_Tests : BasketsApplicationTestBase
-    {
-        private readonly ISampleAppService _sampleAppService;
-
-        public SampleAppService_Tests()
-        {
-            _sampleAppService = GetRequiredService<ISampleAppService>();
-        }
-
-        [Fact]
-        public async Task GetAsync()
-        {
-            var result = await _sampleAppService.GetAsync();
-            result.Value.ShouldBe(42);
-        }
-
-        [Fact]
-        public async Task GetAuthorizedAsync()
-        {
-            var result = await _sampleAppService.GetAuthorizedAsync();
-            result.Value.ShouldBe(42);
-        }
-    }
-}

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/Samples/SampleManager_Tests.cs

@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using Xunit;
-
-namespace EasyAbp.EShop.Plugins.Baskets.Samples
-{
-    public class SampleManager_Tests : BasketsDomainTestBase
-    {
-        //private readonly SampleManager _sampleManager;
-
-        public SampleManager_Tests()
-        {
-            //_sampleManager = GetRequiredService<SampleManager>();
-        }
-
-        [Fact]
-        public async Task Method1Async()
-        {
-
-        }
-    }
-}

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/BasketsEntityFrameworkCoreTestModule.cs

@@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore
 {
     [DependsOn(
         typeof(BasketsTestBaseModule),
-        typeof(BasketsEntityFrameworkCoreModule),
+        typeof(EShopPluginsBasketsEntityFrameworkCoreModule),
         typeof(AbpEntityFrameworkCoreSqliteModule)
         )]
     public class BasketsEntityFrameworkCoreTestModule : AbpModule

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs

@@ -1,12 +0,0 @@
-using EasyAbp.EShop.Plugins.Baskets.Samples;
-
-namespace EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Samples
-{
-    public class SampleRepository_Tests : SampleRepository_Tests<BasketsEntityFrameworkCoreTestModule>
-    {
-        /* Don't write custom repository tests here, instead write to
-         * the base class.
-         * One exception can be some specific tests related to EF core.
-         */
-    }
-}

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/BasketsConsoleApiClientModule.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Modularity;
 namespace EasyAbp.EShop.Plugins.Baskets
 {
     [DependsOn(
-        typeof(BasketsHttpApiClientModule),
+        typeof(EShopPluginsBasketsHttpApiClientModule),
         typeof(AbpHttpClientIdentityModelModule)
         )]
     public class BasketsConsoleApiClientModule : AbpModule

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs

@@ -3,7 +3,6 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using IdentityModel.Client;
 using Microsoft.Extensions.Configuration;
-using EasyAbp.EShop.Plugins.Baskets.Samples;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.IdentityModel;
 
@@ -11,16 +10,13 @@ namespace EasyAbp.EShop.Plugins.Baskets
 {
     public class ClientDemoService : ITransientDependency
     {
-        private readonly ISampleAppService _sampleAppService;
         private readonly IIdentityModelAuthenticationService _authenticationService;
         private readonly IConfiguration _configuration;
 
         public ClientDemoService(
-            ISampleAppService sampleAppService, 
             IIdentityModelAuthenticationService authenticationService, 
             IConfiguration configuration)
         {
-            _sampleAppService = sampleAppService;
             _authenticationService = authenticationService;
             _configuration = configuration;
         }
@@ -40,12 +36,6 @@ namespace EasyAbp.EShop.Plugins.Baskets
         {
             Console.WriteLine();
             Console.WriteLine($"***** {nameof(TestWithDynamicProxiesAsync)} *****");
-
-            var result = await _sampleAppService.GetAsync();
-            Console.WriteLine("Result: " + result.Value);
-
-            result = await _sampleAppService.GetAuthorizedAsync();
-            Console.WriteLine("Result (authorized): " + result.Value);
         }
 
         /* Shows how to use HttpClient to perform a request to the HTTP API.

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Plugins.Baskets.HttpApi.Client.ConsoleTestApp.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/BasketsMongoDbTestModule.cs

@@ -6,7 +6,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.MongoDB
 {
     [DependsOn(
         typeof(BasketsTestBaseModule),
-        typeof(BasketsMongoDbModule)
+        typeof(EShopPluginsBasketsMongoDbModule)
         )]
     public class BasketsMongoDbTestModule : AbpModule
     {

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs

@@ -1,14 +0,0 @@
-using EasyAbp.EShop.Plugins.Baskets.Samples;
-using Xunit;
-
-namespace EasyAbp.EShop.Plugins.Baskets.MongoDB.Samples
-{
-    [Collection(MongoTestCollection.Name)]
-    public class SampleRepository_Tests : SampleRepository_Tests<BasketsMongoDbTestModule>
-    {
-        /* Don't write custom repository tests here, instead write to
-         * the base class.
-         * One exception can be some specific tests related to MongoDB.
-         */
-    }
-}

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/BasketsTestBaseModule.cs

@@ -12,7 +12,7 @@ namespace EasyAbp.EShop.Plugins.Baskets
         typeof(AbpAutofacModule),
         typeof(AbpTestBaseModule),
         typeof(AbpAuthorizationModule),
-        typeof(BasketsDomainModule)
+        typeof(EShopPluginsBasketsDomainModule)
         )]
     public class BasketsTestBaseModule : AbpModule
     {

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\common.props" />
+  <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.EShop.Plugins.Baskets</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>