diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj index 2a73946da..b05d92da6 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20190719143908_Upgraded_To_Abp_4_8_0.Designer.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20190719143908_Upgraded_To_Abp_4_8_0.Designer.cs new file mode 100644 index 000000000..441d97b53 --- /dev/null +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20190719143908_Upgraded_To_Abp_4_8_0.Designer.cs @@ -0,0 +1,1284 @@ +// +using System; +using AbpCompanyName.AbpProjectName.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace AbpCompanyName.AbpProjectName.Migrations +{ + [DbContext(typeof(AbpProjectNameDbContext))] + [Migration("20190719143908_Upgraded_To_Abp_4_8_0")] + partial class Upgraded_To_Abp_4_8_0 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Abp.Application.Editions.Edition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64); + + b.Property("IsDeleted"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(32); + + b.HasKey("Id"); + + b.ToTable("AbpEditions"); + }); + + modelBuilder.Entity("Abp.Application.Features.FeatureSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("Discriminator") + .IsRequired(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("Value") + .IsRequired() + .HasMaxLength(2000); + + b.HasKey("Id"); + + b.ToTable("AbpFeatures"); + + b.HasDiscriminator("Discriminator").HasValue("FeatureSetting"); + }); + + modelBuilder.Entity("Abp.Auditing.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("BrowserInfo") + .HasMaxLength(512); + + b.Property("ClientIpAddress") + .HasMaxLength(64); + + b.Property("ClientName") + .HasMaxLength(128); + + b.Property("CustomData") + .HasMaxLength(2000); + + b.Property("Exception") + .HasMaxLength(2000); + + b.Property("ExecutionDuration"); + + b.Property("ExecutionTime"); + + b.Property("ImpersonatorTenantId"); + + b.Property("ImpersonatorUserId"); + + b.Property("MethodName") + .HasMaxLength(256); + + b.Property("Parameters") + .HasMaxLength(1024); + + b.Property("ReturnValue"); + + b.Property("ServiceName") + .HasMaxLength(256); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionDuration"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Abp.Authorization.PermissionSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("Discriminator") + .IsRequired(); + + b.Property("IsGranted"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "Name"); + + b.ToTable("AbpPermissions"); + + b.HasDiscriminator("Discriminator").HasValue("PermissionSetting"); + }); + + modelBuilder.Entity("Abp.Authorization.Roles.RoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClaimType") + .HasMaxLength(256); + + b.Property("ClaimValue"); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.HasIndex("TenantId", "ClaimType"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserAccount", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("EmailAddress") + .HasMaxLength(256); + + b.Property("IsDeleted"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.Property("UserLinkId"); + + b.Property("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("EmailAddress"); + + b.HasIndex("UserName"); + + b.HasIndex("TenantId", "EmailAddress"); + + b.HasIndex("TenantId", "UserId"); + + b.HasIndex("TenantId", "UserName"); + + b.ToTable("AbpUserAccounts"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClaimType") + .HasMaxLength(256); + + b.Property("ClaimValue"); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("TenantId", "ClaimType"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserLogin", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("LoginProvider") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(256); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("TenantId", "UserId"); + + b.HasIndex("TenantId", "LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserLoginAttempt", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("BrowserInfo") + .HasMaxLength(512); + + b.Property("ClientIpAddress") + .HasMaxLength(64); + + b.Property("ClientName") + .HasMaxLength(128); + + b.Property("CreationTime"); + + b.Property("Result"); + + b.Property("TenancyName") + .HasMaxLength(64); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.Property("UserNameOrEmailAddress") + .HasMaxLength(255); + + b.HasKey("Id"); + + b.HasIndex("UserId", "TenantId"); + + b.HasIndex("TenancyName", "UserNameOrEmailAddress", "Result"); + + b.ToTable("AbpUserLoginAttempts"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserOrganizationUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("IsDeleted"); + + b.Property("OrganizationUnitId"); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "OrganizationUnitId"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpUserOrganizationUnits"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("TenantId", "RoleId"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ExpireDate"); + + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.Property("Value") + .HasMaxLength(512); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Abp.BackgroundJobs.BackgroundJobInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("IsAbandoned"); + + b.Property("JobArgs") + .IsRequired() + .HasMaxLength(1048576); + + b.Property("JobType") + .IsRequired() + .HasMaxLength(512); + + b.Property("LastTryTime"); + + b.Property("NextTryTime"); + + b.Property("Priority"); + + b.Property("TryCount"); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs"); + }); + + modelBuilder.Entity("Abp.Configuration.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.Property("Value") + .HasMaxLength(2000); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.HasIndex("TenantId", "Name", "UserId") + .IsUnique(); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Abp.EntityHistory.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ChangeTime"); + + b.Property("ChangeType"); + + b.Property("EntityChangeSetId"); + + b.Property("EntityId") + .HasMaxLength(48); + + b.Property("EntityTypeFullName") + .HasMaxLength(192); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeSetId"); + + b.HasIndex("EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Abp.EntityHistory.EntityChangeSet", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("BrowserInfo") + .HasMaxLength(512); + + b.Property("ClientIpAddress") + .HasMaxLength(64); + + b.Property("ClientName") + .HasMaxLength(128); + + b.Property("CreationTime"); + + b.Property("ExtensionData"); + + b.Property("ImpersonatorTenantId"); + + b.Property("ImpersonatorUserId"); + + b.Property("Reason") + .HasMaxLength(256); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "CreationTime"); + + b.HasIndex("TenantId", "Reason"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpEntityChangeSets"); + }); + + modelBuilder.Entity("Abp.EntityHistory.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("EntityChangeId"); + + b.Property("NewValue") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasMaxLength(512); + + b.Property("PropertyName") + .HasMaxLength(96); + + b.Property("PropertyTypeFullName") + .HasMaxLength(192); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Abp.Localization.ApplicationLanguage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64); + + b.Property("Icon") + .HasMaxLength(128); + + b.Property("IsDeleted"); + + b.Property("IsDisabled"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "Name"); + + b.ToTable("AbpLanguages"); + }); + + modelBuilder.Entity("Abp.Localization.ApplicationLanguageText", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("Key") + .IsRequired() + .HasMaxLength(256); + + b.Property("LanguageName") + .IsRequired() + .HasMaxLength(128); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("Source") + .IsRequired() + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("Value") + .IsRequired() + .HasMaxLength(67108864); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "Source", "LanguageName", "Key"); + + b.ToTable("AbpLanguageTexts"); + }); + + modelBuilder.Entity("Abp.Notifications.NotificationInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("Data") + .HasMaxLength(1048576); + + b.Property("DataTypeName") + .HasMaxLength(512); + + b.Property("EntityId") + .HasMaxLength(96); + + b.Property("EntityTypeAssemblyQualifiedName") + .HasMaxLength(512); + + b.Property("EntityTypeName") + .HasMaxLength(250); + + b.Property("ExcludedUserIds") + .HasMaxLength(131072); + + b.Property("NotificationName") + .IsRequired() + .HasMaxLength(96); + + b.Property("Severity"); + + b.Property("TenantIds") + .HasMaxLength(131072); + + b.Property("UserIds") + .HasMaxLength(131072); + + b.HasKey("Id"); + + b.ToTable("AbpNotifications"); + }); + + modelBuilder.Entity("Abp.Notifications.NotificationSubscriptionInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("EntityId") + .HasMaxLength(96); + + b.Property("EntityTypeAssemblyQualifiedName") + .HasMaxLength(512); + + b.Property("EntityTypeName") + .HasMaxLength(250); + + b.Property("NotificationName") + .HasMaxLength(96); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NotificationName", "EntityTypeName", "EntityId", "UserId"); + + b.HasIndex("TenantId", "NotificationName", "EntityTypeName", "EntityId", "UserId"); + + b.ToTable("AbpNotificationSubscriptions"); + }); + + modelBuilder.Entity("Abp.Notifications.TenantNotificationInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("Data") + .HasMaxLength(1048576); + + b.Property("DataTypeName") + .HasMaxLength(512); + + b.Property("EntityId") + .HasMaxLength(96); + + b.Property("EntityTypeAssemblyQualifiedName") + .HasMaxLength(512); + + b.Property("EntityTypeName") + .HasMaxLength(250); + + b.Property("NotificationName") + .IsRequired() + .HasMaxLength(96); + + b.Property("Severity"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId"); + + b.ToTable("AbpTenantNotifications"); + }); + + modelBuilder.Entity("Abp.Notifications.UserNotificationInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CreationTime"); + + b.Property("State"); + + b.Property("TenantId"); + + b.Property("TenantNotificationId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId", "State", "CreationTime"); + + b.ToTable("AbpUserNotifications"); + }); + + modelBuilder.Entity("Abp.Organizations.OrganizationUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Code") + .IsRequired() + .HasMaxLength(95); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(128); + + b.Property("IsDeleted"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("ParentId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("ParentId"); + + b.HasIndex("TenantId", "Code"); + + b.ToTable("AbpOrganizationUnits"); + }); + + modelBuilder.Entity("Abp.Organizations.OrganizationUnitRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("IsDeleted"); + + b.Property("OrganizationUnitId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "OrganizationUnitId"); + + b.HasIndex("TenantId", "RoleId"); + + b.ToTable("AbpOrganizationUnitRoles"); + }); + + modelBuilder.Entity("AbpCompanyName.AbpProjectName.Authorization.Roles.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasMaxLength(128); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("Description") + .HasMaxLength(5000); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64); + + b.Property("IsDefault"); + + b.Property("IsDeleted"); + + b.Property("IsStatic"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(32); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(32); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("CreatorUserId"); + + b.HasIndex("DeleterUserId"); + + b.HasIndex("LastModifierUserId"); + + b.HasIndex("TenantId", "NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("AbpCompanyName.AbpProjectName.Authorization.Users.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("AccessFailedCount"); + + b.Property("AuthenticationSource") + .HasMaxLength(64); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasMaxLength(128); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("EmailAddress") + .IsRequired() + .HasMaxLength(256); + + b.Property("EmailConfirmationCode") + .HasMaxLength(328); + + b.Property("IsActive"); + + b.Property("IsDeleted"); + + b.Property("IsEmailConfirmed"); + + b.Property("IsLockoutEnabled"); + + b.Property("IsPhoneNumberConfirmed"); + + b.Property("IsTwoFactorEnabled"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("LockoutEndDateUtc"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64); + + b.Property("NormalizedEmailAddress") + .IsRequired() + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasMaxLength(256); + + b.Property("Password") + .IsRequired() + .HasMaxLength(128); + + b.Property("PasswordResetCode") + .HasMaxLength(328); + + b.Property("PhoneNumber") + .HasMaxLength(32); + + b.Property("SecurityStamp") + .HasMaxLength(128); + + b.Property("Surname") + .IsRequired() + .HasMaxLength(64); + + b.Property("TenantId"); + + b.Property("UserName") + .IsRequired() + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("CreatorUserId"); + + b.HasIndex("DeleterUserId"); + + b.HasIndex("LastModifierUserId"); + + b.HasIndex("TenantId", "NormalizedEmailAddress"); + + b.HasIndex("TenantId", "NormalizedUserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("AbpCompanyName.AbpProjectName.MultiTenancy.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ConnectionString") + .HasMaxLength(1024); + + b.Property("CreationTime"); + + b.Property("CreatorUserId"); + + b.Property("DeleterUserId"); + + b.Property("DeletionTime"); + + b.Property("EditionId"); + + b.Property("IsActive"); + + b.Property("IsDeleted"); + + b.Property("LastModificationTime"); + + b.Property("LastModifierUserId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("TenancyName") + .IsRequired() + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("CreatorUserId"); + + b.HasIndex("DeleterUserId"); + + b.HasIndex("EditionId"); + + b.HasIndex("LastModifierUserId"); + + b.HasIndex("TenancyName"); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Abp.Application.Features.EditionFeatureSetting", b => + { + b.HasBaseType("Abp.Application.Features.FeatureSetting"); + + b.Property("EditionId"); + + b.HasIndex("EditionId", "Name"); + + b.ToTable("AbpFeatures"); + + b.HasDiscriminator().HasValue("EditionFeatureSetting"); + }); + + modelBuilder.Entity("Abp.MultiTenancy.TenantFeatureSetting", b => + { + b.HasBaseType("Abp.Application.Features.FeatureSetting"); + + b.HasIndex("TenantId", "Name"); + + b.ToTable("AbpFeatures"); + + b.HasDiscriminator().HasValue("TenantFeatureSetting"); + }); + + modelBuilder.Entity("Abp.Authorization.Roles.RolePermissionSetting", b => + { + b.HasBaseType("Abp.Authorization.PermissionSetting"); + + b.Property("RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpPermissions"); + + b.HasDiscriminator().HasValue("RolePermissionSetting"); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserPermissionSetting", b => + { + b.HasBaseType("Abp.Authorization.PermissionSetting"); + + b.Property("UserId"); + + b.HasIndex("UserId"); + + b.ToTable("AbpPermissions"); + + b.HasDiscriminator().HasValue("UserPermissionSetting"); + }); + + modelBuilder.Entity("Abp.Authorization.Roles.RoleClaim", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Roles.Role") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserClaim", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserLogin", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserRole", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserToken", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User") + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Configuration.Setting", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User") + .WithMany("Settings") + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Abp.EntityHistory.EntityChange", b => + { + b.HasOne("Abp.EntityHistory.EntityChangeSet") + .WithMany("EntityChanges") + .HasForeignKey("EntityChangeSetId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.EntityHistory.EntityPropertyChange", b => + { + b.HasOne("Abp.EntityHistory.EntityChange") + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Organizations.OrganizationUnit", b => + { + b.HasOne("Abp.Organizations.OrganizationUnit", "Parent") + .WithMany("Children") + .HasForeignKey("ParentId"); + }); + + modelBuilder.Entity("AbpCompanyName.AbpProjectName.Authorization.Roles.Role", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "CreatorUser") + .WithMany() + .HasForeignKey("CreatorUserId"); + + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "DeleterUser") + .WithMany() + .HasForeignKey("DeleterUserId"); + + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "LastModifierUser") + .WithMany() + .HasForeignKey("LastModifierUserId"); + }); + + modelBuilder.Entity("AbpCompanyName.AbpProjectName.Authorization.Users.User", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "CreatorUser") + .WithMany() + .HasForeignKey("CreatorUserId"); + + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "DeleterUser") + .WithMany() + .HasForeignKey("DeleterUserId"); + + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "LastModifierUser") + .WithMany() + .HasForeignKey("LastModifierUserId"); + }); + + modelBuilder.Entity("AbpCompanyName.AbpProjectName.MultiTenancy.Tenant", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "CreatorUser") + .WithMany() + .HasForeignKey("CreatorUserId"); + + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "DeleterUser") + .WithMany() + .HasForeignKey("DeleterUserId"); + + b.HasOne("Abp.Application.Editions.Edition", "Edition") + .WithMany() + .HasForeignKey("EditionId"); + + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User", "LastModifierUser") + .WithMany() + .HasForeignKey("LastModifierUserId"); + }); + + modelBuilder.Entity("Abp.Application.Features.EditionFeatureSetting", b => + { + b.HasOne("Abp.Application.Editions.Edition", "Edition") + .WithMany() + .HasForeignKey("EditionId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Authorization.Roles.RolePermissionSetting", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Roles.Role") + .WithMany("Permissions") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Abp.Authorization.Users.UserPermissionSetting", b => + { + b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Users.User") + .WithMany("Permissions") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20190719143908_Upgraded_To_Abp_4_8_0.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20190719143908_Upgraded_To_Abp_4_8_0.cs new file mode 100644 index 000000000..459c780a0 --- /dev/null +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20190719143908_Upgraded_To_Abp_4_8_0.cs @@ -0,0 +1,45 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace AbpCompanyName.AbpProjectName.Migrations +{ + public partial class Upgraded_To_Abp_4_8_0 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "LanguageName", + table: "AbpLanguageTexts", + maxLength: 128, + nullable: false, + oldClrType: typeof(string), + oldMaxLength: 10); + + migrationBuilder.AlterColumn( + name: "Name", + table: "AbpLanguages", + maxLength: 128, + nullable: false, + oldClrType: typeof(string), + oldMaxLength: 10); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "LanguageName", + table: "AbpLanguageTexts", + maxLength: 10, + nullable: false, + oldClrType: typeof(string), + oldMaxLength: 128); + + migrationBuilder.AlterColumn( + name: "Name", + table: "AbpLanguages", + maxLength: 10, + nullable: false, + oldClrType: typeof(string), + oldMaxLength: 128); + } + } +} diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs index e664165dc..4a6fb1831 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs @@ -621,7 +621,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Name") .IsRequired() - .HasMaxLength(10); + .HasMaxLength(128); b.Property("TenantId"); @@ -648,7 +648,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("LanguageName") .IsRequired() - .HasMaxLength(10); + .HasMaxLength(128); b.Property("LastModificationTime"); diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj index 19d548ba5..3064e2ebe 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj index 88300a96d..43335bcd5 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj @@ -26,10 +26,10 @@ - - + + - + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj index defe2bd72..c94ee1706 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj @@ -45,7 +45,7 @@ - + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj index a29254896..41fe9d1ac 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj @@ -47,9 +47,9 @@ - - - + + + diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj index b735ee996..b99418487 100644 --- a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj +++ b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj @@ -27,7 +27,7 @@ all runtime; build; native; contentfiles; analyzers - +