v1.1.0-n pre-release

Fix migrations
holomodular · Oct 15, 2024 · 71d91d0 · 71d91d0
1 parent 9e5a510
commit 71d91d0
Show file tree

Hide file tree

Showing 29 changed files with 112 additions and 107 deletions.
diff --git a/...ceBricks.Logging.AzureDataTables.Debug/ServiceBricks.Logging.AzureDataTables.Debug.csproj b/...ceBricks.Logging.AzureDataTables.Debug/ServiceBricks.Logging.AzureDataTables.Debug.csproj
@@ -29,6 +29,6 @@
 		<ProjectReference Include="..\ServiceBricks.Logging.Debug\ServiceBricks.Logging.Debug.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.AzureDataTables" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.AzureDataTables" Version="1.1.0-n" />
 	</ItemGroup>
 </Project>
diff --git a/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj b/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0-m</Version>
+		<Version>1.1.0-n</Version>
 		<Description>The open source microservices platform. Visit https://ServiceBricks.com to learn more.</Description>
 		<PackageId>ServiceBricks.Logging.AzureDataTables</PackageId>
 		<Title>ServiceBricks.Logging.AzureDataTables</Title>
@@ -23,7 +23,7 @@
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/holomodular/ServiceBricks</RepositoryUrl>
-		<IsPackable>False</IsPackable>
+		<IsPackable>True</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Resource\readme.md" Pack="True" PackagePath="\" />
@@ -33,9 +33,9 @@
 		</None>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Logging" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Logging" Version="1.1.0-n" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.AzureDataTables" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.AzureDataTables" Version="1.1.0-n" />
 	</ItemGroup>
 </Project>
diff --git 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0-m</Version>
+		<Version>1.1.0-n</Version>
 		<Description>The open source microservices platform. Visit https://ServiceBricks.com to learn more.</Description>
 		<PackageId>ServiceBricks.Logging.Cosmos</PackageId>
 		<Title>ServiceBricks.Logging.Cosmos</Title>
@@ -23,7 +23,7 @@
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/holomodular/ServiceBricks</RepositoryUrl>
-		<IsPackable>False</IsPackable>
+		<IsPackable>True</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Resource\readme.md" Pack="True" PackagePath="\" />
@@ -33,11 +33,11 @@
 		</None>
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="ServiceBricks.Logging.EntityFrameworkCore" Version="1.1.0-m" />
+	  <PackageReference Include="ServiceBricks.Logging.EntityFrameworkCore" Version="1.1.0-n" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.Cosmos" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.Cosmos" Version="1.1.0-n" />
 	</ItemGroup>
 
 </Project>
diff --git a/....Logging.EntityFrameworkCore.Debug/ServiceBricks.Logging.EntityFrameworkCore.Debug.csproj b/....Logging.EntityFrameworkCore.Debug/ServiceBricks.Logging.EntityFrameworkCore.Debug.csproj
@@ -23,7 +23,7 @@
 		<ProjectReference Include="..\ServiceBricks.Logging.Debug\ServiceBricks.Logging.Debug.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.EntityFrameworkCore" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.EntityFrameworkCore" Version="1.1.0-n" />
 	</ItemGroup>
 
 </Project>
diff --git a/...erviceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj b/...erviceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0-m</Version>
+		<Version>1.1.0-n</Version>
 		<Description>The open source microservices platform. Visit https://ServiceBricks.com to learn more.</Description>
 		<PackageId>ServiceBricks.Logging.EntityFrameworkCore</PackageId>
 		<Title>ServiceBricks.Logging.EntityFrameworkCore</Title>
@@ -23,7 +23,7 @@
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/holomodular/ServiceBricks</RepositoryUrl>
-		<IsPackable>False</IsPackable>
+		<IsPackable>True</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Resource\readme.md" Pack="True" PackagePath="\" />
@@ -34,11 +34,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Logging" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Logging" Version="1.1.0-n" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.EntityFrameworkCore" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.EntityFrameworkCore" Version="1.1.0-n" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj b/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0-m</Version>
+		<Version>1.1.0-n</Version>
 		<Description>The open source microservices platform. Visit https://ServiceBricks.com to learn more.</Description>
 		<PackageId>ServiceBricks.Logging.InMemory</PackageId>
 		<Title>ServiceBricks.Logging.InMemory</Title>
@@ -23,7 +23,7 @@
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/holomodular/ServiceBricks</RepositoryUrl>
-		<IsPackable>False</IsPackable>
+		<IsPackable>True</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Resource\readme.md" Pack="True" PackagePath="\" />
@@ -34,11 +34,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="ServiceBricks.Logging.EntityFrameworkCore" Version="1.1.0-m" />
+	  <PackageReference Include="ServiceBricks.Logging.EntityFrameworkCore" Version="1.1.0-n" />
     </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.InMemory" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.InMemory" Version="1.1.0-n" />
 	</ItemGroup>
 
 

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
@@ -24,6 +24,6 @@
 		<ProjectReference Include="..\ServiceBricks.Logging.Debug\ServiceBricks.Logging.Debug.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.MongoDb" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.MongoDb" Version="1.1.0-n" />
 	</ItemGroup>
 </Project>
diff --git a/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj b/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0-m</Version>
+		<Version>1.1.0-n</Version>
 		<Description>The open source microservices platform. Visit https://ServiceBricks.com to learn more.</Description>
 		<PackageId>ServiceBricks.Logging.MongoDb</PackageId>
 		<Title>ServiceBricks.Logging.MongoDb</Title>
@@ -23,7 +23,7 @@
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/holomodular/ServiceBricks</RepositoryUrl>
-		<IsPackable>False</IsPackable>
+		<IsPackable>True</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Resource\readme.md" Pack="True" PackagePath="\" />
@@ -33,9 +33,9 @@
 		</None>
 	</ItemGroup>
 	<ItemGroup>		
-		<PackageReference Include="ServiceBricks.Logging" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Logging" Version="1.1.0-n" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.MongoDb" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.MongoDb" Version="1.1.0-n" />
 	</ItemGroup>
 </Project>
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
@@ -8,8 +8,8 @@
 
 	<ItemGroup>
 	  <Compile Include="..\ServiceBricks.Logging.Postgres\Extensions\ServiceCollectionExtensions.cs" Link="ServiceCollectionExtensions.cs" />
-	  <Compile Include="..\ServiceBricks.Logging.Postgres\Migrations\20240913102131_LoggingV1.cs" Link="20240913102131_LoggingV1.cs" />
-	  <Compile Include="..\ServiceBricks.Logging.Postgres\Migrations\20240913102131_LoggingV1.Designer.cs" Link="20240913102131_LoggingV1.Designer.cs" />
+	  <Compile Include="..\ServiceBricks.Logging.Postgres\Migrations\20241014165653_LoggingV1.cs" Link="20241014165653_LoggingV1.cs" />
+	  <Compile Include="..\ServiceBricks.Logging.Postgres\Migrations\20241014165653_LoggingV1.Designer.cs" Link="20241014165653_LoggingV1.Designer.cs" />
 	  <Compile Include="..\ServiceBricks.Logging.Postgres\Migrations\LoggingPostgresContextModelSnapshot.cs" Link="LoggingPostgresContextModelSnapshot.cs" />
 	  <Compile Include="..\ServiceBricks.Logging.Postgres\Model\LoggingPostgresConstants.cs" Link="LoggingPostgresConstants.cs" />
 	  <Compile Include="..\ServiceBricks.Logging.Postgres\Model\LoggingPostgresContext.cs" Link="LoggingPostgresContext.cs" />

diff --git a/...ions/20240913102131_LoggingV1.Designer.cs → ...ions/20241014165653_LoggingV1.Designer.cs b/...ions/20240913102131_LoggingV1.Designer.cs → ...ions/20241014165653_LoggingV1.Designer.cs
diff --git a/...es/Migrations/20240913102131_LoggingV1.cs → ...es/Migrations/20241014165653_LoggingV1.cs b/...es/Migrations/20240913102131_LoggingV1.cs → ...es/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,32 +77,32 @@ 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" });
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                name: "LogMessages",
+                name: "LogMessage",
                 schema: "Logging");
 
             migrationBuilder.DropTable(
-                name: "WebRequestMessages",
+                name: "WebRequestMessage",
                 schema: "Logging");
         }
     }
-}
+}
diff --git 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
@@ -46,12 +46,12 @@ public LoggingPostgresContext(DbContextOptions<LoggingPostgresContext> options)
         /// <summary>
         /// Log Messages
         /// </summary>
-        public virtual DbSet<LogMessage> LogMessages { get; set; }
+        public virtual DbSet<LogMessage> LogMessage { get; set; }
 
         /// <summary>
         /// Web Request Messages
         /// </summary>
-        public virtual DbSet<WebRequestMessage> WebRequestMessages { get; set; }
+        public virtual DbSet<WebRequestMessage> WebRequestMessage { get; set; }
 
         /// <summary>
         /// OnModelCreating.

diff --git a/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj b/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.1.0-m</Version>
+		<Version>1.1.0-n</Version>
 		<Description>The open source microservices platform. Visit https://ServiceBricks.com to learn more.</Description>
 		<PackageId>ServiceBricks.Logging.Postgres</PackageId>
 		<Title>ServiceBricks.Logging.Postgres</Title>
@@ -23,7 +23,7 @@
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/holomodular/ServiceBricks</RepositoryUrl>
-		<IsPackable>False</IsPackable>
+		<IsPackable>True</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Resource\readme.md" Pack="True" PackagePath="\" />
@@ -34,11 +34,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Logging.EntityFrameworkCore" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Logging.EntityFrameworkCore" Version="1.1.0-n" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ServiceBricks.Storage.Postgres" Version="1.1.0-m" />
+		<PackageReference Include="ServiceBricks.Storage.Postgres" Version="1.1.0-n" />
 	</ItemGroup>
 
 </Project>
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
@@ -8,8 +8,8 @@
 
 	<ItemGroup>
 	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Extensions\ServiceCollectionExtensions.cs" Link="ServiceCollectionExtensions.cs" />
-	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Migrations\20240913102323_LoggingV1.cs" Link="20240913102323_LoggingV1.cs" />
-	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Migrations\20240913102323_LoggingV1.Designer.cs" Link="20240913102323_LoggingV1.Designer.cs" />
+	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Migrations\20241014165858_LoggingV1.cs" Link="20241014165858_LoggingV1.cs" />
+	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Migrations\20241014165858_LoggingV1.Designer.cs" Link="20241014165858_LoggingV1.Designer.cs" />
 	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Migrations\LoggingSqlServerContextModelSnapshot.cs" Link="LoggingSqlServerContextModelSnapshot.cs" />
 	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Model\LoggingSqlServerConstants.cs" Link="LoggingSqlServerConstants.cs" />
 	  <Compile Include="..\ServiceBricks.Logging.SqlServer\Model\LoggingSqlServerContext.cs" Link="LoggingSqlServerContext.cs" />