Browse Source

Upgrade to ABP version 3.0.0

Upgrade EasyAbp.Abp.Trees module to version 0.290.4
pull/87/head v0.3.7
gdlcf88 6 years ago
parent
commit
743f4cd7e7
  1. 2
      common.props
  2. 4
      integration/EasyAbp.EShop/src/EasyAbp.EShop.Application.Contracts/EasyAbp.EShop.Application.Contracts.csproj
  3. 4
      integration/EasyAbp.EShop/src/EasyAbp.EShop.Application/EasyAbp.EShop.Application.csproj
  4. 2
      integration/EasyAbp.EShop/src/EasyAbp.EShop.Domain.Shared/EasyAbp.EShop.Domain.Shared.csproj
  5. 2
      integration/EasyAbp.EShop/src/EasyAbp.EShop.Domain/EasyAbp.EShop.Domain.csproj
  6. 2
      integration/EasyAbp.EShop/src/EasyAbp.EShop.EntityFrameworkCore/EasyAbp.EShop.EntityFrameworkCore.csproj
  7. 2
      integration/EasyAbp.EShop/src/EasyAbp.EShop.HttpApi.Client/EasyAbp.EShop.HttpApi.Client.csproj
  8. 2
      integration/EasyAbp.EShop/src/EasyAbp.EShop.HttpApi/EasyAbp.EShop.HttpApi.csproj
  9. 2
      integration/EasyAbp.EShop/src/EasyAbp.EShop.MongoDB/EasyAbp.EShop.MongoDB.csproj
  10. 4
      integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/EasyAbp.EShop.Web.csproj
  11. 2
      integration/EasyAbp.EShop/test/EasyAbp.EShop.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.HttpApi.Client.ConsoleTestApp.csproj
  12. 6
      integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj
  13. 2
      integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  14. 4
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Application.Contracts/EasyAbp.EShop.Baskets.Application.Contracts.csproj
  15. 4
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Application/EasyAbp.EShop.Baskets.Application.csproj
  16. 2
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain.Shared/EasyAbp.EShop.Baskets.Domain.Shared.csproj
  17. 2
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain/EasyAbp.EShop.Baskets.Domain.csproj
  18. 2
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.EntityFrameworkCore/EasyAbp.EShop.Baskets.EntityFrameworkCore.csproj
  19. 2
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.HttpApi.Client/EasyAbp.EShop.Baskets.HttpApi.Client.csproj
  20. 2
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.HttpApi/EasyAbp.EShop.Baskets.HttpApi.csproj
  21. 2
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.MongoDB/EasyAbp.EShop.Baskets.MongoDB.csproj
  22. 4
      modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/EasyAbp.EShop.Baskets.Web.csproj
  23. 2
      modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Baskets.HttpApi.Client.ConsoleTestApp.csproj
  24. 6
      modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/EasyAbp.EShop.Baskets.TestBase.csproj
  25. 2
      modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  26. 4
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp.EShop.Orders.Application.Contracts.csproj
  27. 1
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/IOrderAppService.cs
  28. 4
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp.EShop.Orders.Application.csproj
  29. 8
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs
  30. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp.EShop.Orders.Domain.Shared.csproj
  31. 6
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
  32. 5
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/EShopOrdersDomainModule.cs
  33. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp.EShop.Orders.EntityFrameworkCore.csproj
  34. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi.Client/EasyAbp.EShop.Orders.HttpApi.Client.csproj
  35. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp.EShop.Orders.HttpApi.csproj
  36. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.MongoDB/EasyAbp.EShop.Orders.MongoDB.csproj
  37. 4
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/EasyAbp.EShop.Orders.Web.csproj
  38. 2
      modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Orders.HttpApi.Client.ConsoleTestApp.csproj
  39. 6
      modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj
  40. 2
      modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  41. 4
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj
  42. 6
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/IPaymentAppService.cs
  43. 6
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/IRefundAppService.cs
  44. 4
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp.EShop.Payments.Application.csproj
  45. 20
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs
  46. 20
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs
  47. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj
  48. 6
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
  49. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp.EShop.Payments.EntityFrameworkCore.csproj
  50. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp.EShop.Payments.HttpApi.Client.csproj
  51. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp.EShop.Payments.HttpApi.csproj
  52. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp.EShop.Payments.MongoDB.csproj
  53. 4
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EasyAbp.EShop.Payments.Web.csproj
  54. 2
      modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Payments.HttpApi.Client.ConsoleTestApp.csproj
  55. 6
      modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj
  56. 2
      modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  57. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj
  58. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/IProductCategoryAppService.cs
  59. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductDetailHistories/IProductDetailHistoryAppService.cs
  60. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductHistories/IProductDetailHistoryAppService.cs
  61. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj
  62. 20
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
  63. 20
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs
  64. 20
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs
  65. 8
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
  66. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj
  67. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj
  68. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj
  69. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi.Client/EasyAbp.EShop.Products.HttpApi.Client.csproj
  70. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp.EShop.Products.HttpApi.csproj
  71. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.MongoDB/EasyAbp.EShop.Products.MongoDB.csproj
  72. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj
  73. 2
      modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Products.HttpApi.Client.ConsoleTestApp.csproj
  74. 6
      modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj
  75. 2
      modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  76. 4
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application.Contracts/EasyAbp.EShop.Stores.Application.Contracts.csproj
  77. 4
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp.EShop.Stores.Application.csproj
  78. 2
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain.Shared/EasyAbp.EShop.Stores.Domain.Shared.csproj
  79. 2
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp.EShop.Stores.Domain.csproj
  80. 2
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp.EShop.Stores.EntityFrameworkCore.csproj
  81. 2
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi.Client/EasyAbp.EShop.Stores.HttpApi.Client.csproj
  82. 2
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp.EShop.Stores.HttpApi.csproj
  83. 2
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.MongoDB/EasyAbp.EShop.Stores.MongoDB.csproj
  84. 4
      modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj
  85. 2
      modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Stores.HttpApi.Client.ConsoleTestApp.csproj
  86. 6
      modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj
  87. 2
      modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/Security/FakeCurrentPrincipalAccessor.cs
  88. 10
      samples/EShopSample/angular/package.json
  89. 16
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
  90. 14
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
  91. 2
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj
  92. 20
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
  93. 22
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
  94. 3625
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200702100757_UpgradedAbpTo3_0_0.Designer.cs
  95. 519
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200702100757_UpgradedAbpTo3_0_0.cs
  96. 90
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs
  97. 22
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
  98. 14
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
  99. 14
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
  100. 20
      samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj

2
common.props

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>0.3.6</Version> <Version>0.3.7</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors> <Authors>EasyAbp Team</Authors>

4
integration/EasyAbp.EShop/src/EasyAbp.EShop.Application.Contracts/EasyAbp.EShop.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" />

4
integration/EasyAbp.EShop/src/EasyAbp.EShop.Application/EasyAbp.EShop.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Application\EasyAbp.EShop.Baskets.Application.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Application\EasyAbp.EShop.Baskets.Application.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application\EasyAbp.EShop.Orders.Application.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application\EasyAbp.EShop.Orders.Application.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Application\EasyAbp.EShop.Payments.Application.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Application\EasyAbp.EShop.Payments.Application.csproj" />

2
integration/EasyAbp.EShop/src/EasyAbp.EShop.Domain.Shared/EasyAbp.EShop.Domain.Shared.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Validation" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Domain.Shared\EasyAbp.EShop.Baskets.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Domain.Shared\EasyAbp.EShop.Baskets.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Domain.Shared\EasyAbp.EShop.Orders.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Domain.Shared\EasyAbp.EShop.Orders.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />

2
integration/EasyAbp.EShop/src/EasyAbp.EShop.Domain/EasyAbp.EShop.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" />

2
integration/EasyAbp.EShop/src/EasyAbp.EShop.EntityFrameworkCore/EasyAbp.EShop.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.EntityFrameworkCore\EasyAbp.EShop.Baskets.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.EntityFrameworkCore\EasyAbp.EShop.Baskets.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.EntityFrameworkCore\EasyAbp.EShop.Orders.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.EntityFrameworkCore\EasyAbp.EShop.Orders.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.EntityFrameworkCore\EasyAbp.EShop.Payments.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.EntityFrameworkCore\EasyAbp.EShop.Payments.EntityFrameworkCore.csproj" />

2
integration/EasyAbp.EShop/src/EasyAbp.EShop.HttpApi.Client/EasyAbp.EShop.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.HttpApi.Client\EasyAbp.EShop.Baskets.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.HttpApi.Client\EasyAbp.EShop.Baskets.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.HttpApi.Client\EasyAbp.EShop.Orders.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.HttpApi.Client\EasyAbp.EShop.Orders.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.HttpApi.Client\EasyAbp.EShop.Payments.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.HttpApi.Client\EasyAbp.EShop.Payments.HttpApi.Client.csproj" />

2
integration/EasyAbp.EShop/src/EasyAbp.EShop.HttpApi/EasyAbp.EShop.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.HttpApi\EasyAbp.EShop.Baskets.HttpApi.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.HttpApi\EasyAbp.EShop.Baskets.HttpApi.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.HttpApi\EasyAbp.EShop.Orders.HttpApi.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.HttpApi\EasyAbp.EShop.Orders.HttpApi.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.HttpApi\EasyAbp.EShop.Payments.HttpApi.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.HttpApi\EasyAbp.EShop.Payments.HttpApi.csproj" />

2
integration/EasyAbp.EShop/src/EasyAbp.EShop.MongoDB/EasyAbp.EShop.MongoDB.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="2.9.0" /> <PackageReference Include="Volo.Abp.MongoDB" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.MongoDB\EasyAbp.EShop.Baskets.MongoDB.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.MongoDB\EasyAbp.EShop.Baskets.MongoDB.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.MongoDB\EasyAbp.EShop.Orders.MongoDB.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.MongoDB\EasyAbp.EShop.Orders.MongoDB.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.MongoDB\EasyAbp.EShop.Payments.MongoDB.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.MongoDB\EasyAbp.EShop.Payments.MongoDB.csproj" />

4
integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/EasyAbp.EShop.Web.csproj

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Web\EasyAbp.EShop.Baskets.Web.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Baskets\src\EasyAbp.EShop.Baskets.Web\EasyAbp.EShop.Baskets.Web.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Web\EasyAbp.EShop.Orders.Web.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Web\EasyAbp.EShop.Orders.Web.csproj" />
<ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Web\EasyAbp.EShop.Payments.Web.csproj" /> <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Web\EasyAbp.EShop.Payments.Web.csproj" />

2
integration/EasyAbp.EShop/test/EasyAbp.EShop.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.HttpApi.Client.ConsoleTestApp.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.HttpApi.Client\EasyAbp.EShop.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.HttpApi.Client\EasyAbp.EShop.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

6
integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj

@ -14,9 +14,9 @@
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Domain\EasyAbp.EShop.Domain.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Domain\EasyAbp.EShop.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
public override ClaimsPrincipal GetClaimsPrincipal() protected override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

4
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Application.Contracts/EasyAbp.EShop.Baskets.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain.Shared\EasyAbp.EShop.Baskets.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain.Shared\EasyAbp.EShop.Baskets.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Application/EasyAbp.EShop.Baskets.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain.Shared/EasyAbp.EShop.Baskets.Domain.Shared.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Validation" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain/EasyAbp.EShop.Baskets.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain.Shared\EasyAbp.EShop.Baskets.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain.Shared\EasyAbp.EShop.Baskets.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.EntityFrameworkCore/EasyAbp.EShop.Baskets.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.HttpApi.Client/EasyAbp.EShop.Baskets.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.HttpApi/EasyAbp.EShop.Baskets.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Application.Contracts\EasyAbp.EShop.Baskets.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.MongoDB/EasyAbp.EShop.Baskets.MongoDB.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="2.9.0" /> <PackageReference Include="Volo.Abp.MongoDB" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Web/EasyAbp.EShop.Baskets.Web.csproj

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Baskets.HttpApi.Client.ConsoleTestApp.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Baskets.HttpApi.Client\EasyAbp.EShop.Baskets.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Baskets.HttpApi.Client\EasyAbp.EShop.Baskets.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/EasyAbp.EShop.Baskets.TestBase.csproj

@ -14,9 +14,9 @@
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Baskets.Domain\EasyAbp.EShop.Baskets.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Baskets/test/EasyAbp.EShop.Baskets.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Baskets.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
public override ClaimsPrincipal GetClaimsPrincipal() protected override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

4
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp.EShop.Orders.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Domain.Shared\EasyAbp.EShop.Orders.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Domain.Shared\EasyAbp.EShop.Orders.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

1
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/IOrderAppService.cs

@ -11,7 +11,6 @@ namespace EasyAbp.EShop.Orders.Orders
OrderDto, OrderDto,
Guid, Guid,
GetOrderListDto, GetOrderListDto,
CreateOrderDto,
CreateOrderDto> CreateOrderDto>
{ {
Task<OrderDto> GetByOrderNumberAsync(string orderNumber); Task<OrderDto> GetByOrderNumberAsync(string orderNumber);

4
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp.EShop.Orders.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="3.0.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Products\src\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Products\src\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" />

8
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs

@ -15,7 +15,7 @@ using Volo.Abp.Users;
namespace EasyAbp.EShop.Orders.Orders namespace EasyAbp.EShop.Orders.Orders
{ {
[Authorize] [Authorize]
public class OrderAppService : CrudAppService<Order, OrderDto, Guid, GetOrderListDto, CreateOrderDto, CreateOrderDto>, public class OrderAppService : CrudAppService<Order, OrderDto, Guid, GetOrderListDto, CreateOrderDto>,
IOrderAppService IOrderAppService
{ {
protected override string CreatePolicyName { get; set; } = OrdersPermissions.Orders.Create; protected override string CreatePolicyName { get; set; } = OrdersPermissions.Orders.Create;
@ -127,12 +127,6 @@ namespace EasyAbp.EShop.Orders.Orders
return dict; return dict;
} }
[RemoteService(false)]
public override Task<OrderDto> UpdateAsync(Guid id, CreateOrderDto input)
{
throw new NotSupportedException();
}
[RemoteService(false)] [RemoteService(false)]
public override Task DeleteAsync(Guid id) public override Task DeleteAsync(Guid id)
{ {

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp.EShop.Orders.Domain.Shared.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Validation" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj

@ -8,9 +8,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.4" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.0.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Products\src\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Products\src\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />

5
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/EShopOrdersDomainModule.cs

@ -2,6 +2,7 @@
using EasyAbp.EShop.Stores; using EasyAbp.EShop.Stores;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AutoMapper; using Volo.Abp.AutoMapper;
using Volo.Abp.Domain.Entities.Events.Distributed;
using Volo.Abp.EventBus.Distributed; using Volo.Abp.EventBus.Distributed;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
@ -23,9 +24,11 @@ namespace EasyAbp.EShop.Orders
options.AddProfile<OrdersDomainAutoMapperProfile>(validate: true); options.AddProfile<OrdersDomainAutoMapperProfile>(validate: true);
}); });
Configure<AbpDistributedEventBusOptions>(options => Configure<AbpDistributedEntityEventOptions>(options =>
{ {
options.EtoMappings.Add<Order, OrderEto>(typeof(EShopOrdersDomainModule)); options.EtoMappings.Add<Order, OrderEto>(typeof(EShopOrdersDomainModule));
options.AutoEventSelectors.Add<Order>();
}); });
} }
} }

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp.EShop.Orders.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi.Client/EasyAbp.EShop.Orders.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp.EShop.Orders.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.MongoDB/EasyAbp.EShop.Orders.MongoDB.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="2.9.0" /> <PackageReference Include="Volo.Abp.MongoDB" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/EasyAbp.EShop.Orders.Web.csproj

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Orders.HttpApi.Client.ConsoleTestApp.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Orders.HttpApi.Client\EasyAbp.EShop.Orders.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Orders.HttpApi.Client\EasyAbp.EShop.Orders.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj

@ -14,9 +14,9 @@
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Orders.Domain\EasyAbp.EShop.Orders.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Orders.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
public override ClaimsPrincipal GetClaimsPrincipal() protected override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

4
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/IPaymentAppService.cs

@ -7,12 +7,10 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Payments.Payments namespace EasyAbp.EShop.Payments.Payments
{ {
public interface IPaymentAppService : public interface IPaymentAppService :
ICrudAppService< IReadOnlyAppService<
PaymentDto, PaymentDto,
Guid, Guid,
GetPaymentListDto, GetPaymentListDto>
object,
object>
{ {
Task CreateAsync(CreatePaymentDto input); Task CreateAsync(CreatePaymentDto input);
} }

6
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/IRefundAppService.cs

@ -6,12 +6,10 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Payments.Refunds namespace EasyAbp.EShop.Payments.Refunds
{ {
public interface IRefundAppService : public interface IRefundAppService :
ICrudAppService< IReadOnlyAppService<
RefundDto, RefundDto,
Guid, Guid,
GetRefundListDto, GetRefundListDto>
object,
object>
{ {
} }

4
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp.EShop.Payments.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="3.0.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application.Contracts\EasyAbp.EShop.Orders.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" />

20
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs

@ -18,7 +18,7 @@ using Volo.Abp.Users;
namespace EasyAbp.EShop.Payments.Payments namespace EasyAbp.EShop.Payments.Payments
{ {
[Authorize] [Authorize]
public class PaymentAppService : CrudAppService<Payment, PaymentDto, Guid, GetPaymentListDto, object, object>, public class PaymentAppService : ReadOnlyAppService<Payment, PaymentDto, Guid, GetPaymentListDto>,
IPaymentAppService IPaymentAppService
{ {
protected override string GetPolicyName { get; set; } = PaymentsPermissions.Payments.Default; protected override string GetPolicyName { get; set; } = PaymentsPermissions.Payments.Default;
@ -82,12 +82,6 @@ namespace EasyAbp.EShop.Payments.Payments
return await base.GetListAsync(input); return await base.GetListAsync(input);
} }
[RemoteService(false)]
public override Task<PaymentDto> CreateAsync(object input)
{
throw new NotSupportedException();
}
[Authorize(PaymentsPermissions.Payments.Create)] [Authorize(PaymentsPermissions.Payments.Create)]
public async Task CreateAsync(CreatePaymentDto input) public async Task CreateAsync(CreatePaymentDto input)
@ -136,17 +130,5 @@ namespace EasyAbp.EShop.Payments.Payments
}).ToList() }).ToList()
}); });
} }
[RemoteService(false)]
public override Task<PaymentDto> UpdateAsync(Guid id, object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task DeleteAsync(Guid id)
{
throw new NotSupportedException();
}
} }
} }

20
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs

@ -13,7 +13,7 @@ using Volo.Abp.Users;
namespace EasyAbp.EShop.Payments.Refunds namespace EasyAbp.EShop.Payments.Refunds
{ {
[Authorize] [Authorize]
public class RefundAppService : CrudAppService<Refund, RefundDto, Guid, GetRefundListDto, object, object>, public class RefundAppService : ReadOnlyAppService<Refund, RefundDto, Guid, GetRefundListDto>,
IRefundAppService IRefundAppService
{ {
protected override string GetPolicyName { get; set; } = PaymentsPermissions.Refunds.Default; protected override string GetPolicyName { get; set; } = PaymentsPermissions.Refunds.Default;
@ -76,23 +76,5 @@ namespace EasyAbp.EShop.Payments.Refunds
return await base.GetListAsync(input); return await base.GetListAsync(input);
} }
[RemoteService(false)]
public override Task<RefundDto> CreateAsync(object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task<RefundDto> UpdateAsync(Guid id, object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task DeleteAsync(Guid id)
{
throw new NotSupportedException();
}
} }
} }

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Validation" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj

@ -8,9 +8,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.4" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.0.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp.EShop.Payments.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp.EShop.Payments.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp.EShop.Payments.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Application.Contracts\EasyAbp.EShop.Payments.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp.EShop.Payments.MongoDB.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="2.9.0" /> <PackageReference Include="Volo.Abp.MongoDB" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EasyAbp.EShop.Payments.Web.csproj

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Payments.HttpApi.Client.ConsoleTestApp.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Payments.HttpApi.Client\EasyAbp.EShop.Payments.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Payments.HttpApi.Client\EasyAbp.EShop.Payments.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj

@ -14,9 +14,9 @@
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Payments.Domain\EasyAbp.EShop.Payments.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Payments.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
public override ClaimsPrincipal GetClaimsPrincipal() protected override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj

@ -8,9 +8,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.Abp.Trees.Application.Contracts" Version="0.290.2" /> <PackageReference Include="EasyAbp.Abp.Trees.Application.Contracts" Version="0.290.4" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/IProductCategoryAppService.cs

@ -6,12 +6,10 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Products.ProductCategories namespace EasyAbp.EShop.Products.ProductCategories
{ {
public interface IProductCategoryAppService : public interface IProductCategoryAppService :
ICrudAppService< IReadOnlyAppService<
ProductCategoryDto, ProductCategoryDto,
Guid, Guid,
GetProductCategoryListDto, GetProductCategoryListDto>
object,
object>
{ {
} }

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductDetailHistories/IProductDetailHistoryAppService.cs

@ -7,12 +7,10 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Products.ProductDetailHistories namespace EasyAbp.EShop.Products.ProductDetailHistories
{ {
public interface IProductDetailHistoryAppService : public interface IProductDetailHistoryAppService :
ICrudAppService< IReadOnlyAppService<
ProductDetailHistoryDto, ProductDetailHistoryDto,
Guid, Guid,
GetProductDetailHistoryListDto, GetProductDetailHistoryListDto>
object,
object>
{ {
Task<ProductDetailHistoryDto> GetByTimeAsync(Guid productId, DateTime modificationTime); Task<ProductDetailHistoryDto> GetByTimeAsync(Guid productId, DateTime modificationTime);
} }

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductHistories/IProductDetailHistoryAppService.cs

@ -6,12 +6,10 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Products.ProductHistories namespace EasyAbp.EShop.Products.ProductHistories
{ {
public interface IProductHistoryAppService : public interface IProductHistoryAppService :
ICrudAppService< IReadOnlyAppService<
ProductHistoryDto, ProductHistoryDto,
Guid, Guid,
GetProductHistoryListDto, GetProductHistoryListDto>
object,
object>
{ {
Task<ProductHistoryDto> GetByTimeAsync(Guid productId, DateTime modificationTime); Task<ProductHistoryDto> GetByTimeAsync(Guid productId, DateTime modificationTime);
} }

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj

@ -8,9 +8,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.Abp.Trees.Application" Version="0.290.2" /> <PackageReference Include="EasyAbp.Abp.Trees.Application" Version="0.290.4" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" />
</ItemGroup> </ItemGroup>

20
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs

@ -9,7 +9,7 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Products.ProductCategories namespace EasyAbp.EShop.Products.ProductCategories
{ {
public class ProductCategoryAppService : CrudAppService<ProductCategory, ProductCategoryDto, Guid, GetProductCategoryListDto, object, object>, public class ProductCategoryAppService : ReadOnlyAppService<ProductCategory, ProductCategoryDto, Guid, GetProductCategoryListDto>,
IProductCategoryAppService IProductCategoryAppService
{ {
protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default; protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
@ -43,23 +43,5 @@ namespace EasyAbp.EShop.Products.ProductCategories
{ {
throw new NotSupportedException(); throw new NotSupportedException();
} }
[RemoteService(false)]
public override Task<ProductCategoryDto> CreateAsync(object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task<ProductCategoryDto> UpdateAsync(Guid id, object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task DeleteAsync(Guid id)
{
throw new NotSupportedException();
}
} }
} }

20
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs

@ -8,7 +8,7 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Products.ProductDetailHistories namespace EasyAbp.EShop.Products.ProductDetailHistories
{ {
public class ProductDetailHistoryAppService : CrudAppService<ProductDetailHistory, ProductDetailHistoryDto, Guid, GetProductDetailHistoryListDto, object, object>, public class ProductDetailHistoryAppService : ReadOnlyAppService<ProductDetailHistory, ProductDetailHistoryDto, Guid, GetProductDetailHistoryListDto>,
IProductDetailHistoryAppService IProductDetailHistoryAppService
{ {
protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default; protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
@ -31,23 +31,5 @@ namespace EasyAbp.EShop.Products.ProductDetailHistories
return MapToGetOutputDto(await _repository.GetAsync(productId, modificationTime)); return MapToGetOutputDto(await _repository.GetAsync(productId, modificationTime));
} }
[RemoteService(false)]
public override Task<ProductDetailHistoryDto> CreateAsync(object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task<ProductDetailHistoryDto> UpdateAsync(Guid id, object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task DeleteAsync(Guid id)
{
throw new NotSupportedException();
}
} }
} }

20
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs

@ -8,7 +8,7 @@ using Volo.Abp.Application.Services;
namespace EasyAbp.EShop.Products.ProductHistories namespace EasyAbp.EShop.Products.ProductHistories
{ {
public class ProductHistoryAppService : CrudAppService<ProductHistory, ProductHistoryDto, Guid, GetProductHistoryListDto, object, object>, public class ProductHistoryAppService : ReadOnlyAppService<ProductHistory, ProductHistoryDto, Guid, GetProductHistoryListDto>,
IProductHistoryAppService IProductHistoryAppService
{ {
protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default; protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
@ -31,23 +31,5 @@ namespace EasyAbp.EShop.Products.ProductHistories
return MapToGetOutputDto(await _repository.GetAsync(productId, modificationTime)); return MapToGetOutputDto(await _repository.GetAsync(productId, modificationTime));
} }
[RemoteService(false)]
public override Task<ProductHistoryDto> CreateAsync(object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task<ProductHistoryDto> UpdateAsync(Guid id, object input)
{
throw new NotSupportedException();
}
[RemoteService(false)]
public override Task DeleteAsync(Guid id)
{
throw new NotSupportedException();
}
} }
} }

8
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using EasyAbp.EShop.Products.Authorization; using EasyAbp.EShop.Products.Authorization;
using EasyAbp.EShop.Products.ProductCategories;
using EasyAbp.EShop.Products.Products.Dtos; using EasyAbp.EShop.Products.Products.Dtos;
using EasyAbp.EShop.Products.ProductStores; using EasyAbp.EShop.Products.ProductStores;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -28,7 +27,6 @@ namespace EasyAbp.EShop.Products.Products
private readonly IProductInventoryProvider _productInventoryProvider; private readonly IProductInventoryProvider _productInventoryProvider;
private readonly IAttributeOptionIdsSerializer _attributeOptionIdsSerializer; private readonly IAttributeOptionIdsSerializer _attributeOptionIdsSerializer;
private readonly IProductStoreRepository _productStoreRepository; private readonly IProductStoreRepository _productStoreRepository;
private readonly IProductCategoryRepository _productCategoryRepository;
private readonly IProductRepository _repository; private readonly IProductRepository _repository;
public ProductAppService( public ProductAppService(
@ -37,7 +35,6 @@ namespace EasyAbp.EShop.Products.Products
IProductInventoryProvider productInventoryProvider, IProductInventoryProvider productInventoryProvider,
IAttributeOptionIdsSerializer attributeOptionIdsSerializer, IAttributeOptionIdsSerializer attributeOptionIdsSerializer,
IProductStoreRepository productStoreRepository, IProductStoreRepository productStoreRepository,
IProductCategoryRepository productCategoryRepository,
IProductRepository repository) : base(repository) IProductRepository repository) : base(repository)
{ {
_productManager = productManager; _productManager = productManager;
@ -45,7 +42,6 @@ namespace EasyAbp.EShop.Products.Products
_productInventoryProvider = productInventoryProvider; _productInventoryProvider = productInventoryProvider;
_attributeOptionIdsSerializer = attributeOptionIdsSerializer; _attributeOptionIdsSerializer = attributeOptionIdsSerializer;
_productStoreRepository = productStoreRepository; _productStoreRepository = productStoreRepository;
_productCategoryRepository = productCategoryRepository;
_repository = repository; _repository = repository;
} }
@ -250,12 +246,12 @@ namespace EasyAbp.EShop.Products.Products
query = query.Where(x => x.IsPublished); query = query.Where(x => x.IsPublished);
} }
var totalCount = await AsyncQueryableExecuter.CountAsync(query); var totalCount = await AsyncExecuter.CountAsync(query);
query = ApplySorting(query, input); query = ApplySorting(query, input);
query = ApplyPaging(query, input); query = ApplyPaging(query, input);
var products = await AsyncQueryableExecuter.ToListAsync(query); var products = await AsyncExecuter.ToListAsync(query);
var items = new List<ProductDto>(); var items = new List<ProductDto>();

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.Abp.Trees.Domain.Shared" Version="0.290.2" /> <PackageReference Include="EasyAbp.Abp.Trees.Domain.Shared" Version="0.290.4" />
<PackageReference Include="Volo.Abp.Validation" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Validation" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.Abp.Trees.Domain" Version="0.290.2" /> <PackageReference Include="EasyAbp.Abp.Trees.Domain" Version="0.290.4" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.0.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Domain.Shared\EasyAbp.EShop.Orders.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Domain.Shared\EasyAbp.EShop.Orders.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" />

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.Abp.Trees.EntityFrameworkCore" Version="0.290.2" /> <PackageReference Include="EasyAbp.Abp.Trees.EntityFrameworkCore" Version="0.290.4" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi.Client/EasyAbp.EShop.Products.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.HttpApi/EasyAbp.EShop.Products.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Application.Contracts\EasyAbp.EShop.Products.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.MongoDB/EasyAbp.EShop.Products.MongoDB.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="2.9.0" /> <PackageReference Include="Volo.Abp.MongoDB" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Products.HttpApi.Client.ConsoleTestApp.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Products.HttpApi.Client\EasyAbp.EShop.Products.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Products.HttpApi.Client\EasyAbp.EShop.Products.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj

@ -14,9 +14,9 @@
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Products.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
public override ClaimsPrincipal GetClaimsPrincipal() protected override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

4
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application.Contracts/EasyAbp.EShop.Stores.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp.EShop.Stores.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Application.Contracts\EasyAbp.EShop.Stores.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Application.Contracts\EasyAbp.EShop.Stores.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain.Shared/EasyAbp.EShop.Stores.Domain.Shared.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Validation" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp.EShop.Stores.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp.EShop.Stores.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi.Client/EasyAbp.EShop.Stores.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Application.Contracts\EasyAbp.EShop.Stores.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Application.Contracts\EasyAbp.EShop.Stores.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.HttpApi/EasyAbp.EShop.Stores.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Application.Contracts\EasyAbp.EShop.Stores.Application.Contracts.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Application.Contracts\EasyAbp.EShop.Stores.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.MongoDB/EasyAbp.EShop.Stores.MongoDB.csproj

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.MongoDB" Version="2.9.0" /> <PackageReference Include="Volo.Abp.MongoDB" Version="3.0.0" />
<ProjectReference Include="..\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" /> <ProjectReference Include="..\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" />
</ItemGroup> </ItemGroup>

4
modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Stores.HttpApi.Client.ConsoleTestApp.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Stores.HttpApi.Client\EasyAbp.EShop.Stores.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Stores.HttpApi.Client\EasyAbp.EShop.Stores.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

6
modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj

@ -14,9 +14,9 @@
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TestBase" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="3.0.0" />
<ProjectReference Include="..\..\src\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" /> <ProjectReference Include="..\..\src\EasyAbp.EShop.Stores.Domain\EasyAbp.EShop.Stores.Domain.csproj" />
</ItemGroup> </ItemGroup>

2
modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/Security/FakeCurrentPrincipalAccessor.cs

@ -8,7 +8,7 @@ namespace EasyAbp.EShop.Stores.Security
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
{ {
public override ClaimsPrincipal GetClaimsPrincipal() protected override ClaimsPrincipal GetClaimsPrincipal()
{ {
return GetPrincipal(); return GetPrincipal();
} }

10
samples/EShopSample/angular/package.json

@ -11,11 +11,11 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/ng.account": "~2.9.0", "@abp/ng.account": "~3.0.0",
"@abp/ng.identity": "~2.9.0", "@abp/ng.identity": "~3.0.0",
"@abp/ng.setting-management": "~2.9.0", "@abp/ng.setting-management": "~3.0.0",
"@abp/ng.tenant-management": "~2.9.0", "@abp/ng.tenant-management": "~3.0.0",
"@abp/ng.theme.basic": "~2.9.0", "@abp/ng.theme.basic": "~3.0.0",
"@angular/animations": "~9.1.0", "@angular/animations": "~9.1.0",
"@angular/common": "~9.1.0", "@angular/common": "~9.1.0",
"@angular/compiler": "~9.1.0", "@angular/compiler": "~9.1.0",

16
samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj

@ -13,14 +13,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.4.4" />
<PackageReference Include="Volo.Abp.ObjectExtending" Version="2.9.0" /> <PackageReference Include="Volo.Abp.ObjectExtending" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="3.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

14
samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj

@ -14,13 +14,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Application" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Application" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.4.4" />
<PackageReference Include="Volo.Abp.Account.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Account.Application" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.Application" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj

@ -26,7 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<ProjectReference Include="..\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj" /> <ProjectReference Include="..\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj" />
<ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
</ItemGroup> </ItemGroup>

20
samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj

@ -8,16 +8,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.4.4" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="3.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="2.9.0" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="3.0.0" />
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Domain.Shared\EasyAbp.EShop.Domain.Shared.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Domain.Shared\EasyAbp.EShop.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>

22
samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj

@ -13,18 +13,18 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.4.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.Domain" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.0.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="3.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="2.9.0" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3625
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200702100757_UpgradedAbpTo3_0_0.Designer.cs

File diff suppressed because it is too large

519
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200702100757_UpgradedAbpTo3_0_0.cs

@ -0,0 +1,519 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EShopSample.Migrations
{
public partial class UpgradedAbpTo3_0_0 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServiceWeChatPayRefundRecords",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServiceWeChatPayPaymentRecords",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServiceRefunds",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServicePayments",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerPersistedGrants",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerIdentityResources",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerDeviceFlowCodes",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerClients",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerApiResources",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopStoresStores",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductTypes",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductStores",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProducts",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductHistories",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductDetails",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductDetailHistories",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductCategories",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsCategories",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopPaymentsRefunds",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopPaymentsPayments",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopOrdersOrders",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpUsers",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpTenants",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpRoles",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpOrganizationUnits",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpClaimTypes",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpBackgroundJobs",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpAuditLogs",
maxLength: 40,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(max)",
oldNullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServiceWeChatPayRefundRecords",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServiceWeChatPayPaymentRecords",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServiceRefunds",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "PaymentServicePayments",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerPersistedGrants",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerIdentityResources",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerDeviceFlowCodes",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerClients",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "IdentityServerApiResources",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopStoresStores",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductTypes",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductStores",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProducts",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductHistories",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductDetails",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductDetailHistories",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsProductCategories",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopProductsCategories",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopPaymentsRefunds",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopPaymentsPayments",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "EShopOrdersOrders",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpUsers",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpTenants",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpRoles",
type: "nvarchar(256)",
maxLength: 256,
nullable: false,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpOrganizationUnits",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpClaimTypes",
type: "nvarchar(256)",
maxLength: 256,
nullable: false,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpBackgroundJobs",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AbpAuditLogs",
type: "nvarchar(max)",
nullable: true,
oldClrType: typeof(string),
oldMaxLength: 40,
oldNullable: true);
}
}
}

90
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs

@ -17,7 +17,7 @@ namespace EShopSample.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("ProductVersion", "3.1.4") .HasAnnotation("ProductVersion", "3.1.5")
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
@ -36,7 +36,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -230,7 +231,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -390,7 +392,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -473,7 +476,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -553,7 +557,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -599,7 +604,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnName("ExtraProperties")
@ -632,7 +638,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -685,7 +692,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnName("ExtraProperties")
@ -718,7 +726,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -781,7 +790,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -846,7 +856,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -1109,7 +1120,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -1175,7 +1187,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -1332,7 +1345,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -1425,7 +1439,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<int?>("CouponCount") b.Property<int?>("CouponCount")
.HasColumnType("int"); .HasColumnType("int");
@ -1537,7 +1552,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<string>("CouponIds") b.Property<string>("CouponIds")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
@ -1670,7 +1686,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<string>("CorrelationId") b.Property<string>("CorrelationId")
.HasColumnName("CorrelationId") .HasColumnName("CorrelationId")
@ -1891,7 +1908,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -1978,10 +1996,9 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.IsRequired()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(40)")
.HasMaxLength(256); .HasMaxLength(40);
b.Property<string>("Description") b.Property<string>("Description")
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(256)")
@ -2026,10 +2043,9 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.IsRequired()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(256)") .HasColumnType("nvarchar(40)")
.HasMaxLength(256); .HasMaxLength(40);
b.Property<string>("ExtraProperties") b.Property<string>("ExtraProperties")
.HasColumnName("ExtraProperties") .HasColumnName("ExtraProperties")
@ -2111,7 +2127,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -2384,7 +2401,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -2478,7 +2496,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -2689,7 +2708,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<int?>("ConsentLifetime") b.Property<int?>("ConsentLifetime")
.HasColumnType("int"); .HasColumnType("int");
@ -2962,7 +2982,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -3026,7 +3047,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -3087,7 +3109,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")
@ -3228,7 +3251,8 @@ namespace EShopSample.Migrations
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp") .HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(40)")
.HasMaxLength(40);
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime") .HasColumnName("CreationTime")

22
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj

@ -10,17 +10,17 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" /> <ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
<PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.4.4" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.9.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="3.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

14
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj

@ -13,13 +13,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.4.4" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="3.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

14
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj

@ -13,13 +13,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.4.4" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Account.HttpApi" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.9.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="3.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

20
samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj

@ -45,16 +45,16 @@
<ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" /> <ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" />
<ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" /> <ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" />
<ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
<PackageReference Include="EasyAbp.PaymentService.Web" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.Web" Version="0.4.4" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.4.3" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.4.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.9.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Identity.Web" Version="3.0.0" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="2.9.0" /> <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="3.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="2.9.0" /> <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="3.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="2.9.0" /> <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="3.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save