IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-conflicts-merge' of https://github.com/ONLYOFFICE/DocSpace into fix-conflicts-merge

Browse Source
This commit is contained in:
Alexey Safronov 2023-07-20 12:52:16 +04:00
commit d390a953ae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migrations/mysql/Standalone/CoreDbContext/20230130103905_Standalone_CoreDbContextMigrate.Designer.cs → migrations/mysql/Standalone/MigrationContext/20230130103905_Standalone_MigrationContextMigrate.Designer.cs generated
View File

@ -12,7 +12,7 @@ namespace ASC.Migrations.MySql.Migrations.CoreDb
{
[DbContext(typeof(CoreDbContext))]
[Migration("20230130103905_Standalone_CoreDbContextMigrate")]
partial class CoreDbContextMigrate
partial class MigrationContextMigrate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)

2
migrations/mysql/Standalone/CoreDbContext/20230130103905_Standalone_CoreDbContextMigrate.cs → migrations/mysql/Standalone/MigrationContext/20230130103905_Standalone_MigrationContextMigrate.cs
View File

@ -31,7 +31,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace ASC.Migrations.MySql.Migrations.CoreDb;
/// <inheritdoc />
public partial class CoreDbContextMigrate : Migration
public partial class MigrationContextMigrate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)

4
migrations/mysql/Standalone/CoreDbContext/CoreDbContextModelSnapshot.cs → migrations/mysql/Standalone/MigrationContext/MigrationContextModelSnapshot.cs
View File

@ -9,8 +9,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace ASC.Migrations.MySql.Migrations.CoreDb
{
[DbContext(typeof(CoreDbContext))]
partial class CoreDbContextModelSnapshot : ModelSnapshot
[DbContext(typeof(MigrationContext))]
partial class MigrationContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{