pavelbannov 028b63213c Merge branch 'develop' into features/migrate-urlShortener ... # Conflicts: # common/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs # migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs # migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs # migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs # migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs # migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs # migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs # migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs # migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Startup.cs # web/ASC.Web.Core/Utility/UrlShortener.cs		2023-07-26 14:30:00 +03:00
..
20230414201716_UrlShortenerDbContext_Upgrade1.cs	update migration	2023-04-14 23:33:50 +03:00
20230414201716_UrlShortenerDbContext_Upgrade1.Designer.cs	update migration	2023-04-14 23:33:50 +03:00