From 71d91d0590eb9336a846a5665d77e65ffbea1921 Mon Sep 17 00:00:00 2001 From: Danny Logsdon Date: Tue, 15 Oct 2024 14:05:47 -0400 Subject: [PATCH] v1.1.0-n pre-release Fix migrations --- ...ricks.Logging.AzureDataTables.Debug.csproj | 2 +- ...rviceBricks.Logging.AzureDataTables.csproj | 8 +++--- .../Extensions/ServiceCollectionExtensions.cs | 3 +++ .../ServiceBricks.Logging.Cosmos.csproj | 8 +++--- ...s.Logging.EntityFrameworkCore.Debug.csproj | 2 +- ...eBricks.Logging.EntityFrameworkCore.csproj | 8 +++--- .../ServiceBricks.Logging.InMemory.csproj | 8 +++--- ...ServiceBricks.Logging.MongoDb.Debug.csproj | 2 +- .../ServiceBricks.Logging.MongoDb.csproj | 8 +++--- ...erviceBricks.Logging.Postgres.Debug.csproj | 4 +-- ...s => 20241014165653_LoggingV1.Designer.cs} | 8 +++--- ...ggingV1.cs => 20241014165653_LoggingV1.cs} | 25 ++++++++++--------- .../LoggingPostgresContextModelSnapshot.cs | 6 ++--- .../Model/LoggingPostgresContext.cs | 4 +-- .../ServiceBricks.Logging.Postgres.csproj | 8 +++--- ...rviceBricks.Logging.SqlServer.Debug.csproj | 4 +-- ...s => 20241014165858_LoggingV1.Designer.cs} | 8 +++--- ...ggingV1.cs => 20241014165858_LoggingV1.cs} | 25 ++++++++++--------- .../LoggingSqlServerContextModelSnapshot.cs | 6 ++--- .../Model/LoggingSqlServerContext.cs | 4 +-- .../ServiceBricks.Logging.SqlServer.csproj | 8 +++--- .../ServiceBricks.Logging.Sqlite.Debug.csproj | 4 +-- ...s => 20241014165812_LoggingV1.Designer.cs} | 8 +++--- ...ggingV1.cs => 20241014165812_LoggingV1.cs} | 22 ++++++++-------- .../LoggingSqliteContextModelSnapshot.cs | 6 ++--- .../Model/LoggingSqliteContext.cs | 4 +-- .../ServiceBricks.Logging.Sqlite.csproj | 8 +++--- .../ServiceBricks.Logging.csproj | 6 ++--- src/V1/Tests/WebAppNet8/Program.cs | 2 +- 29 files changed, 112 insertions(+), 107 deletions(-) rename src/V1/ServiceBricks.Logging.Postgres/Migrations/{20240913102131_LoggingV1.Designer.cs => 20241014165653_LoggingV1.Designer.cs} (96%) rename src/V1/ServiceBricks.Logging.Postgres/Migrations/{20240913102131_LoggingV1.cs => 20241014165653_LoggingV1.cs} (89%) rename src/V1/ServiceBricks.Logging.SqlServer/Migrations/{20240913102323_LoggingV1.Designer.cs => 20241014165858_LoggingV1.Designer.cs} (96%) rename src/V1/ServiceBricks.Logging.SqlServer/Migrations/{20240913102323_LoggingV1.cs => 20241014165858_LoggingV1.cs} (90%) rename src/V1/ServiceBricks.Logging.Sqlite/Migrations/{20240913102251_LoggingV1.Designer.cs => 20241014165812_LoggingV1.Designer.cs} (96%) rename src/V1/ServiceBricks.Logging.Sqlite/Migrations/{20240913102251_LoggingV1.cs => 20241014165812_LoggingV1.cs} (89%) diff --git a/src/V1/ServiceBricks.Logging.AzureDataTables.Debug/ServiceBricks.Logging.AzureDataTables.Debug.csproj b/src/V1/ServiceBricks.Logging.AzureDataTables.Debug/ServiceBricks.Logging.AzureDataTables.Debug.csproj index c97a76b..0544077 100644 --- a/src/V1/ServiceBricks.Logging.AzureDataTables.Debug/ServiceBricks.Logging.AzureDataTables.Debug.csproj +++ b/src/V1/ServiceBricks.Logging.AzureDataTables.Debug/ServiceBricks.Logging.AzureDataTables.Debug.csproj @@ -29,6 +29,6 @@ - + diff --git a/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj b/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj index e572e20..5046417 100644 --- a/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj +++ b/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.AzureDataTables ServiceBricks.Logging.AzureDataTables @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -33,9 +33,9 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.Cosmos/Extensions/ServiceCollectionExtensions.cs b/src/V1/ServiceBricks.Logging.Cosmos/Extensions/ServiceCollectionExtensions.cs index 3a66549..67c3f80 100644 --- a/src/V1/ServiceBricks.Logging.Cosmos/Extensions/ServiceCollectionExtensions.cs +++ b/src/V1/ServiceBricks.Logging.Cosmos/Extensions/ServiceCollectionExtensions.cs @@ -21,6 +21,9 @@ public static IServiceCollection AddServiceBricksLoggingCosmos(this IServiceColl // AI: Add the parent module services.AddServiceBricksLoggingEntityFrameworkCore(configuration); + // AI: Remove the EFC rule since we are using a different models + LoggingEntityFrameworkCoreModuleAddRule.UnRegister(BusinessRuleRegistry.Instance); + // AI: Add the module to the ModuleRegistry ModuleRegistry.Instance.Register(LoggingCosmosModule.Instance); diff --git a/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj b/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj index d9174e0..94e2d69 100644 --- a/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj +++ b/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Cosmos ServiceBricks.Logging.Cosmos @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -33,11 +33,11 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.EntityFrameworkCore.Debug/ServiceBricks.Logging.EntityFrameworkCore.Debug.csproj b/src/V1/ServiceBricks.Logging.EntityFrameworkCore.Debug/ServiceBricks.Logging.EntityFrameworkCore.Debug.csproj index 2058b76..be0fdf6 100644 --- a/src/V1/ServiceBricks.Logging.EntityFrameworkCore.Debug/ServiceBricks.Logging.EntityFrameworkCore.Debug.csproj +++ b/src/V1/ServiceBricks.Logging.EntityFrameworkCore.Debug/ServiceBricks.Logging.EntityFrameworkCore.Debug.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj b/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj index 9db74ba..8ba7e2f 100644 --- a/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj +++ b/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.EntityFrameworkCore ServiceBricks.Logging.EntityFrameworkCore @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -34,11 +34,11 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj b/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj index 81775c0..0f88c41 100644 --- a/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj +++ b/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.InMemory ServiceBricks.Logging.InMemory @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -34,11 +34,11 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.MongoDb.Debug/ServiceBricks.Logging.MongoDb.Debug.csproj b/src/V1/ServiceBricks.Logging.MongoDb.Debug/ServiceBricks.Logging.MongoDb.Debug.csproj index 2ca9852..d585f18 100644 --- a/src/V1/ServiceBricks.Logging.MongoDb.Debug/ServiceBricks.Logging.MongoDb.Debug.csproj +++ b/src/V1/ServiceBricks.Logging.MongoDb.Debug/ServiceBricks.Logging.MongoDb.Debug.csproj @@ -24,6 +24,6 @@ - + diff --git a/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj b/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj index 4ba6842..8f12c99 100644 --- a/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj +++ b/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.MongoDb ServiceBricks.Logging.MongoDb @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -33,9 +33,9 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.Postgres.Debug/ServiceBricks.Logging.Postgres.Debug.csproj b/src/V1/ServiceBricks.Logging.Postgres.Debug/ServiceBricks.Logging.Postgres.Debug.csproj index caea09a..eb614e4 100644 --- a/src/V1/ServiceBricks.Logging.Postgres.Debug/ServiceBricks.Logging.Postgres.Debug.csproj +++ b/src/V1/ServiceBricks.Logging.Postgres.Debug/ServiceBricks.Logging.Postgres.Debug.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/V1/ServiceBricks.Logging.Postgres/Migrations/20240913102131_LoggingV1.Designer.cs b/src/V1/ServiceBricks.Logging.Postgres/Migrations/20241014165653_LoggingV1.Designer.cs similarity index 96% rename from src/V1/ServiceBricks.Logging.Postgres/Migrations/20240913102131_LoggingV1.Designer.cs rename to src/V1/ServiceBricks.Logging.Postgres/Migrations/20241014165653_LoggingV1.Designer.cs index 602e068..49b275e 100644 --- a/src/V1/ServiceBricks.Logging.Postgres/Migrations/20240913102131_LoggingV1.Designer.cs +++ b/src/V1/ServiceBricks.Logging.Postgres/Migrations/20241014165653_LoggingV1.Designer.cs @@ -12,7 +12,7 @@ namespace ServiceBricks.Logging.Postgres.Migrations { [DbContext(typeof(LoggingPostgresContext))] - [Migration("20240913102131_LoggingV1")] + [Migration("20241014165653_LoggingV1")] partial class LoggingV1 { /// @@ -21,7 +21,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("Logging") - .HasAnnotation("ProductVersion", "8.0.8") + .HasAnnotation("ProductVersion", "8.0.10") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); @@ -68,7 +68,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Application", "Level", "CreateDate"); - b.ToTable("LogMessages", "Logging"); + b.ToTable("LogMessage", "Logging"); }); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.WebRequestMessage", b => @@ -170,7 +170,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Application", "UserStorageKey", "CreateDate"); - b.ToTable("WebRequestMessages", "Logging"); + b.ToTable("WebRequestMessage", "Logging"); }); #pragma warning restore 612, 618 } diff --git a/src/V1/ServiceBricks.Logging.Postgres/Migrations/20240913102131_LoggingV1.cs b/src/V1/ServiceBricks.Logging.Postgres/Migrations/20241014165653_LoggingV1.cs similarity index 89% rename from src/V1/ServiceBricks.Logging.Postgres/Migrations/20240913102131_LoggingV1.cs rename to src/V1/ServiceBricks.Logging.Postgres/Migrations/20241014165653_LoggingV1.cs index 44d8cef..a742a84 100644 --- a/src/V1/ServiceBricks.Logging.Postgres/Migrations/20240913102131_LoggingV1.cs +++ b/src/V1/ServiceBricks.Logging.Postgres/Migrations/20241014165653_LoggingV1.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System; +using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; #nullable disable @@ -15,7 +16,7 @@ protected override void Up(MigrationBuilder migrationBuilder) name: "Logging"); migrationBuilder.CreateTable( - name: "LogMessages", + name: "LogMessage", schema: "Logging", columns: table => new { @@ -34,11 +35,11 @@ protected override void Up(MigrationBuilder migrationBuilder) }, constraints: table => { - table.PrimaryKey("PK_LogMessages", x => x.Key); + table.PrimaryKey("PK_LogMessage", x => x.Key); }); migrationBuilder.CreateTable( - name: "WebRequestMessages", + name: "WebRequestMessage", schema: "Logging", columns: table => new { @@ -76,19 +77,19 @@ protected override void Up(MigrationBuilder migrationBuilder) }, constraints: table => { - table.PrimaryKey("PK_WebRequestMessages", x => x.Key); + table.PrimaryKey("PK_WebRequestMessage", x => x.Key); }); migrationBuilder.CreateIndex( - name: "IX_LogMessages_Application_Level_CreateDate", + name: "IX_LogMessage_Application_Level_CreateDate", schema: "Logging", - table: "LogMessages", + table: "LogMessage", columns: new[] { "Application", "Level", "CreateDate" }); migrationBuilder.CreateIndex( - name: "IX_WebRequestMessages_Application_UserStorageKey_CreateDate", + name: "IX_WebRequestMessage_Application_UserStorageKey_CreateDate", schema: "Logging", - table: "WebRequestMessages", + table: "WebRequestMessage", columns: new[] { "Application", "UserStorageKey", "CreateDate" }); } @@ -96,12 +97,12 @@ protected override void Up(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "LogMessages", + name: "LogMessage", schema: "Logging"); migrationBuilder.DropTable( - name: "WebRequestMessages", + name: "WebRequestMessage", schema: "Logging"); } } -} \ No newline at end of file +} diff --git a/src/V1/ServiceBricks.Logging.Postgres/Migrations/LoggingPostgresContextModelSnapshot.cs b/src/V1/ServiceBricks.Logging.Postgres/Migrations/LoggingPostgresContextModelSnapshot.cs index 84be9df..8ed568e 100644 --- a/src/V1/ServiceBricks.Logging.Postgres/Migrations/LoggingPostgresContextModelSnapshot.cs +++ b/src/V1/ServiceBricks.Logging.Postgres/Migrations/LoggingPostgresContextModelSnapshot.cs @@ -18,7 +18,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("Logging") - .HasAnnotation("ProductVersion", "8.0.8") + .HasAnnotation("ProductVersion", "8.0.10") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); @@ -65,7 +65,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Application", "Level", "CreateDate"); - b.ToTable("LogMessages", "Logging"); + b.ToTable("LogMessage", "Logging"); }); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.WebRequestMessage", b => @@ -167,7 +167,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Application", "UserStorageKey", "CreateDate"); - b.ToTable("WebRequestMessages", "Logging"); + b.ToTable("WebRequestMessage", "Logging"); }); #pragma warning restore 612, 618 } diff --git a/src/V1/ServiceBricks.Logging.Postgres/Model/LoggingPostgresContext.cs b/src/V1/ServiceBricks.Logging.Postgres/Model/LoggingPostgresContext.cs index 6fdf6ed..7d9966e 100644 --- a/src/V1/ServiceBricks.Logging.Postgres/Model/LoggingPostgresContext.cs +++ b/src/V1/ServiceBricks.Logging.Postgres/Model/LoggingPostgresContext.cs @@ -46,12 +46,12 @@ public LoggingPostgresContext(DbContextOptions options) /// /// Log Messages /// - public virtual DbSet LogMessages { get; set; } + public virtual DbSet LogMessage { get; set; } /// /// Web Request Messages /// - public virtual DbSet WebRequestMessages { get; set; } + public virtual DbSet WebRequestMessage { get; set; } /// /// OnModelCreating. diff --git a/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj b/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj index 7cd7e94..f7dff20 100644 --- a/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj +++ b/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Postgres ServiceBricks.Logging.Postgres @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -34,11 +34,11 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.SqlServer.Debug/ServiceBricks.Logging.SqlServer.Debug.csproj b/src/V1/ServiceBricks.Logging.SqlServer.Debug/ServiceBricks.Logging.SqlServer.Debug.csproj index 355c656..f0569b3 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer.Debug/ServiceBricks.Logging.SqlServer.Debug.csproj +++ b/src/V1/ServiceBricks.Logging.SqlServer.Debug/ServiceBricks.Logging.SqlServer.Debug.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20240913102323_LoggingV1.Designer.cs b/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20241014165858_LoggingV1.Designer.cs similarity index 96% rename from src/V1/ServiceBricks.Logging.SqlServer/Migrations/20240913102323_LoggingV1.Designer.cs rename to src/V1/ServiceBricks.Logging.SqlServer/Migrations/20241014165858_LoggingV1.Designer.cs index 6b7d724..5be2c92 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20240913102323_LoggingV1.Designer.cs +++ b/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20241014165858_LoggingV1.Designer.cs @@ -12,7 +12,7 @@ namespace ServiceBricks.Logging.SqlServer.Migrations { [DbContext(typeof(LoggingSqlServerContext))] - [Migration("20240913102323_LoggingV1")] + [Migration("20241014165858_LoggingV1")] partial class LoggingV1 { /// @@ -21,7 +21,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("Logging") - .HasAnnotation("ProductVersion", "8.0.8") + .HasAnnotation("ProductVersion", "8.0.10") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -68,7 +68,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Application", "Level", "CreateDate"); - b.ToTable("LogMessages", "Logging"); + b.ToTable("LogMessage", "Logging"); }); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.WebRequestMessage", b => @@ -170,7 +170,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Application", "UserStorageKey", "CreateDate"); - b.ToTable("WebRequestMessages", "Logging"); + b.ToTable("WebRequestMessage", "Logging"); }); #pragma warning restore 612, 618 } diff --git a/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20240913102323_LoggingV1.cs b/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20241014165858_LoggingV1.cs similarity index 90% rename from src/V1/ServiceBricks.Logging.SqlServer/Migrations/20240913102323_LoggingV1.cs rename to src/V1/ServiceBricks.Logging.SqlServer/Migrations/20241014165858_LoggingV1.cs index 03abf1d..6a9d33d 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20240913102323_LoggingV1.cs +++ b/src/V1/ServiceBricks.Logging.SqlServer/Migrations/20241014165858_LoggingV1.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable @@ -14,7 +15,7 @@ protected override void Up(MigrationBuilder migrationBuilder) name: "Logging"); migrationBuilder.CreateTable( - name: "LogMessages", + name: "LogMessage", schema: "Logging", columns: table => new { @@ -33,11 +34,11 @@ protected override void Up(MigrationBuilder migrationBuilder) }, constraints: table => { - table.PrimaryKey("PK_LogMessages", x => x.Key); + table.PrimaryKey("PK_LogMessage", x => x.Key); }); migrationBuilder.CreateTable( - name: "WebRequestMessages", + name: "WebRequestMessage", schema: "Logging", columns: table => new { @@ -75,19 +76,19 @@ protected override void Up(MigrationBuilder migrationBuilder) }, constraints: table => { - table.PrimaryKey("PK_WebRequestMessages", x => x.Key); + table.PrimaryKey("PK_WebRequestMessage", x => x.Key); }); migrationBuilder.CreateIndex( - name: "IX_LogMessages_Application_Level_CreateDate", + name: "IX_LogMessage_Application_Level_CreateDate", schema: "Logging", - table: "LogMessages", + table: "LogMessage", columns: new[] { "Application", "Level", "CreateDate" }); migrationBuilder.CreateIndex( - name: "IX_WebRequestMessages_Application_UserStorageKey_CreateDate", + name: "IX_WebRequestMessage_Application_UserStorageKey_CreateDate", schema: "Logging", - table: "WebRequestMessages", + table: "WebRequestMessage", columns: new[] { "Application", "UserStorageKey", "CreateDate" }); } @@ -95,12 +96,12 @@ protected override void Up(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "LogMessages", + name: "LogMessage", schema: "Logging"); migrationBuilder.DropTable( - name: "WebRequestMessages", + name: "WebRequestMessage", schema: "Logging"); } } -} \ No newline at end of file +} diff --git a/src/V1/ServiceBricks.Logging.SqlServer/Migrations/LoggingSqlServerContextModelSnapshot.cs b/src/V1/ServiceBricks.Logging.SqlServer/Migrations/LoggingSqlServerContextModelSnapshot.cs index 395eaa1..fa8f383 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer/Migrations/LoggingSqlServerContextModelSnapshot.cs +++ b/src/V1/ServiceBricks.Logging.SqlServer/Migrations/LoggingSqlServerContextModelSnapshot.cs @@ -18,7 +18,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("Logging") - .HasAnnotation("ProductVersion", "8.0.8") + .HasAnnotation("ProductVersion", "8.0.10") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -65,7 +65,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Application", "Level", "CreateDate"); - b.ToTable("LogMessages", "Logging"); + b.ToTable("LogMessage", "Logging"); }); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.WebRequestMessage", b => @@ -167,7 +167,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Application", "UserStorageKey", "CreateDate"); - b.ToTable("WebRequestMessages", "Logging"); + b.ToTable("WebRequestMessage", "Logging"); }); #pragma warning restore 612, 618 } diff --git a/src/V1/ServiceBricks.Logging.SqlServer/Model/LoggingSqlServerContext.cs b/src/V1/ServiceBricks.Logging.SqlServer/Model/LoggingSqlServerContext.cs index d3b77db..fef03f7 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer/Model/LoggingSqlServerContext.cs +++ b/src/V1/ServiceBricks.Logging.SqlServer/Model/LoggingSqlServerContext.cs @@ -46,12 +46,12 @@ public LoggingSqlServerContext(DbContextOptions options /// /// Log Messages. /// - public virtual DbSet LogMessages { get; set; } + public virtual DbSet LogMessage { get; set; } /// /// Web Request Messages. /// - public virtual DbSet WebRequestMessages { get; set; } + public virtual DbSet WebRequestMessage { get; set; } /// /// OnModelCreating. diff --git a/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj b/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj index 9f5a5b8..138369c 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj +++ b/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.SqlServer ServiceBricks.Logging.SqlServer @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -34,11 +34,11 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging.Sqlite.Debug/ServiceBricks.Logging.Sqlite.Debug.csproj b/src/V1/ServiceBricks.Logging.Sqlite.Debug/ServiceBricks.Logging.Sqlite.Debug.csproj index 342d8eb..d30fd53 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite.Debug/ServiceBricks.Logging.Sqlite.Debug.csproj +++ b/src/V1/ServiceBricks.Logging.Sqlite.Debug/ServiceBricks.Logging.Sqlite.Debug.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20240913102251_LoggingV1.Designer.cs b/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20241014165812_LoggingV1.Designer.cs similarity index 96% rename from src/V1/ServiceBricks.Logging.Sqlite/Migrations/20240913102251_LoggingV1.Designer.cs rename to src/V1/ServiceBricks.Logging.Sqlite/Migrations/20241014165812_LoggingV1.Designer.cs index 2ddeb3a..3e1280e 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20240913102251_LoggingV1.Designer.cs +++ b/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20241014165812_LoggingV1.Designer.cs @@ -11,14 +11,14 @@ namespace ServiceBricks.Logging.Sqlite.Migrations { [DbContext(typeof(LoggingSqliteContext))] - [Migration("20240913102251_LoggingV1")] + [Migration("20241014165812_LoggingV1")] partial class LoggingV1 { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.LogMessage", b => { @@ -61,7 +61,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Application", "Level", "CreateDate"); - b.ToTable("LogMessages"); + b.ToTable("LogMessage"); }); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.WebRequestMessage", b => @@ -162,7 +162,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Application", "UserStorageKey", "CreateDate"); - b.ToTable("WebRequestMessages"); + b.ToTable("WebRequestMessage"); }); #pragma warning restore 612, 618 } diff --git a/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20240913102251_LoggingV1.cs b/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20241014165812_LoggingV1.cs similarity index 89% rename from src/V1/ServiceBricks.Logging.Sqlite/Migrations/20240913102251_LoggingV1.cs rename to src/V1/ServiceBricks.Logging.Sqlite/Migrations/20241014165812_LoggingV1.cs index a3ab815..dd2a5f0 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20240913102251_LoggingV1.cs +++ b/src/V1/ServiceBricks.Logging.Sqlite/Migrations/20241014165812_LoggingV1.cs @@ -11,7 +11,7 @@ public partial class LoggingV1 : Migration protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.CreateTable( - name: "LogMessages", + name: "LogMessage", columns: table => new { Key = table.Column(type: "INTEGER", nullable: false) @@ -29,11 +29,11 @@ protected override void Up(MigrationBuilder migrationBuilder) }, constraints: table => { - table.PrimaryKey("PK_LogMessages", x => x.Key); + table.PrimaryKey("PK_LogMessage", x => x.Key); }); migrationBuilder.CreateTable( - name: "WebRequestMessages", + name: "WebRequestMessage", columns: table => new { Key = table.Column(type: "INTEGER", nullable: false) @@ -70,17 +70,17 @@ protected override void Up(MigrationBuilder migrationBuilder) }, constraints: table => { - table.PrimaryKey("PK_WebRequestMessages", x => x.Key); + table.PrimaryKey("PK_WebRequestMessage", x => x.Key); }); migrationBuilder.CreateIndex( - name: "IX_LogMessages_Application_Level_CreateDate", - table: "LogMessages", + name: "IX_LogMessage_Application_Level_CreateDate", + table: "LogMessage", columns: new[] { "Application", "Level", "CreateDate" }); migrationBuilder.CreateIndex( - name: "IX_WebRequestMessages_Application_UserStorageKey_CreateDate", - table: "WebRequestMessages", + name: "IX_WebRequestMessage_Application_UserStorageKey_CreateDate", + table: "WebRequestMessage", columns: new[] { "Application", "UserStorageKey", "CreateDate" }); } @@ -88,10 +88,10 @@ protected override void Up(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "LogMessages"); + name: "LogMessage"); migrationBuilder.DropTable( - name: "WebRequestMessages"); + name: "WebRequestMessage"); } } -} \ No newline at end of file +} diff --git a/src/V1/ServiceBricks.Logging.Sqlite/Migrations/LoggingSqliteContextModelSnapshot.cs b/src/V1/ServiceBricks.Logging.Sqlite/Migrations/LoggingSqliteContextModelSnapshot.cs index 0047af7..7a23cf6 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite/Migrations/LoggingSqliteContextModelSnapshot.cs +++ b/src/V1/ServiceBricks.Logging.Sqlite/Migrations/LoggingSqliteContextModelSnapshot.cs @@ -15,7 +15,7 @@ partial class LoggingSqliteContextModelSnapshot : ModelSnapshot protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.LogMessage", b => { @@ -58,7 +58,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Application", "Level", "CreateDate"); - b.ToTable("LogMessages"); + b.ToTable("LogMessage"); }); modelBuilder.Entity("ServiceBricks.Logging.EntityFrameworkCore.WebRequestMessage", b => @@ -159,7 +159,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Application", "UserStorageKey", "CreateDate"); - b.ToTable("WebRequestMessages"); + b.ToTable("WebRequestMessage"); }); #pragma warning restore 612, 618 } diff --git a/src/V1/ServiceBricks.Logging.Sqlite/Model/LoggingSqliteContext.cs b/src/V1/ServiceBricks.Logging.Sqlite/Model/LoggingSqliteContext.cs index 094887a..8156f86 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite/Model/LoggingSqliteContext.cs +++ b/src/V1/ServiceBricks.Logging.Sqlite/Model/LoggingSqliteContext.cs @@ -46,12 +46,12 @@ public LoggingSqliteContext(DbContextOptions options) : ba /// /// Log Messages. /// - public virtual DbSet LogMessages { get; set; } + public virtual DbSet LogMessage { get; set; } /// /// Web Request Messages. /// - public virtual DbSet WebRequestMessages { get; set; } + public virtual DbSet WebRequestMessage { get; set; } /// /// OnModelCreating. diff --git a/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj b/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj index f32ced0..7d97260 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj +++ b/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Sqlite ServiceBricks.Logging.Sqlite @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -34,11 +34,11 @@ - + - + diff --git a/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj b/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj index 91ef23f..3a7d6a0 100644 --- a/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj +++ b/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj @@ -1,7 +1,7 @@ - 1.1.0-m + 1.1.0-n The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging ServiceBricks.Logging @@ -23,7 +23,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -33,7 +33,7 @@ - + diff --git a/src/V1/Tests/WebAppNet8/Program.cs b/src/V1/Tests/WebAppNet8/Program.cs index d44007f..f5f4355 100644 --- a/src/V1/Tests/WebAppNet8/Program.cs +++ b/src/V1/Tests/WebAppNet8/Program.cs @@ -27,7 +27,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) }) .ConfigureWebHostDefaults(webBuilder => { - webBuilder.UseStartup(); + webBuilder.UseStartup(); }); } }