Merge branch 'master' into develop

EasyAbp · Jul 7, 2020 · 7bc98d1 · 7bc98d1
2 parents 75f5dfb + 70ca04e
commit 7bc98d1
Show file tree

Hide file tree

Showing 27 changed files with 202 additions and 199 deletions.
diff --git a/angular/package.json b/angular/package.json
@@ -12,11 +12,11 @@
  },
  "private": true,
  "dependencies": {
- "@abp/ng.account": "~~3.0.0",
- "@abp/ng.theme.basic": "~~3.0.0",
- "@abp/ng.identity": "~~3.0.0",
- "@abp/ng.tenant-management": "~~3.0.0",
- "@abp/ng.setting-management": "~~3.0.0",
+ "@abp/ng.account": "~3.0.1",
+ "@abp/ng.theme.basic": "~3.0.1",
+ "@abp/ng.identity": "~3.0.1",
+ "@abp/ng.tenant-management": "~3.0.1",
+ "@abp/ng.setting-management": "~3.0.1",
  "@angular/animations": "~8.2.14",
  "@angular/common": "~8.2.14",
  "@angular/compiler": "~8.2.14",

diff --git a/common.props b/common.props
@@ -18,8 +18,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" />
- <PackageReference Include="Fody" Version="6.0.6">
+ <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
+ <PackageReference Include="Fody" Version="6.2.0">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
  </PackageReference>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj b/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj
@@ -12,12 +12,12 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Volo.Abp.ObjectExtending" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.ObjectExtending" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj b/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj
@@ -14,12 +14,12 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Volo.Abp.Account.Application" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Emailing" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Identity.Application" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.Account.Application" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Emailing" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Identity.Application" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj
@@ -26,7 +26,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.Autofac" Version="3.0.1" />
  <ProjectReference Include="..\MyAbpApp.Application.Contracts\MyAbpApp.Application.Contracts.csproj" />
  <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore.DbMigrations\MyAbpApp.EntityFrameworkCore.DbMigrations.csproj" />
  </ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj
@@ -9,14 +9,14 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="3.0.1" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj
@@ -13,15 +13,15 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
- <PackageReference Include="Volo.Abp.Identity.Domain" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.Identity.Domain" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj b/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj
@@ -9,15 +9,15 @@
 
  <ItemGroup>
  <ProjectReference Include="..\MyAbpApp.Domain\MyAbpApp.Domain.csproj" />
- <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi.Client/MyAbpApp.HttpApi.Client.csproj b/sample/MyAbpApp/src/MyAbpApp.HttpApi.Client/MyAbpApp.HttpApi.Client.csproj
@@ -12,11 +12,11 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpApp.HttpApi.csproj b/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpApp.HttpApi.csproj
@@ -13,11 +13,11 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Volo.Abp.Account.HttpApi" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.Account.HttpApi" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
@@ -45,14 +45,14 @@
  <ProjectReference Include="..\MyAbpApp.Application\MyAbpApp.Application.csproj" />
  <ProjectReference Include="..\MyAbpApp.HttpApi\MyAbpApp.HttpApi.csproj" />
  <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore.DbMigrations\MyAbpApp.EntityFrameworkCore.DbMigrations.csproj" />
- <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Autofac" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Identity.Web" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="3.0.0" />
- <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="3.0.0" />
+ <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Autofac" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Identity.Web" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="3.0.1" />
+ <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="3.0.1" />
  </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/package.json b/sample/MyAbpApp/src/MyAbpApp.Web/package.json
@@ -3,6 +3,6 @@
  "name": "my-app",
  "private": true,
  "dependencies": {
- "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.0"
+ "@abp/aspnetcore.mvc.ui.theme.basic": "~3.0.1"
  }
 }