Enis Necipoglu
5 years ago
committed by
GitHub
GitHub
84 changed files with 21411 additions and 7054 deletions
File diff suppressed because it is too large
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
File diff suppressed because it is too large
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
File diff suppressed because it is too large
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,6 +1,6 @@ |
|||||
{ |
{ |
||||
"sdk": { |
"sdk": { |
||||
"version": "5.0.201", |
"version": "6.0.100-rc.1.21458.32", |
||||
"rollForward": "latestFeature" |
"rollForward": "latestFeature" |
||||
} |
} |
||||
} |
} |
||||
|
|||||
@ -1,24 +1,24 @@ |
|||||
<Project Sdk="Microsoft.NET.Sdk"> |
<Project Sdk="Microsoft.NET.Sdk"> |
||||
|
|
||||
<PropertyGroup> |
<PropertyGroup> |
||||
<TargetFramework>net5.0</TargetFramework> |
<TargetFramework>net6.0</TargetFramework> |
||||
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> |
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> |
||||
</PropertyGroup> |
</PropertyGroup> |
||||
|
|
||||
<ItemGroup> |
<ItemGroup> |
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*"> |
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.1.21452.10"> |
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> |
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> |
||||
</PackageReference> |
</PackageReference> |
||||
</ItemGroup> |
</ItemGroup> |
||||
|
|
||||
<ItemGroup> |
<ItemGroup> |
||||
<ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" /> |
<ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" /> |
||||
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-beta.1" /> |
||||
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.0.0-beta.1" /> |
||||
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.0.0-beta.1" /> |
||||
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.0-beta.1" /> |
||||
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="5.0.0-beta.1" /> |
||||
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.0.0-beta.1" /> |
||||
</ItemGroup> |
</ItemGroup> |
||||
|
|
||||
</Project> |
</Project> |
||||
|
|||||
File diff suppressed because it is too large
File diff suppressed because it is too large
@ -1,118 +1,121 @@ |
|||||
// <auto-generated />
|
// <auto-generated />
|
||||
using System; |
using System; |
||||
using EShopOnAbp.SaasService.EntityFrameworkCore; |
using EShopOnAbp.SaasService.EntityFrameworkCore; |
||||
using Microsoft.EntityFrameworkCore; |
using Microsoft.EntityFrameworkCore; |
||||
using Microsoft.EntityFrameworkCore.Infrastructure; |
using Microsoft.EntityFrameworkCore.Infrastructure; |
||||
using Microsoft.EntityFrameworkCore.Metadata; |
using Microsoft.EntityFrameworkCore.Metadata; |
||||
using Microsoft.EntityFrameworkCore.Migrations; |
using Microsoft.EntityFrameworkCore.Migrations; |
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; |
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; |
||||
using Volo.Abp.EntityFrameworkCore; |
using Volo.Abp.EntityFrameworkCore; |
||||
|
|
||||
namespace EShopOnAbp.SaasService.Migrations |
#nullable disable |
||||
{ |
|
||||
[DbContext(typeof(SaasServiceDbContext))] |
namespace EShopOnAbp.SaasService.Migrations |
||||
[Migration("20210628143749_Initial")] |
{ |
||||
partial class Initial |
[DbContext(typeof(SaasServiceDbContext))] |
||||
{ |
[Migration("20211006102216_Initial")] |
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder) |
partial class Initial |
||||
{ |
{ |
||||
#pragma warning disable 612, 618
|
protected override void BuildTargetModel(ModelBuilder modelBuilder) |
||||
modelBuilder |
{ |
||||
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) |
#pragma warning disable 612, 618
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 128) |
modelBuilder |
||||
.HasAnnotation("ProductVersion", "5.0.7") |
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) |
||||
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); |
.HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10") |
||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 128); |
||||
modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => |
|
||||
{ |
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); |
||||
b.Property<Guid>("Id") |
|
||||
.HasColumnType("uniqueidentifier"); |
modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => |
||||
|
{ |
||||
b.Property<string>("ConcurrencyStamp") |
b.Property<Guid>("Id") |
||||
.IsConcurrencyToken() |
.HasColumnType("uniqueidentifier"); |
||||
.HasMaxLength(40) |
|
||||
.HasColumnType("nvarchar(40)") |
b.Property<string>("ConcurrencyStamp") |
||||
.HasColumnName("ConcurrencyStamp"); |
.IsConcurrencyToken() |
||||
|
.HasMaxLength(40) |
||||
b.Property<DateTime>("CreationTime") |
.HasColumnType("nvarchar(40)") |
||||
.HasColumnType("datetime2") |
.HasColumnName("ConcurrencyStamp"); |
||||
.HasColumnName("CreationTime"); |
|
||||
|
b.Property<DateTime>("CreationTime") |
||||
b.Property<Guid?>("CreatorId") |
.HasColumnType("datetime2") |
||||
.HasColumnType("uniqueidentifier") |
.HasColumnName("CreationTime"); |
||||
.HasColumnName("CreatorId"); |
|
||||
|
b.Property<Guid?>("CreatorId") |
||||
b.Property<Guid?>("DeleterId") |
.HasColumnType("uniqueidentifier") |
||||
.HasColumnType("uniqueidentifier") |
.HasColumnName("CreatorId"); |
||||
.HasColumnName("DeleterId"); |
|
||||
|
b.Property<Guid?>("DeleterId") |
||||
b.Property<DateTime?>("DeletionTime") |
.HasColumnType("uniqueidentifier") |
||||
.HasColumnType("datetime2") |
.HasColumnName("DeleterId"); |
||||
.HasColumnName("DeletionTime"); |
|
||||
|
b.Property<DateTime?>("DeletionTime") |
||||
b.Property<string>("ExtraProperties") |
.HasColumnType("datetime2") |
||||
.HasColumnType("nvarchar(max)") |
.HasColumnName("DeletionTime"); |
||||
.HasColumnName("ExtraProperties"); |
|
||||
|
b.Property<string>("ExtraProperties") |
||||
b.Property<bool>("IsDeleted") |
.HasColumnType("nvarchar(max)") |
||||
.ValueGeneratedOnAdd() |
.HasColumnName("ExtraProperties"); |
||||
.HasColumnType("bit") |
|
||||
.HasDefaultValue(false) |
b.Property<bool>("IsDeleted") |
||||
.HasColumnName("IsDeleted"); |
.ValueGeneratedOnAdd() |
||||
|
.HasColumnType("bit") |
||||
b.Property<DateTime?>("LastModificationTime") |
.HasDefaultValue(false) |
||||
.HasColumnType("datetime2") |
.HasColumnName("IsDeleted"); |
||||
.HasColumnName("LastModificationTime"); |
|
||||
|
b.Property<DateTime?>("LastModificationTime") |
||||
b.Property<Guid?>("LastModifierId") |
.HasColumnType("datetime2") |
||||
.HasColumnType("uniqueidentifier") |
.HasColumnName("LastModificationTime"); |
||||
.HasColumnName("LastModifierId"); |
|
||||
|
b.Property<Guid?>("LastModifierId") |
||||
b.Property<string>("Name") |
.HasColumnType("uniqueidentifier") |
||||
.IsRequired() |
.HasColumnName("LastModifierId"); |
||||
.HasMaxLength(64) |
|
||||
.HasColumnType("nvarchar(64)"); |
b.Property<string>("Name") |
||||
|
.IsRequired() |
||||
b.HasKey("Id"); |
.HasMaxLength(64) |
||||
|
.HasColumnType("nvarchar(64)"); |
||||
b.HasIndex("Name"); |
|
||||
|
b.HasKey("Id"); |
||||
b.ToTable("AbpTenants"); |
|
||||
}); |
b.HasIndex("Name"); |
||||
|
|
||||
modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => |
b.ToTable("AbpTenants", (string)null); |
||||
{ |
}); |
||||
b.Property<Guid>("TenantId") |
|
||||
.HasColumnType("uniqueidentifier"); |
modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => |
||||
|
{ |
||||
b.Property<string>("Name") |
b.Property<Guid>("TenantId") |
||||
.HasMaxLength(64) |
.HasColumnType("uniqueidentifier"); |
||||
.HasColumnType("nvarchar(64)"); |
|
||||
|
b.Property<string>("Name") |
||||
b.Property<string>("Value") |
.HasMaxLength(64) |
||||
.IsRequired() |
.HasColumnType("nvarchar(64)"); |
||||
.HasMaxLength(1024) |
|
||||
.HasColumnType("nvarchar(1024)"); |
b.Property<string>("Value") |
||||
|
.IsRequired() |
||||
b.HasKey("TenantId", "Name"); |
.HasMaxLength(1024) |
||||
|
.HasColumnType("nvarchar(1024)"); |
||||
b.ToTable("AbpTenantConnectionStrings"); |
|
||||
}); |
b.HasKey("TenantId", "Name"); |
||||
|
|
||||
modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => |
b.ToTable("AbpTenantConnectionStrings", (string)null); |
||||
{ |
}); |
||||
b.HasOne("Volo.Abp.TenantManagement.Tenant", null) |
|
||||
.WithMany("ConnectionStrings") |
modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => |
||||
.HasForeignKey("TenantId") |
{ |
||||
.OnDelete(DeleteBehavior.Cascade) |
b.HasOne("Volo.Abp.TenantManagement.Tenant", null) |
||||
.IsRequired(); |
.WithMany("ConnectionStrings") |
||||
}); |
.HasForeignKey("TenantId") |
||||
|
.OnDelete(DeleteBehavior.Cascade) |
||||
modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => |
.IsRequired(); |
||||
{ |
}); |
||||
b.Navigation("ConnectionStrings"); |
|
||||
}); |
modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => |
||||
#pragma warning restore 612, 618
|
{ |
||||
} |
b.Navigation("ConnectionStrings"); |
||||
} |
}); |
||||
} |
#pragma warning restore 612, 618
|
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -1,65 +1,67 @@ |
|||||
using System; |
using System; |
||||
using Microsoft.EntityFrameworkCore.Migrations; |
using Microsoft.EntityFrameworkCore.Migrations; |
||||
|
|
||||
namespace EShopOnAbp.SaasService.Migrations |
#nullable disable |
||||
{ |
|
||||
public partial class Initial : Migration |
namespace EShopOnAbp.SaasService.Migrations |
||||
{ |
{ |
||||
protected override void Up(MigrationBuilder migrationBuilder) |
public partial class Initial : Migration |
||||
{ |
{ |
||||
migrationBuilder.CreateTable( |
protected override void Up(MigrationBuilder migrationBuilder) |
||||
name: "AbpTenants", |
{ |
||||
columns: table => new |
migrationBuilder.CreateTable( |
||||
{ |
name: "AbpTenants", |
||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), |
columns: table => new |
||||
Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), |
{ |
||||
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true), |
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), |
||||
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true), |
Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), |
||||
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false), |
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true), |
||||
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), |
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true), |
||||
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true), |
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false), |
||||
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), |
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), |
||||
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false), |
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true), |
||||
DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), |
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), |
||||
DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true) |
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false), |
||||
}, |
DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), |
||||
constraints: table => |
DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true) |
||||
{ |
}, |
||||
table.PrimaryKey("PK_AbpTenants", x => x.Id); |
constraints: table => |
||||
}); |
{ |
||||
|
table.PrimaryKey("PK_AbpTenants", x => x.Id); |
||||
migrationBuilder.CreateTable( |
}); |
||||
name: "AbpTenantConnectionStrings", |
|
||||
columns: table => new |
migrationBuilder.CreateTable( |
||||
{ |
name: "AbpTenantConnectionStrings", |
||||
TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: false), |
columns: table => new |
||||
Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), |
{ |
||||
Value = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: false) |
TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: false), |
||||
}, |
Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), |
||||
constraints: table => |
Value = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: false) |
||||
{ |
}, |
||||
table.PrimaryKey("PK_AbpTenantConnectionStrings", x => new { x.TenantId, x.Name }); |
constraints: table => |
||||
table.ForeignKey( |
{ |
||||
name: "FK_AbpTenantConnectionStrings_AbpTenants_TenantId", |
table.PrimaryKey("PK_AbpTenantConnectionStrings", x => new { x.TenantId, x.Name }); |
||||
column: x => x.TenantId, |
table.ForeignKey( |
||||
principalTable: "AbpTenants", |
name: "FK_AbpTenantConnectionStrings_AbpTenants_TenantId", |
||||
principalColumn: "Id", |
column: x => x.TenantId, |
||||
onDelete: ReferentialAction.Cascade); |
principalTable: "AbpTenants", |
||||
}); |
principalColumn: "Id", |
||||
|
onDelete: ReferentialAction.Cascade); |
||||
migrationBuilder.CreateIndex( |
}); |
||||
name: "IX_AbpTenants_Name", |
|
||||
table: "AbpTenants", |
migrationBuilder.CreateIndex( |
||||
column: "Name"); |
name: "IX_AbpTenants_Name", |
||||
} |
table: "AbpTenants", |
||||
|
column: "Name"); |
||||
protected override void Down(MigrationBuilder migrationBuilder) |
} |
||||
{ |
|
||||
migrationBuilder.DropTable( |
protected override void Down(MigrationBuilder migrationBuilder) |
||||
name: "AbpTenantConnectionStrings"); |
{ |
||||
|
migrationBuilder.DropTable( |
||||
migrationBuilder.DropTable( |
name: "AbpTenantConnectionStrings"); |
||||
name: "AbpTenants"); |
|
||||
} |
migrationBuilder.DropTable( |
||||
} |
name: "AbpTenants"); |
||||
} |
} |
||||
|
} |
||||
|
} |
||||
@ -1,16 +1,16 @@ |
|||||
<Project Sdk="Microsoft.NET.Sdk"> |
<Project Sdk="Microsoft.NET.Sdk"> |
||||
|
|
||||
<PropertyGroup> |
<PropertyGroup> |
||||
<TargetFramework>net5.0</TargetFramework> |
<TargetFramework>net6.0</TargetFramework> |
||||
<RootNamespace>EShopOnAbp.SaasService</RootNamespace> |
<RootNamespace>EShopOnAbp.SaasService</RootNamespace> |
||||
</PropertyGroup> |
</PropertyGroup> |
||||
|
|
||||
<ItemGroup> |
<ItemGroup> |
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> |
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" /> |
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" /> |
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0-rc.1.21452.15" /> |
||||
<ProjectReference Include="..\..\src\EShopOnAbp.SaasService.EntityFrameworkCore\EShopOnAbp.SaasService.EntityFrameworkCore.csproj" /> |
<ProjectReference Include="..\..\src\EShopOnAbp.SaasService.EntityFrameworkCore\EShopOnAbp.SaasService.EntityFrameworkCore.csproj" /> |
||||
<ProjectReference Include="..\EShopOnAbp.SaasService.TestBase\EShopOnAbp.SaasService.TestBase.csproj" /> |
<ProjectReference Include="..\EShopOnAbp.SaasService.TestBase\EShopOnAbp.SaasService.TestBase.csproj" /> |
||||
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-beta.1" /> |
||||
</ItemGroup> |
</ItemGroup> |
||||
|
|
||||
</Project> |
</Project> |
||||
|
|||||
@ -1,19 +1,19 @@ |
|||||
<Project Sdk="Microsoft.NET.Sdk"> |
<Project Sdk="Microsoft.NET.Sdk"> |
||||
|
|
||||
<PropertyGroup> |
<PropertyGroup> |
||||
<TargetFramework>net5.0</TargetFramework> |
<TargetFramework>net6.0</TargetFramework> |
||||
<RootNamespace>EShopOnAbp.Shared.Hosting.AspNetCore</RootNamespace> |
<RootNamespace>EShopOnAbp.Shared.Hosting.AspNetCore</RootNamespace> |
||||
</PropertyGroup> |
</PropertyGroup> |
||||
|
|
||||
<ItemGroup> |
<ItemGroup> |
||||
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
||||
<!-- <PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.4.1" />--> |
<!-- <PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.4.1" />--> |
||||
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-beta.1" /> |
||||
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0" /> |
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.0-beta.1" /> |
||||
</ItemGroup> |
</ItemGroup> |
||||
|
|
||||
<ItemGroup> |
<ItemGroup> |
||||
<ProjectReference Include="..\EShopOnAbp.Shared.Hosting\EShopOnAbp.Shared.Hosting.csproj" /> |
<ProjectReference Include="..\EShopOnAbp.Shared.Hosting\EShopOnAbp.Shared.Hosting.csproj" /> |
||||
</ItemGroup> |
</ItemGroup> |
||||
|
|
||||
</Project> |
</Project> |
||||
|
|||||
Loading…
Reference in new issue