Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit b3d4dea

Browse files
committed
Only one Migrations Assemble
1 parent 3f9e2b7 commit b3d4dea

20 files changed

Lines changed: 227 additions & 3717 deletions

File tree

src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/IdentityServerConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System.Reflection;
22
using Jp.Infra.CrossCutting.Identity.Entities.Identity;
33
using Microsoft.AspNetCore.Hosting;
44
using Microsoft.Extensions.Configuration;

src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Configuration/IdentityServerSqlConfig.cs renamed to src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/MssqlSqlServerConfig.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
using Jp.Infra.Data.Context;
1+
using System;
2+
using Jp.Infra.Data.Context;
23
using Microsoft.EntityFrameworkCore;
34
using Microsoft.Extensions.Configuration;
45
using Microsoft.Extensions.DependencyInjection;
56
using Microsoft.Extensions.Logging;
6-
using System;
7-
using System.Reflection;
87

9-
namespace Jp.Infra.Migrations.Sql.IdentityServer.Configuration
8+
namespace Jp.Infra.CrossCutting.IdentityServer.Configuration
109
{
11-
public static class IdentityServerSqlConfig
10+
public static class MssqlSqlServerConfig
1211
{
1312
public static IIdentityServerBuilder UseIdentityServerSqlDatabase(this IIdentityServerBuilder builder,
1413
IServiceCollection services, IConfiguration configuration, ILogger logger)
1514
{
1615
var connectionString = Environment.GetEnvironmentVariable("CUSTOMCONNSTR_DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
17-
var migrationsAssembly = typeof(IdentityServerSqlConfig).GetTypeInfo().Assembly.GetName().Name;
16+
var migrationsAssembly = "Jp.Infra.Migrations.Sql.Identity";//typeof(IdentityServerSqlConfig).GetTypeInfo().Assembly.GetName().Name;
1817

1918
services.AddDbContext<JpContext>(options => options.UseSqlServer(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2019
// this adds the config data from DB (clients, resources)
@@ -40,4 +39,4 @@ public static IIdentityServerBuilder UseIdentityServerSqlDatabase(this IIdentity
4039
}
4140

4241
}
43-
}
42+
}

src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Configuration/IdentityServerSqlConfig.cs renamed to src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/MySqlConfig.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Logging;
55
using System;
6-
using System.Reflection;
7-
using Jp.Infra.Data.Context;
86

9-
namespace Jp.Infra.Migrations.MySql.IdentityServer.Configuration
7+
namespace Jp.Infra.CrossCutting.IdentityServer.Configuration
108
{
11-
public static class IdentityServerSqlConfig
9+
public static class MySqlConfig
1210
{
1311
public static IIdentityServerBuilder UseIdentityServerMySqlDatabase(this IIdentityServerBuilder builder,
1412
IServiceCollection services, IConfiguration configuration, ILogger logger)
1513
{
1614
var connectionString = Environment.GetEnvironmentVariable("CUSTOMCONNSTR_DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
17-
var migrationsAssembly = typeof(IdentityServerSqlConfig).GetTypeInfo().Assembly.GetName().Name;
15+
var migrationsAssembly = "Jp.Infra.Migrations.MySql.Identity"; //typeof(IdentityServerSqlConfig).GetTypeInfo().Assembly.GetName().Name;
1816

19-
services.AddDbContext<JpContext>(options => options.UseMySql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2017
// this adds the config data from DB (clients, resources)
2118
builder.AddConfigurationStore(options =>
2219
{
@@ -40,4 +37,4 @@ public static IIdentityServerBuilder UseIdentityServerMySqlDatabase(this IIdenti
4037
}
4138

4239
}
43-
}
40+
}

src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@
1414
<ItemGroup>
1515
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
1616
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.1.1" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.2" />
1718
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.2">
1819
<PrivateAssets>all</PrivateAssets>
1920
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2021
</PackageReference>
2122
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
23+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.1" />
2224
</ItemGroup>
2325

2426

2527
<ItemGroup>
2628
<ProjectReference Include="..\Jp.Infra.CrossCutting.Identity\Jp.Infra.CrossCutting.Identity.csproj" />
27-
</ItemGroup>
28-
29-
30-
<ItemGroup>
31-
<Folder Include="Context\" />
29+
<ProjectReference Include="..\Jp.Infra.Data\Jp.Infra.Data.csproj" />
3230
</ItemGroup>
3331

3432
</Project>

src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Jp.Infra.Migrations.MySql.IdentityServer.csproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)