Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into feat/ui-changes

pull/1984/head
mehmet-erim 7 years ago
parent
commit
2d770194d0
  1. 10
      docs/en/Blog-Posts/2019-10-22 v1_0_Release/Post.md
  2. BIN
      docs/en/Blog-Posts/2019-10-22 v1_0_Release/contribution-graph.png
  3. 2
      docs/en/CLI.md
  4. 1
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs
  5. 4
      modules/docs/app/VoloDocs.Migrator/Dockerfile
  6. 4
      modules/docs/app/VoloDocs.Web/Dockerfile
  7. 2
      samples/BookStore-Modular/modules/book-management/database/Dockerfile
  8. 4
      samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile
  9. 4
      samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Dockerfile
  10. 4
      samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
  11. 4
      samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
  12. 4
      samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
  13. 2
      samples/MicroserviceDemo/databases/Dockerfile
  14. 4
      samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
  15. 4
      samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
  16. 4
      samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
  17. 4
      samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
  18. 4
      samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
  19. 4
      samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
  20. 1695
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191021114822_Remove_UniqueIndex_From_TenantName.Designer.cs
  21. 32
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191021114822_Remove_UniqueIndex_From_TenantName.cs
  22. 5
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191022082740_Initial.Designer.cs
  23. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191022082740_Initial.cs
  24. 2
      templates/module/aspnet-core/database/Dockerfile
  25. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile
  26. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Dockerfile

10
docs/en/Blog-Posts/2019-10-22 v1_0_Release/Post.md

@ -0,0 +1,10 @@
# ABP v1.0 Has Been Finally Released!
Today is the big day! After ~3 years of continuous development, first stable ABP release, v1.0, has been released. Thanks to everyone contributed to the project or tried it so far.
![contribution-graph](D:\Github\abp\docs\en\Blog-Posts\2019-10-22 v1_0_Release\contribution-graph.png)
## Road Map
...

BIN
docs/en/Blog-Posts/2019-10-22 v1_0_Release/contribution-graph.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

2
docs/en/CLI.md

@ -50,7 +50,7 @@ abp new Acme.BookStore
* `ef`: Entity Framework Core. * `ef`: Entity Framework Core.
* `mongodb`: MongoDB. * `mongodb`: MongoDB.
* `module`: [Module template](Startup-Templates/Module.md). Additional options: * `module`: [Module template](Startup-Templates/Module.md). Additional options:
* `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI). * `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI).
* `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory. * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory.
* `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version. * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version.

1
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs

@ -1,5 +1,4 @@
using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Volo.Abp.Domain; using Volo.Abp.Domain;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;

4
modules/docs/app/VoloDocs.Migrator/Dockerfile

@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/modules/docs/app/VoloDocs.Migrator" WORKDIR "/src/modules/docs/app/VoloDocs.Migrator"

4
modules/docs/app/VoloDocs.Web/Dockerfile

@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/modules/docs/app/VoloDocs.Web" WORKDIR "/src/modules/docs/app/VoloDocs.Web"

2
samples/BookStore-Modular/modules/book-management/database/Dockerfile

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
COPY . . COPY . .
WORKDIR /templates/service/host/IdentityServerHost WORKDIR /templates/service/host/IdentityServerHost

4
samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR /src/templates/service/host/Acme.BookStore.BookManagement.HttpApi.Host WORKDIR /src/templates/service/host/Acme.BookStore.BookManagement.HttpApi.Host

4
samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR /src/templates/service/host/Acme.BookStore.BookManagement.IdentityServer WORKDIR /src/templates/service/host/Acme.BookStore.BookManagement.IdentityServer

4
samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/applications/AuthServer.Host" WORKDIR "/src/samples/MicroserviceDemo/applications/AuthServer.Host"

4
samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/applications/BackendAdminApp.Host" WORKDIR "/src/samples/MicroserviceDemo/applications/BackendAdminApp.Host"

4
samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/applications/PublicWebSite.Host" WORKDIR "/src/samples/MicroserviceDemo/applications/PublicWebSite.Host"

2
samples/MicroserviceDemo/databases/Dockerfile

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
RUN apk add --no-cache bash RUN apk add --no-cache bash
WORKDIR /src WORKDIR /src
COPY . . COPY . .

4
samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host" WORKDIR "/src/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host"

4
samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/gateways/InternalGateway.Host" WORKDIR "/src/samples/MicroserviceDemo/gateways/InternalGateway.Host"

4
samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host" WORKDIR "/src/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host"

4
samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/microservices/BloggingService.Host" WORKDIR "/src/samples/MicroserviceDemo/microservices/BloggingService.Host"

4
samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/microservices/IdentityService.Host" WORKDIR "/src/samples/MicroserviceDemo/microservices/IdentityService.Host"

4
samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/samples/MicroserviceDemo/microservices/ProductService.Host" WORKDIR "/src/samples/MicroserviceDemo/microservices/ProductService.Host"

1695
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191021114822_Remove_UniqueIndex_From_TenantName.Designer.cs

File diff suppressed because it is too large

32
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191021114822_Remove_UniqueIndex_From_TenantName.cs

@ -1,32 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace MyCompanyName.MyProjectName.Migrations
{
public partial class Remove_UniqueIndex_From_TenantName : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_AbpTenants_Name",
table: "AbpTenants");
migrationBuilder.CreateIndex(
name: "IX_AbpTenants_Name",
table: "AbpTenants",
column: "Name");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_AbpTenants_Name",
table: "AbpTenants");
migrationBuilder.CreateIndex(
name: "IX_AbpTenants_Name",
table: "AbpTenants",
column: "Name",
unique: true);
}
}
}

5
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.Designer.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191022082740_Initial.Designer.cs

@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore;
namespace MyCompanyName.MyProjectName.Migrations namespace MyCompanyName.MyProjectName.Migrations
{ {
[DbContext(typeof(MyProjectNameMigrationsDbContext))] [DbContext(typeof(MyProjectNameMigrationsDbContext))]
[Migration("20191018080830_Initial")] [Migration("20191022082740_Initial")]
partial class Initial partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -1453,8 +1453,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name") b.HasIndex("Name");
.IsUnique();
b.ToTable("AbpTenants"); b.ToTable("AbpTenants");
}); });

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191022082740_Initial.cs

@ -866,8 +866,7 @@ namespace MyCompanyName.MyProjectName.Migrations
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpTenants_Name", name: "IX_AbpTenants_Name",
table: "AbpTenants", table: "AbpTenants",
column: "Name", column: "Name");
unique: true);
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpUserClaims_UserId", name: "IX_AbpUserClaims_UserId",

2
templates/module/aspnet-core/database/Dockerfile

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-sdk-alpine AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
COPY . . COPY . .
WORKDIR /templates/service/host/IdentityServerHost WORKDIR /templates/service/host/IdentityServerHost

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.HttpApi.Host WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.HttpApi.Host

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Dockerfile

@ -1,8 +1,8 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
FROM microsoft/dotnet:2.2-sdk AS build FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.IdentityServer WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.IdentityServer

Loading…
Cancel
Save