diff --git a/ServiceBricksCacheV1.sln b/ServiceBricksCacheV1.sln index e8f8fe3..4256e66 100644 --- a/ServiceBricksCacheV1.sln +++ b/ServiceBricksCacheV1.sln @@ -116,9 +116,11 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FFA1720D-0707-47B3-A535-AA12A4D413A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FFA1720D-0707-47B3-A535-AA12A4D413A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFA1720D-0707-47B3-A535-AA12A4D413A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFA1720D-0707-47B3-A535-AA12A4D413A6}.Release|Any CPU.Build.0 = Release|Any CPU {190B8CFE-98EE-40B8-9919-4A6B2E83B15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {190B8CFE-98EE-40B8-9919-4A6B2E83B15C}.Debug|Any CPU.Build.0 = Debug|Any CPU {190B8CFE-98EE-40B8-9919-4A6B2E83B15C}.Release|Any CPU.ActiveCfg = Release|Any CPU {190B8CFE-98EE-40B8-9919-4A6B2E83B15C}.Release|Any CPU.Build.0 = Release|Any CPU {AD7321F4-AB0C-47CB-9E9A-A556780CFBD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -126,6 +128,7 @@ Global {AD7321F4-AB0C-47CB-9E9A-A556780CFBD9}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD7321F4-AB0C-47CB-9E9A-A556780CFBD9}.Release|Any CPU.Build.0 = Release|Any CPU {CDD5F5A1-134F-4874-98C7-C399493B23AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDD5F5A1-134F-4874-98C7-C399493B23AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDD5F5A1-134F-4874-98C7-C399493B23AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {CDD5F5A1-134F-4874-98C7-C399493B23AC}.Release|Any CPU.Build.0 = Release|Any CPU {0459D418-D923-4B3B-BF01-6689B9DA7D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -137,6 +140,7 @@ Global {9DE4AEF3-3C9D-47A3-941E-B5B69425E64F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9DE4AEF3-3C9D-47A3-941E-B5B69425E64F}.Release|Any CPU.Build.0 = Release|Any CPU {E0AD3F1C-AE5D-4687-B4E5-A6376A28B41F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0AD3F1C-AE5D-4687-B4E5-A6376A28B41F}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0AD3F1C-AE5D-4687-B4E5-A6376A28B41F}.Release|Any CPU.ActiveCfg = Release|Any CPU {E0AD3F1C-AE5D-4687-B4E5-A6376A28B41F}.Release|Any CPU.Build.0 = Release|Any CPU {56988C4A-CB96-4398-B76A-DE9F1085353C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -144,6 +148,7 @@ Global {56988C4A-CB96-4398-B76A-DE9F1085353C}.Release|Any CPU.ActiveCfg = Release|Any CPU {56988C4A-CB96-4398-B76A-DE9F1085353C}.Release|Any CPU.Build.0 = Release|Any CPU {0A032801-0A8B-4210-AE52-5D07658F6900}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A032801-0A8B-4210-AE52-5D07658F6900}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A032801-0A8B-4210-AE52-5D07658F6900}.Release|Any CPU.ActiveCfg = Release|Any CPU {0A032801-0A8B-4210-AE52-5D07658F6900}.Release|Any CPU.Build.0 = Release|Any CPU {EDEF6140-2530-47E6-96D0-8C2C420CDF58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -151,6 +156,7 @@ Global {EDEF6140-2530-47E6-96D0-8C2C420CDF58}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDEF6140-2530-47E6-96D0-8C2C420CDF58}.Release|Any CPU.Build.0 = Release|Any CPU {B2CFD2FE-E39A-4B74-A8EB-89B2359A56BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2CFD2FE-E39A-4B74-A8EB-89B2359A56BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2CFD2FE-E39A-4B74-A8EB-89B2359A56BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B2CFD2FE-E39A-4B74-A8EB-89B2359A56BD}.Release|Any CPU.Build.0 = Release|Any CPU {75B3D74D-8BC9-4B37-B4D6-C2AAA44BE340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -158,6 +164,7 @@ Global {75B3D74D-8BC9-4B37-B4D6-C2AAA44BE340}.Release|Any CPU.ActiveCfg = Release|Any CPU {75B3D74D-8BC9-4B37-B4D6-C2AAA44BE340}.Release|Any CPU.Build.0 = Release|Any CPU {A75D07B8-214B-40AB-8423-9E78272B90B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A75D07B8-214B-40AB-8423-9E78272B90B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {A75D07B8-214B-40AB-8423-9E78272B90B2}.Release|Any CPU.ActiveCfg = Release|Any CPU {A75D07B8-214B-40AB-8423-9E78272B90B2}.Release|Any CPU.Build.0 = Release|Any CPU {E75C07EA-3645-4936-9D80-11EC1E2CAA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -165,6 +172,7 @@ Global {E75C07EA-3645-4936-9D80-11EC1E2CAA14}.Release|Any CPU.ActiveCfg = Release|Any CPU {E75C07EA-3645-4936-9D80-11EC1E2CAA14}.Release|Any CPU.Build.0 = Release|Any CPU {C83894ED-21A5-49CA-9D4E-704759BCA530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C83894ED-21A5-49CA-9D4E-704759BCA530}.Debug|Any CPU.Build.0 = Debug|Any CPU {C83894ED-21A5-49CA-9D4E-704759BCA530}.Release|Any CPU.ActiveCfg = Release|Any CPU {C83894ED-21A5-49CA-9D4E-704759BCA530}.Release|Any CPU.Build.0 = Release|Any CPU {E4B5A718-12DA-49DD-8FC1-20A0EDDFCF42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -172,6 +180,7 @@ Global {E4B5A718-12DA-49DD-8FC1-20A0EDDFCF42}.Release|Any CPU.ActiveCfg = Release|Any CPU {E4B5A718-12DA-49DD-8FC1-20A0EDDFCF42}.Release|Any CPU.Build.0 = Release|Any CPU {72CDDF80-7850-458F-8AFF-E38FE1993D3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72CDDF80-7850-458F-8AFF-E38FE1993D3B}.Debug|Any CPU.Build.0 = Debug|Any CPU {72CDDF80-7850-458F-8AFF-E38FE1993D3B}.Release|Any CPU.ActiveCfg = Release|Any CPU {72CDDF80-7850-458F-8AFF-E38FE1993D3B}.Release|Any CPU.Build.0 = Release|Any CPU {AAAE668B-CE97-489C-A469-0B6C86FC62ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/V1/ServiceBricks.Cache.AzureDataTables.Debug/ServiceBricks.Cache.AzureDataTables.Debug.csproj b/src/V1/ServiceBricks.Cache.AzureDataTables.Debug/ServiceBricks.Cache.AzureDataTables.Debug.csproj index 95dbf91..5a7daec 100644 --- a/src/V1/ServiceBricks.Cache.AzureDataTables.Debug/ServiceBricks.Cache.AzureDataTables.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.AzureDataTables.Debug/ServiceBricks.Cache.AzureDataTables.Debug.csproj @@ -22,6 +22,6 @@ - + diff --git a/src/V1/ServiceBricks.Cache.AzureDataTables/ServiceBricks.Cache.AzureDataTables.csproj b/src/V1/ServiceBricks.Cache.AzureDataTables/ServiceBricks.Cache.AzureDataTables.csproj index e37ccaf..ab756c4 100644 --- a/src/V1/ServiceBricks.Cache.AzureDataTables/ServiceBricks.Cache.AzureDataTables.csproj +++ b/src/V1/ServiceBricks.Cache.AzureDataTables/ServiceBricks.Cache.AzureDataTables.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.AzureDataTables holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -29,9 +29,9 @@ - + - + diff --git a/src/V1/ServiceBricks.Cache.Cosmos.Debug/ServiceBricks.Cache.Cosmos.Debug.csproj b/src/V1/ServiceBricks.Cache.Cosmos.Debug/ServiceBricks.Cache.Cosmos.Debug.csproj index a1a2120..f466044 100644 --- a/src/V1/ServiceBricks.Cache.Cosmos.Debug/ServiceBricks.Cache.Cosmos.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.Cosmos.Debug/ServiceBricks.Cache.Cosmos.Debug.csproj @@ -19,16 +19,8 @@ - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache.Cosmos/Extensions/ServiceCollectionExtensions.cs b/src/V1/ServiceBricks.Cache.Cosmos/Extensions/ServiceCollectionExtensions.cs index de4153c..94726e0 100644 --- a/src/V1/ServiceBricks.Cache.Cosmos/Extensions/ServiceCollectionExtensions.cs +++ b/src/V1/ServiceBricks.Cache.Cosmos/Extensions/ServiceCollectionExtensions.cs @@ -24,7 +24,6 @@ public static IServiceCollection AddServiceBricksCacheCosmos(this IServiceCollec ModuleRegistry.Instance.RegisterItem(typeof(CacheCosmosModule), new CacheCosmosModule()); // AI: Add the parent module - // AI: If the primary keys of the Cosmos models do not match the EFC module, we can't use EFC rules, so skip EFC and call start on the core module instead. services.AddServiceBricksCacheEntityFrameworkCore(configuration); // AI: Register the database for the module @@ -42,10 +41,8 @@ public static IServiceCollection AddServiceBricksCacheCosmos(this IServiceCollec services.AddScoped, CacheStorageRepository>(); // AI: Register business rules for the module - // AI: If the primary keys of the Cosmos models match the EFC module, we can use the EFC rules // AI: Add API services for the module. Each DTO should have two registrations, one for the generic IApiService<> and one for the named interface - // AI: If the primary keys of the Cosmos models match the EFC module, we can use the EFC rules return services; } diff --git a/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosConstants.cs b/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosConstants.cs index 091bca3..e656156 100644 --- a/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosConstants.cs +++ b/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosConstants.cs @@ -18,6 +18,16 @@ public static partial class CacheCosmosConstants /// /// The default container name. /// - public const string DEFAULT_CONTAINER_NAME = "Cache"; + public const string CONTAINER_PREFIX = "Cache"; + + /// + /// Get the container name for the given table name. + /// + /// + /// + public static string GetContainerName(string tableName) + { + return CONTAINER_PREFIX + tableName; + } } } \ No newline at end of file diff --git a/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosContext.cs b/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosContext.cs index 545fcee..6ec4692 100644 --- a/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosContext.cs +++ b/src/V1/ServiceBricks.Cache.Cosmos/Model/CacheCosmosContext.cs @@ -33,11 +33,11 @@ protected override void OnModelCreating(ModelBuilder builder) { base.OnModelCreating(builder); - // AI: Set the default container name - builder.Model.SetDefaultContainer(CacheCosmosConstants.DEFAULT_CONTAINER_NAME); - // AI: Create the model for each table builder.Entity().HasKey(key => key.CacheKey); + builder.Entity().HasPartitionKey(key => key.CacheKey); + builder.Entity().HasIndex(key => new { key.ExpirationDate }); // For background process + builder.Entity().ToContainer(CacheCosmosConstants.GetContainerName(nameof(CacheData))); } /// diff --git a/src/V1/ServiceBricks.Cache.Cosmos/ServiceBricks.Cache.Cosmos.csproj b/src/V1/ServiceBricks.Cache.Cosmos/ServiceBricks.Cache.Cosmos.csproj index 57788f4..27205e8 100644 --- a/src/V1/ServiceBricks.Cache.Cosmos/ServiceBricks.Cache.Cosmos.csproj +++ b/src/V1/ServiceBricks.Cache.Cosmos/ServiceBricks.Cache.Cosmos.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.Cosmos holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -29,18 +29,11 @@ - - - - - - - - + - - + + diff --git a/src/V1/ServiceBricks.Cache.Debug/ServiceBricks.Cache.Debug.csproj b/src/V1/ServiceBricks.Cache.Debug/ServiceBricks.Cache.Debug.csproj index 06dc754..7cf7b8b 100644 --- a/src/V1/ServiceBricks.Cache.Debug/ServiceBricks.Cache.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.Debug/ServiceBricks.Cache.Debug.csproj @@ -24,6 +24,6 @@ - + diff --git a/src/V1/ServiceBricks.Cache.EntityFrameworkCore.Debug/ServiceBricks.Cache.EntityFrameworkCore.Debug.csproj b/src/V1/ServiceBricks.Cache.EntityFrameworkCore.Debug/ServiceBricks.Cache.EntityFrameworkCore.Debug.csproj index 5bfad1d..03c52bc 100644 --- a/src/V1/ServiceBricks.Cache.EntityFrameworkCore.Debug/ServiceBricks.Cache.EntityFrameworkCore.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.EntityFrameworkCore.Debug/ServiceBricks.Cache.EntityFrameworkCore.Debug.csproj @@ -1,4 +1,4 @@ - + net6.0;net7.0;net8.0 @@ -17,7 +17,7 @@ - + diff --git a/src/V1/ServiceBricks.Cache.EntityFrameworkCore/ServiceBricks.Cache.EntityFrameworkCore.csproj b/src/V1/ServiceBricks.Cache.EntityFrameworkCore/ServiceBricks.Cache.EntityFrameworkCore.csproj index 6c05866..985bf6b 100644 --- a/src/V1/ServiceBricks.Cache.EntityFrameworkCore/ServiceBricks.Cache.EntityFrameworkCore.csproj +++ b/src/V1/ServiceBricks.Cache.EntityFrameworkCore/ServiceBricks.Cache.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.EntityFrameworkCore holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -29,7 +29,7 @@ - - + + diff --git a/src/V1/ServiceBricks.Cache.InMemory.Debug/ServiceBricks.Cache.InMemory.Debug.csproj b/src/V1/ServiceBricks.Cache.InMemory.Debug/ServiceBricks.Cache.InMemory.Debug.csproj index 9685589..594a0ae 100644 --- a/src/V1/ServiceBricks.Cache.InMemory.Debug/ServiceBricks.Cache.InMemory.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.InMemory.Debug/ServiceBricks.Cache.InMemory.Debug.csproj @@ -18,16 +18,8 @@ - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache.InMemory/Model/CacheInMemoryContext.cs b/src/V1/ServiceBricks.Cache.InMemory/Model/CacheInMemoryContext.cs index 3d1359a..e22e88c 100644 --- a/src/V1/ServiceBricks.Cache.InMemory/Model/CacheInMemoryContext.cs +++ b/src/V1/ServiceBricks.Cache.InMemory/Model/CacheInMemoryContext.cs @@ -39,7 +39,7 @@ public CacheInMemoryContext(DbContextOptions options) : ba /// /// Cache Data. /// - public virtual DbSet CacheData { get; set; } + public virtual DbSet CacheDatas { get; set; } /// /// OnModelCreating. @@ -51,6 +51,7 @@ protected override void OnModelCreating(ModelBuilder builder) // AI: Setup the entities to the model builder.Entity().HasKey(key => key.CacheKey); + builder.Entity().HasIndex(key => new { key.ExpirationDate }); // For background process } /// diff --git a/src/V1/ServiceBricks.Cache.InMemory/ServiceBricks.Cache.InMemory.csproj b/src/V1/ServiceBricks.Cache.InMemory/ServiceBricks.Cache.InMemory.csproj index 96f25b7..94c5816 100644 --- a/src/V1/ServiceBricks.Cache.InMemory/ServiceBricks.Cache.InMemory.csproj +++ b/src/V1/ServiceBricks.Cache.InMemory/ServiceBricks.Cache.InMemory.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.InMemory holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -30,19 +30,11 @@ - + - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache.MongoDb.Debug/ServiceBricks.Cache.MongoDb.Debug.csproj b/src/V1/ServiceBricks.Cache.MongoDb.Debug/ServiceBricks.Cache.MongoDb.Debug.csproj index 4f0df06..b947f26 100644 --- a/src/V1/ServiceBricks.Cache.MongoDb.Debug/ServiceBricks.Cache.MongoDb.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.MongoDb.Debug/ServiceBricks.Cache.MongoDb.Debug.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/V1/ServiceBricks.Cache.MongoDb/ServiceBricks.Cache.MongoDb.csproj b/src/V1/ServiceBricks.Cache.MongoDb/ServiceBricks.Cache.MongoDb.csproj index 356cec1..237a75f 100644 --- a/src/V1/ServiceBricks.Cache.MongoDb/ServiceBricks.Cache.MongoDb.csproj +++ b/src/V1/ServiceBricks.Cache.MongoDb/ServiceBricks.Cache.MongoDb.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.MongoDb holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -29,10 +29,10 @@ - + - + diff --git a/src/V1/ServiceBricks.Cache.Postgres.Debug/ServiceBricks.Cache.Postgres.Debug.csproj b/src/V1/ServiceBricks.Cache.Postgres.Debug/ServiceBricks.Cache.Postgres.Debug.csproj index b0183bb..6d3c00d 100644 --- a/src/V1/ServiceBricks.Cache.Postgres.Debug/ServiceBricks.Cache.Postgres.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.Postgres.Debug/ServiceBricks.Cache.Postgres.Debug.csproj @@ -19,15 +19,8 @@ - - - - - - - - - - + + + diff --git a/src/V1/ServiceBricks.Cache.Postgres/Model/CachePostgresContext.cs b/src/V1/ServiceBricks.Cache.Postgres/Model/CachePostgresContext.cs index 5148db9..01ea042 100644 --- a/src/V1/ServiceBricks.Cache.Postgres/Model/CachePostgresContext.cs +++ b/src/V1/ServiceBricks.Cache.Postgres/Model/CachePostgresContext.cs @@ -6,7 +6,7 @@ namespace ServiceBricks.Cache.Postgres { - // dotnet ef migrations add CacheV1 --context CachePostgresContext --startup-project ../Test/MigrationsHost + // dotnet ef migrations add CacheV1 --context CachePostgresContext --startup-project ../Tests/MigrationsHost /// /// This is the database context for the Cache module. @@ -47,7 +47,7 @@ public CachePostgresContext(DbContextOptions options) : ba /// /// Cache Data. /// - public virtual DbSet CacheData { get; set; } + public virtual DbSet CacheDatas { get; set; } /// /// OnModelCreating. @@ -62,6 +62,7 @@ protected override void OnModelCreating(ModelBuilder builder) // AI: Setup the entities to the model builder.Entity().HasKey(key => key.CacheKey); + builder.Entity().HasIndex(key => new { key.ExpirationDate }); // For background process } /// diff --git a/src/V1/ServiceBricks.Cache.Postgres/ServiceBricks.Cache.Postgres.csproj b/src/V1/ServiceBricks.Cache.Postgres/ServiceBricks.Cache.Postgres.csproj index 3cc403c..49deb5c 100644 --- a/src/V1/ServiceBricks.Cache.Postgres/ServiceBricks.Cache.Postgres.csproj +++ b/src/V1/ServiceBricks.Cache.Postgres/ServiceBricks.Cache.Postgres.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.Postgres holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -30,19 +30,11 @@ - + - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache.SqlServer.Debug/ServiceBricks.Cache.SqlServer.Debug.csproj b/src/V1/ServiceBricks.Cache.SqlServer.Debug/ServiceBricks.Cache.SqlServer.Debug.csproj index 5fbc347..b920a0e 100644 --- a/src/V1/ServiceBricks.Cache.SqlServer.Debug/ServiceBricks.Cache.SqlServer.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.SqlServer.Debug/ServiceBricks.Cache.SqlServer.Debug.csproj @@ -18,16 +18,9 @@ - - - - - - - - - - + + + diff --git a/src/V1/ServiceBricks.Cache.SqlServer/Model/CacheSqlServerContext.cs b/src/V1/ServiceBricks.Cache.SqlServer/Model/CacheSqlServerContext.cs index 46c77fc..7e67f63 100644 --- a/src/V1/ServiceBricks.Cache.SqlServer/Model/CacheSqlServerContext.cs +++ b/src/V1/ServiceBricks.Cache.SqlServer/Model/CacheSqlServerContext.cs @@ -6,7 +6,7 @@ namespace ServiceBricks.Cache.SqlServer { - // dotnet ef migrations add CacheV1 --context CacheSqlServerContext --startup-project ../Test/MigrationsHost + // dotnet ef migrations add CacheV1 --context CacheSqlServerContext --startup-project ../Tests/MigrationsHost /// /// This is the database context for the Cache module. @@ -47,7 +47,7 @@ public CacheSqlServerContext(DbContextOptions options) : /// /// Cache Data. /// - public virtual DbSet CacheData { get; set; } + public virtual DbSet CacheDatas { get; set; } /// /// OnModelCreating. @@ -62,6 +62,7 @@ protected override void OnModelCreating(ModelBuilder builder) // AI: Setup the entities to the model builder.Entity().HasKey(key => key.CacheKey); + builder.Entity().HasIndex(key => new { key.ExpirationDate }); // For background process } /// diff --git a/src/V1/ServiceBricks.Cache.SqlServer/ServiceBricks.Cache.SqlServer.csproj b/src/V1/ServiceBricks.Cache.SqlServer/ServiceBricks.Cache.SqlServer.csproj index 54366e5..4ab7cb6 100644 --- a/src/V1/ServiceBricks.Cache.SqlServer/ServiceBricks.Cache.SqlServer.csproj +++ b/src/V1/ServiceBricks.Cache.SqlServer/ServiceBricks.Cache.SqlServer.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.SqlServer holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -30,19 +30,11 @@ - + - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache.Sqlite.Debug/ServiceBricks.Cache.Sqlite.Debug.csproj b/src/V1/ServiceBricks.Cache.Sqlite.Debug/ServiceBricks.Cache.Sqlite.Debug.csproj index 495b854..8e2a6a3 100644 --- a/src/V1/ServiceBricks.Cache.Sqlite.Debug/ServiceBricks.Cache.Sqlite.Debug.csproj +++ b/src/V1/ServiceBricks.Cache.Sqlite.Debug/ServiceBricks.Cache.Sqlite.Debug.csproj @@ -19,16 +19,8 @@ - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache.Sqlite/Model/CacheSqliteContext.cs b/src/V1/ServiceBricks.Cache.Sqlite/Model/CacheSqliteContext.cs index 018fe0a..efc5955 100644 --- a/src/V1/ServiceBricks.Cache.Sqlite/Model/CacheSqliteContext.cs +++ b/src/V1/ServiceBricks.Cache.Sqlite/Model/CacheSqliteContext.cs @@ -7,7 +7,7 @@ namespace ServiceBricks.Cache.Sqlite { - // dotnet ef migrations add CacheV1 --context CacheSqliteContext --startup-project ../Test/MigrationsHost + // dotnet ef migrations add CacheV1 --context CacheSqliteContext --startup-project ../Tests/MigrationsHost /// /// This is the database context for the Cache module. @@ -47,7 +47,7 @@ public CacheSqliteContext(DbContextOptions options) : base(o /// /// Cache Data. /// - public virtual DbSet CacheData { get; set; } + public virtual DbSet CacheDatas { get; set; } /// /// OnModelCreating. @@ -57,11 +57,12 @@ protected override void OnModelCreating(ModelBuilder builder) { base.OnModelCreating(builder); - // AI: Set the default schema - builder.HasDefaultSchema(CacheSqliteConstants.DATABASE_SCHEMA_NAME); + // AI: Set the default schema (SQLite does not support schemas) + //builder.HasDefaultSchema(CacheSqliteConstants.DATABASE_SCHEMA_NAME); // AI: Setup the entities to the model builder.Entity().HasKey(key => key.CacheKey); + builder.Entity().HasIndex(key => new { key.ExpirationDate }); // For background process } /// diff --git a/src/V1/ServiceBricks.Cache.Sqlite/ServiceBricks.Cache.Sqlite.csproj b/src/V1/ServiceBricks.Cache.Sqlite/ServiceBricks.Cache.Sqlite.csproj index daf7d18..8a8c763 100644 --- a/src/V1/ServiceBricks.Cache.Sqlite/ServiceBricks.Cache.Sqlite.csproj +++ b/src/V1/ServiceBricks.Cache.Sqlite/ServiceBricks.Cache.Sqlite.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache.Sqlite holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -30,19 +30,11 @@ - + - - - - - - - - - - + + diff --git a/src/V1/ServiceBricks.Cache/Background/CacheExpirationTask.cs b/src/V1/ServiceBricks.Cache/Background/CacheExpirationTask.cs index 0faa9f4..3d68f5f 100644 --- a/src/V1/ServiceBricks.Cache/Background/CacheExpirationTask.cs +++ b/src/V1/ServiceBricks.Cache/Background/CacheExpirationTask.cs @@ -6,7 +6,7 @@ namespace ServiceBricks.Cache /// /// This is a background task that queries for expired data and deletes them. /// - public static class CacheExpirationTask + public static partial class CacheExpirationTask { /// /// Queue the work to the background task queue. @@ -30,7 +30,6 @@ public class Detail : ITaskDetail /// public class Worker : ITaskWork { - private readonly ILogger _logger; private readonly ICacheDataApiService _dataApiService; /// @@ -39,10 +38,8 @@ public class Worker : ITaskWork /// /// public Worker( - ILogger logger, ICacheDataApiService dataApiService) { - _logger = logger; _dataApiService = dataApiService; } @@ -56,6 +53,8 @@ public async Task DoWork(Detail detail, CancellationToken cancellationToken) { // AI: Create a query to find expired cache data. var query = new ServiceQueryRequestBuilder() + .IsNotNull(nameof(CacheDataDto.ExpirationDate)) + .And() .IsLessThanOrEqual(nameof(CacheDataDto.ExpirationDate), DateTimeOffset.UtcNow.ToString("o")) .Build(); @@ -66,10 +65,6 @@ public async Task DoWork(Detail detail, CancellationToken cancellationToken) foreach (var item in respExpired.Item.List) { - // AI: Just in case the expiration date is not set, skip the item. - if (!item.ExpirationDate.HasValue) - continue; - // AI: Delete the expired cache data. var respDelete = await _dataApiService.DeleteAsync(item.StorageKey); } diff --git a/src/V1/ServiceBricks.Cache/Background/CacheExpirationTimer.cs b/src/V1/ServiceBricks.Cache/Background/CacheExpirationTimer.cs index ebfe34d..c596b76 100644 --- a/src/V1/ServiceBricks.Cache/Background/CacheExpirationTimer.cs +++ b/src/V1/ServiceBricks.Cache/Background/CacheExpirationTimer.cs @@ -6,7 +6,7 @@ namespace ServiceBricks.Cache /// This is a timer to execute the CacheExpirationTask to expire stale cache data. /// Do not seal the class to allow for overriding values. /// - public class CacheExpirationTimer : TaskTimerHostedService + public partial class CacheExpirationTimer : TaskTimerHostedService { /// /// Constructor. diff --git a/src/V1/ServiceBricks.Cache/Controllers/CacheDataApiController.cs b/src/V1/ServiceBricks.Cache/Controllers/CacheDataApiController.cs index db61c6f..ac97c84 100644 --- a/src/V1/ServiceBricks.Cache/Controllers/CacheDataApiController.cs +++ b/src/V1/ServiceBricks.Cache/Controllers/CacheDataApiController.cs @@ -11,7 +11,7 @@ namespace ServiceBricks.Cache [Produces("application/json")] public partial class CacheDataApiController : AdminPolicyApiController, ICacheDataApiController { - protected readonly ICacheDataApiService _dataApiService; + protected readonly ICacheDataApiService _cacheDataApiService; /// /// Constructor. @@ -19,11 +19,11 @@ public partial class CacheDataApiController : AdminPolicyApiController /// public CacheDataApiController( - ICacheDataApiService dataApiService, + ICacheDataApiService cacheDataApiService, IOptions apiOptions) - : base(dataApiService, apiOptions) + : base(cacheDataApiService, apiOptions) { - _dataApiService = dataApiService; + _cacheDataApiService = cacheDataApiService; } } } \ No newline at end of file diff --git a/src/V1/ServiceBricks.Cache/ServiceBricks.Cache.csproj b/src/V1/ServiceBricks.Cache/ServiceBricks.Cache.csproj index 5b147a6..d7b558c 100644 --- a/src/V1/ServiceBricks.Cache/ServiceBricks.Cache.csproj +++ b/src/V1/ServiceBricks.Cache/ServiceBricks.Cache.csproj @@ -1,7 +1,7 @@ - 1.1.0-a + 1.1.0-b ServiceBricks - The open source microservices foundation. Visit https://ServiceBricks.com to learn more. ServiceBricks.Cache holomodular @@ -19,7 +19,7 @@ False git https://github.com/holomodular/ServiceBricks - False + True @@ -29,7 +29,7 @@ - + diff --git a/src/V1/Tests/MigrationsHost/MigrationsHost.csproj b/src/V1/Tests/MigrationsHost/MigrationsHost.csproj index 6796764..3889c63 100644 --- a/src/V1/Tests/MigrationsHost/MigrationsHost.csproj +++ b/src/V1/Tests/MigrationsHost/MigrationsHost.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -26,7 +26,7 @@ - + diff --git a/src/V1/Tests/MigrationsHost/StartupMigrations.cs b/src/V1/Tests/MigrationsHost/StartupMigrations.cs index d34f0c1..b271a1c 100644 --- a/src/V1/Tests/MigrationsHost/StartupMigrations.cs +++ b/src/V1/Tests/MigrationsHost/StartupMigrations.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; - -//using ServiceBricks.Cache.Postgres; +using ServiceBricks.Cache.Sqlite; +using ServiceBricks.Cache.SqlServer; +using ServiceBricks.Cache.Postgres; namespace ServiceBricks.Xunit { @@ -22,7 +23,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) //UNCOMMENT THE ONE YOU NEED //************************** //services.AddServiceBricksCachePostgres(Configuration); - //services.AddServiceBricksCacheSqlServer(Configuration); + services.AddServiceBricksCacheSqlServer(Configuration); //services.AddServiceBricksCacheSqlite(Configuration); // Remove all background tasks/timers for unit testing @@ -39,7 +40,7 @@ public virtual void Configure(IApplicationBuilder app) //UNCOMMENT THE ONE YOU NEED //************************** //app.StartServiceBricksCachePostgres(); - //app.StartServiceBricksCacheSqlServer(); + app.StartServiceBricksCacheSqlServer(); //app.StartServiceBricksCacheSqlite(); } } diff --git a/src/V1/Tests/MigrationsHost/SystemManager.cs b/src/V1/Tests/MigrationsHost/SystemManager.cs index 935eee3..b57cc1a 100644 --- a/src/V1/Tests/MigrationsHost/SystemManager.cs +++ b/src/V1/Tests/MigrationsHost/SystemManager.cs @@ -48,23 +48,26 @@ public static ISystemManager GetSystemManager(Type startupType) private CancellationTokenSource CancellationTokenSource; private SemaphoreSlim _signal = new SemaphoreSlim(0); - public virtual IWebHostBuilder CreateWebHostBuilder(Type startupType) + public virtual IHostBuilder CreateWebHostBuilder(Type startupType) { - return new WebHostBuilder() - .UseContentRoot(Directory.GetCurrentDirectory()) - .ConfigureAppConfiguration(config => - { - config.AddAppSettingsConfig(); - }) - .ConfigureLogging((hostingContext, logging) => - { - logging.ClearProviders(); - logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); - logging.AddConsole(); - logging.AddDebug(); - }) - .UseEnvironment("Development") - .UseStartup(startupType); + return Host.CreateDefaultBuilder() + .ConfigureWebHostDefaults(builder => + { + builder.UseContentRoot(Directory.GetCurrentDirectory()) + .ConfigureAppConfiguration(config => + { + config.AddAppSettingsConfig(); + }) + .ConfigureLogging((hostingContext, logging) => + { + logging.ClearProviders(); + logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); + logging.AddConsole(); + logging.AddDebug(); + }) + .UseEnvironment("Development") + .UseStartup(startupType); + }); } public virtual void StopSystem() @@ -80,13 +83,14 @@ public virtual void StartSystem(Type startupType) // Create host builder var webHostBuilder = CreateWebHostBuilder(startupType); - //var build = webHostBuilder.Build(); - //ServiceProvider = build.Services; - //Configuration = (IConfiguration)build.Services.GetService(typeof(IConfiguration)); + var build = webHostBuilder.Build(); + ServiceProvider = build.Services; + Configuration = (IConfiguration)build.Services.GetService(typeof(IConfiguration)); + build.Start(); - TestServer = new Microsoft.AspNetCore.TestHost.TestServer(webHostBuilder); - ServiceProvider = TestServer.Services; - Configuration = (IConfiguration)TestServer.Host.Services.GetService(typeof(IConfiguration)); + //TestServer = new Microsoft.AspNetCore.TestHost.TestServer(webHostBuilder); + //ServiceProvider = TestServer.Services; + //Configuration = (IConfiguration)TestServer.Host.Services.GetService(typeof(IConfiguration)); CancellationTokenSource = new CancellationTokenSource(); diff --git a/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet6/ServiceBricks.Cache.AzureDataTables.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet6/ServiceBricks.Cache.AzureDataTables.XunitNet6.csproj index 968afe2..08842e6 100644 --- a/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet6/ServiceBricks.Cache.AzureDataTables.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet6/ServiceBricks.Cache.AzureDataTables.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet8/ServiceBricks.Cache.AzureDataTables.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet8/ServiceBricks.Cache.AzureDataTables.XunitNet8.csproj index d784630..4b4040c 100644 --- a/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet8/ServiceBricks.Cache.AzureDataTables.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.AzureDataTables.XunitNet8/ServiceBricks.Cache.AzureDataTables.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet6/ServiceBricks.Cache.Client.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet6/ServiceBricks.Cache.Client.XunitNet6.csproj index a2d16b5..62e34fd 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet6/ServiceBricks.Cache.Client.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet6/ServiceBricks.Cache.Client.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet8/ServiceBricks.Cache.Client.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet8/ServiceBricks.Cache.Client.XunitNet8.csproj index f3eb06c..ba223cf 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet8/ServiceBricks.Cache.Client.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Client.XunitNet8/ServiceBricks.Cache.Client.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet6/ServiceBricks.Cache.Cosmos.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet6/ServiceBricks.Cache.Cosmos.XunitNet6.csproj index f8635ae..97ffc1e 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet6/ServiceBricks.Cache.Cosmos.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet6/ServiceBricks.Cache.Cosmos.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet8/ServiceBricks.Cache.Cosmos.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet8/ServiceBricks.Cache.Cosmos.XunitNet8.csproj index a311d91..b3a221b 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet8/ServiceBricks.Cache.Cosmos.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Cosmos.XunitNet8/ServiceBricks.Cache.Cosmos.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet6/ServiceBricks.Cache.InMemory.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet6/ServiceBricks.Cache.InMemory.XunitNet6.csproj index 26a6fce..67214b1 100644 --- a/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet6/ServiceBricks.Cache.InMemory.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet6/ServiceBricks.Cache.InMemory.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet8/ServiceBricks.Cache.InMemory.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet8/ServiceBricks.Cache.InMemory.XunitNet8.csproj index 139f7cd..9627b23 100644 --- a/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet8/ServiceBricks.Cache.InMemory.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.InMemory.XunitNet8/ServiceBricks.Cache.InMemory.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet6/ServiceBricks.Cache.MongoDb.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet6/ServiceBricks.Cache.MongoDb.XunitNet6.csproj index f983206..57144bc 100644 --- a/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet6/ServiceBricks.Cache.MongoDb.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet6/ServiceBricks.Cache.MongoDb.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet8/ServiceBricks.Cache.MongoDb.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet8/ServiceBricks.Cache.MongoDb.XunitNet8.csproj index e862ab0..71a0c88 100644 --- a/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet8/ServiceBricks.Cache.MongoDb.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.MongoDb.XunitNet8/ServiceBricks.Cache.MongoDb.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet6/ServiceBricks.Cache.Postgres.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet6/ServiceBricks.Cache.Postgres.XunitNet6.csproj index a42d1b3..1960aa4 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet6/ServiceBricks.Cache.Postgres.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet6/ServiceBricks.Cache.Postgres.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet8/ServiceBricks.Cache.Postgres.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet8/ServiceBricks.Cache.Postgres.XunitNet8.csproj index b620611..8e54d5c 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet8/ServiceBricks.Cache.Postgres.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Postgres.XunitNet8/ServiceBricks.Cache.Postgres.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet6/ServiceBricks.Cache.SqlServer.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet6/ServiceBricks.Cache.SqlServer.XunitNet6.csproj index 07a7f6b..be398b4 100644 --- a/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet6/ServiceBricks.Cache.SqlServer.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet6/ServiceBricks.Cache.SqlServer.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet8/ServiceBricks.Cache.SqlServer.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet8/ServiceBricks.Cache.SqlServer.XunitNet8.csproj index 7860b60..427dd74 100644 --- a/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet8/ServiceBricks.Cache.SqlServer.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.SqlServer.XunitNet8/ServiceBricks.Cache.SqlServer.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet6/ServiceBricks.Cache.Sqlite.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet6/ServiceBricks.Cache.Sqlite.XunitNet6.csproj index 4580784..59ce91e 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet6/ServiceBricks.Cache.Sqlite.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet6/ServiceBricks.Cache.Sqlite.XunitNet6.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet8/ServiceBricks.Cache.Sqlite.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet8/ServiceBricks.Cache.Sqlite.XunitNet8.csproj index 79a2565..1c2db51 100644 --- a/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet8/ServiceBricks.Cache.Sqlite.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.Sqlite.XunitNet8/ServiceBricks.Cache.Sqlite.XunitNet8.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/V1/Tests/ServiceBricks.Cache.XunitNet6/ServiceBricks.Cache.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Cache.XunitNet6/ServiceBricks.Cache.XunitNet6.csproj index 5f404ff..ebab487 100644 --- a/src/V1/Tests/ServiceBricks.Cache.XunitNet6/ServiceBricks.Cache.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.XunitNet6/ServiceBricks.Cache.XunitNet6.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -10,18 +10,19 @@ + - + - + diff --git a/src/V1/Tests/ServiceBricks.Cache.XunitNet7/ServiceBricks.Cache.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Cache.XunitNet7/ServiceBricks.Cache.XunitNet7.csproj index 0a397b7..c67e145 100644 --- a/src/V1/Tests/ServiceBricks.Cache.XunitNet7/ServiceBricks.Cache.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.XunitNet7/ServiceBricks.Cache.XunitNet7.csproj @@ -10,11 +10,12 @@ + - + diff --git a/src/V1/Tests/ServiceBricks.Cache.XunitNet8/ServiceBricks.Cache.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Cache.XunitNet8/ServiceBricks.Cache.XunitNet8.csproj index 06ac99b..6b16549 100644 --- a/src/V1/Tests/ServiceBricks.Cache.XunitNet8/ServiceBricks.Cache.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Cache.XunitNet8/ServiceBricks.Cache.XunitNet8.csproj @@ -10,19 +10,20 @@ + - + - + diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTest.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTest.cs new file mode 100644 index 0000000..a3ab126 --- /dev/null +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTest.cs @@ -0,0 +1,70 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; +using ServiceBricks.Cache; + +namespace ServiceBricks.Xunit +{ + [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] + public abstract class CacheDataApiControllerTest : ApiControllerTest + { + [Fact] + public virtual async Task Update_CreateDateAsync() + { + var model = TestManager.GetMinimumDataObject(); + var dto = await CreateBaseAsync(model); + + DateTimeOffset startingCreateDate = dto.CreateDate; + + //Update the CreateDate property + dto.CreateDate = DateTime.UtcNow; + + //Call Update + var controller = TestManager.GetController(SystemManager.ServiceProvider); + var respUpdate = await controller.UpdateAsync(dto); + if (respUpdate is OkObjectResult okResult) + { + Assert.True(okResult.Value != null); + if (okResult.Value is CacheDataDto obj) + { + Assert.True(obj.CreateDate == startingCreateDate); + } + else + Assert.Fail(""); + } + else + Assert.Fail(""); + + // Cleanup + await DeleteBaseAsync(dto); + } + + [Fact] + public virtual async Task UpdateDateConcurrencyAsync() + { + var model = TestManager.GetMinimumDataObject(); + var dto = await CreateBaseAsync(model); + + DateTimeOffset startingUpdateDate = dto.UpdateDate; + + //Update the Update property to be in the past + dto.UpdateDate = dto.UpdateDate.AddSeconds(-1); + + //Call Update + var controller = TestManager.GetController(SystemManager.ServiceProvider); + var respUpdate = await controller.UpdateAsync(dto); + if (respUpdate is BadRequestObjectResult badResult) + { + Assert.True(badResult.Value != null); + if (badResult.Value is ProblemDetails problemDetails) + Assert.True(problemDetails.Title == LocalizationResource.ERROR_SYSTEM); + else + Assert.Fail(""); + } + else + Assert.Fail(""); + + // Cleanup + await DeleteBaseAsync(dto); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestAzureDataTables.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestAzureDataTables.cs index 093d9b7..7e53bc3 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestAzureDataTables.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestAzureDataTables.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit.Integration { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestAzureDataTables : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestAzureDataTables() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupAzureDataTables)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestCosmos.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestCosmos.cs index 578588f..47bcc15 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestCosmos.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestCosmos.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit.Integration { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestCosmos : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestCosmos() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupCosmos)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestInMemory.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestInMemory.cs index 3099dc0..c998a57 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestInMemory.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestInMemory.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestInMemory : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestInMemory() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupInMemory)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestMongoDb.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestMongoDb.cs index c89d77d..7d1d8d8 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestMongoDb.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestMongoDb.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit.Integration { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestMongoDb : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestMongoDb() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupMongoDb)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestPostgres.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestPostgres.cs index e0d11a0..bcf4b09 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestPostgres.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestPostgres.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit.Integration { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestPostgres : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestPostgres() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupPostgres)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlServer.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlServer.cs index 4593b8d..e40ce05 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlServer.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlServer.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit.Integration { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestSqlServer : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestSqlServer() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupSqlServer)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlite.cs b/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlite.cs index b82ba9d..6ecebc6 100644 --- a/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlite.cs +++ b/src/V1/Tests/TestFiles/CacheDataApiControllerTestSqlite.cs @@ -5,40 +5,12 @@ namespace ServiceBricks.Xunit.Integration { [Collection(ServiceBricks.Xunit.Constants.SERVICEBRICKS_COLLECTION_NAME)] - public class CacheDataApiControllerTest : ApiControllerTest + public class CacheDataApiControllerTestSqlite : CacheDataApiControllerTest { - public CacheDataApiControllerTest() + public CacheDataApiControllerTestSqlite() { SystemManager = ServiceBricksSystemManager.GetSystemManager(typeof(StartupSqlite)); TestManager = SystemManager.ServiceProvider.GetRequiredService>(); } - - [Fact] - public virtual async Task Update_CreateDateAsync() - { - var model = TestManager.GetMinimumDataObject(); - var dto = await CreateBaseAsync(model); - - DateTimeOffset startingCreateDate = dto.CreateDate; - - //Update the CreateDate property - dto.CreateDate = DateTime.UtcNow; - - //Call Update - var controller = TestManager.GetController(SystemManager.ServiceProvider); - var respUpdate = await controller.UpdateAsync(dto); - if (respUpdate is OkObjectResult okResult) - { - Assert.True(okResult.Value != null); - if (okResult.Value is CacheDataDto obj) - { - Assert.True(obj.CreateDate == startingCreateDate); - } - else - Assert.Fail(""); - } - else - Assert.Fail(""); - } } } \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/appsettings.json b/src/V1/Tests/TestFiles/appsettings.json index 9af7b7e..c2b30c1 100644 --- a/src/V1/Tests/TestFiles/appsettings.json +++ b/src/V1/Tests/TestFiles/appsettings.json @@ -21,21 +21,21 @@ "ConnectionString": "DefaultEndpointsProtocol=" }, "SqlServer": { - "ConnectionString": "Data Source=localhost;Database=ServiceBricks;Trusted_Connection=yes;Encrypt=false;" + "ConnectionString": "Data Source=localhost;Database=ServiceBricksCache;Trusted_Connection=yes;Encrypt=false;" }, "Sqlite": { "ConnectionString": "Data Source=c:\\temp\\ServiceBricksCache.sqlite" }, "Postgres": { - "ConnectionString": "Server=localhost;Port=5432;Database=servicebricks;User Id=postgres;Password=MyPassword" + "ConnectionString": "Server=localhost;Port=5432;Database=ServiceBricksCache;User Id=postgres;Password=MyPassword" }, "Cosmos": { "ConnectionString": "AccountEndpoint=", - "Database": "ServiceBricks" + "Database": "ServiceBricksCache" }, "MongoDb": { "ConnectionString": "mongodb://localhost:27017", - "Database": "ServiceBricks" + "Database": "ServiceBricksCache" } } } diff --git a/src/V1/Tests/TestFiles/webapp/appsettings.json b/src/V1/Tests/TestFiles/webapp/appsettings.json index fc05bb4..0c25d7c 100644 --- a/src/V1/Tests/TestFiles/webapp/appsettings.json +++ b/src/V1/Tests/TestFiles/webapp/appsettings.json @@ -17,48 +17,6 @@ "ReturnResponseObject": true }, - // Logging Microservice Settings - "Logging": { - // Log web requests - "WebRequestMessage": { - "EnableLogging": true, - "EnableRequestIPAddress": true, - "EnableRequestBody": false, - "EnableRequestBodyOnError": true, - "EnableRequestProtocol": true, - "EnableRequestScheme": true, - "EnableRequestMethod": true, - "EnableRequestPath": true, - "EnableRequestPathBase": true, - "EnableRequestQueryString": true, - "EnableRequestQuery": false, - "EnableRequestRouteValues": false, - "EnableRequestHost": false, - "EnableRequestHasFormContentType": true, - "EnableRequestCookies": false, - "EnableRequestContentType": true, - "EnableRequestContentLength": true, - "EnableRequestHeaders": false, - "EnableRequestIsHttps": true, - "EnableRequestUserId": true, - "EnableResponseStatusCode": true, - "EnableResponseHeaders": false, - "EnableResponseCookies": false, - "EnableResponseContentType": true, - "EnableResponseContentLength": true, - "EnableResponseTotalMilliseconds": true, - "EnableResponseBody": false, - "EnableExcludeRequestPaths": true, - "ExcludeRequestPaths": [ - "/css/", - "/img/", - "/js/", - "/lib/", - "/webfonts/" - ] - } - }, - "ServiceBus": { "Azure": { "ConnectionString": "ConnectionString", @@ -71,21 +29,21 @@ "ConnectionString": "DefaultEndpointsProtocol=" }, "SqlServer": { - "ConnectionString": "Data Source=localhost;Database=ServiceBricks;Trusted_Connection=yes;Encrypt=false;" + "ConnectionString": "Data Source=localhost;Database=ServiceBricksCache;Trusted_Connection=yes;Encrypt=false;" }, "Sqlite": { "ConnectionString": "Data Source=c:\\temp\\ServiceBricksCache.sqlite" }, "Postgres": { - "ConnectionString": "Server=localhost;Port=5432;Database=servicebricks;User Id=postgres;Password=MyPassword" + "ConnectionString": "Server=localhost;Port=5432;Database=ServiceBricksCache;User Id=postgres;Password=MyPassword" }, "Cosmos": { "ConnectionString": "AccountEndpoint=", - "Database": "ServiceBricks" + "Database": "ServiceBricksCache" }, "MongoDb": { "ConnectionString": "mongodb://localhost:27017", - "Database": "ServiceBricks" + "Database": "ServiceBricksCache" } } } diff --git a/src/V1/Tests/WebAppNet6/Extensions/ApplicationBuilderExtensions.cs b/src/V1/Tests/WebAppNet6/Extensions/ApplicationBuilderExtensions.cs index 23c5513..6a046e3 100644 --- a/src/V1/Tests/WebAppNet6/Extensions/ApplicationBuilderExtensions.cs +++ b/src/V1/Tests/WebAppNet6/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,6 @@ using ServiceBricks; -using ServiceBricks.Logging; + +//using ServiceBricks.Logging; namespace WebApp.Extensions { @@ -7,8 +8,8 @@ public static class ApplicationBuilderExtensions { private static IApplicationBuilder RegisterMiddleware(this IApplicationBuilder app) { - app.UseMiddleware(); - app.UseMiddleware(); + //app.UseMiddleware(); + //app.UseMiddleware(); app.UseMiddleware(); return app; } diff --git a/src/V1/Tests/WebAppNet6/Program.cs b/src/V1/Tests/WebAppNet6/Program.cs index d44007f..aad8fb3 100644 --- a/src/V1/Tests/WebAppNet6/Program.cs +++ b/src/V1/Tests/WebAppNet6/Program.cs @@ -1,5 +1,6 @@ using ServiceBricks; -using ServiceBricks.Logging; + +//using ServiceBricks.Logging; namespace WebApp { @@ -23,7 +24,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); logging.AddConsole(); logging.AddDebug(); - logging.AddServiceBricksLogging(); + //logging.AddServiceBricksLogging(); }) .ConfigureWebHostDefaults(webBuilder => { diff --git a/src/V1/Tests/WebAppNet6/StartupAzureDataTables.cs b/src/V1/Tests/WebAppNet6/StartupAzureDataTables.cs index b0f0c10..03eb007 100644 --- a/src/V1/Tests/WebAppNet6/StartupAzureDataTables.cs +++ b/src/V1/Tests/WebAppNet6/StartupAzureDataTables.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.AzureDataTables; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupAzureDataTables(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheAzureDataTables(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheAzureDataTables(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/StartupCosmos.cs b/src/V1/Tests/WebAppNet6/StartupCosmos.cs index 58fc021..40d58ee 100644 --- a/src/V1/Tests/WebAppNet6/StartupCosmos.cs +++ b/src/V1/Tests/WebAppNet6/StartupCosmos.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Cosmos; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupCosmos(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheCosmos(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheCosmos(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/StartupInMemory.cs b/src/V1/Tests/WebAppNet6/StartupInMemory.cs index 835387c..8a84f77 100644 --- a/src/V1/Tests/WebAppNet6/StartupInMemory.cs +++ b/src/V1/Tests/WebAppNet6/StartupInMemory.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.InMemory; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupInMemory(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheInMemory(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheInMemory(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/StartupMongoDb.cs b/src/V1/Tests/WebAppNet6/StartupMongoDb.cs index 1e97d49..7df79d9 100644 --- a/src/V1/Tests/WebAppNet6/StartupMongoDb.cs +++ b/src/V1/Tests/WebAppNet6/StartupMongoDb.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.MongoDb; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupMongoDb(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheMongoDb(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheMongoDb(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/StartupPostgres.cs b/src/V1/Tests/WebAppNet6/StartupPostgres.cs index e2b1987..68fade0 100644 --- a/src/V1/Tests/WebAppNet6/StartupPostgres.cs +++ b/src/V1/Tests/WebAppNet6/StartupPostgres.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Postgres; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupPostgres(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCachePostgres(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCachePostgres(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/StartupSqlServer.cs b/src/V1/Tests/WebAppNet6/StartupSqlServer.cs index 54c8a7c..81b3290 100644 --- a/src/V1/Tests/WebAppNet6/StartupSqlServer.cs +++ b/src/V1/Tests/WebAppNet6/StartupSqlServer.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.SqlServer; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupSqlServer(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheSqlServer(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheSqlServer(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/StartupSqlite.cs b/src/V1/Tests/WebAppNet6/StartupSqlite.cs index e7124e5..5d2bed3 100644 --- a/src/V1/Tests/WebAppNet6/StartupSqlite.cs +++ b/src/V1/Tests/WebAppNet6/StartupSqlite.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Sqlite; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupSqlite(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheSqlite(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheSqlite(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet6/WebAppNet6.csproj b/src/V1/Tests/WebAppNet6/WebAppNet6.csproj index 09b18a3..d019ef8 100644 --- a/src/V1/Tests/WebAppNet6/WebAppNet6.csproj +++ b/src/V1/Tests/WebAppNet6/WebAppNet6.csproj @@ -15,9 +15,8 @@ - - - + + diff --git a/src/V1/Tests/WebAppNet7/Extensions/ApplicationBuilderExtensions.cs b/src/V1/Tests/WebAppNet7/Extensions/ApplicationBuilderExtensions.cs index 23c5513..6a046e3 100644 --- a/src/V1/Tests/WebAppNet7/Extensions/ApplicationBuilderExtensions.cs +++ b/src/V1/Tests/WebAppNet7/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,6 @@ using ServiceBricks; -using ServiceBricks.Logging; + +//using ServiceBricks.Logging; namespace WebApp.Extensions { @@ -7,8 +8,8 @@ public static class ApplicationBuilderExtensions { private static IApplicationBuilder RegisterMiddleware(this IApplicationBuilder app) { - app.UseMiddleware(); - app.UseMiddleware(); + //app.UseMiddleware(); + //app.UseMiddleware(); app.UseMiddleware(); return app; } diff --git a/src/V1/Tests/WebAppNet7/Program.cs b/src/V1/Tests/WebAppNet7/Program.cs index d44007f..aad8fb3 100644 --- a/src/V1/Tests/WebAppNet7/Program.cs +++ b/src/V1/Tests/WebAppNet7/Program.cs @@ -1,5 +1,6 @@ using ServiceBricks; -using ServiceBricks.Logging; + +//using ServiceBricks.Logging; namespace WebApp { @@ -23,7 +24,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); logging.AddConsole(); logging.AddDebug(); - logging.AddServiceBricksLogging(); + //logging.AddServiceBricksLogging(); }) .ConfigureWebHostDefaults(webBuilder => { diff --git a/src/V1/Tests/WebAppNet7/StartupAzureDataTables.cs b/src/V1/Tests/WebAppNet7/StartupAzureDataTables.cs index b0f0c10..03eb007 100644 --- a/src/V1/Tests/WebAppNet7/StartupAzureDataTables.cs +++ b/src/V1/Tests/WebAppNet7/StartupAzureDataTables.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.AzureDataTables; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupAzureDataTables(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheAzureDataTables(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheAzureDataTables(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/StartupCosmos.cs b/src/V1/Tests/WebAppNet7/StartupCosmos.cs index 58fc021..40d58ee 100644 --- a/src/V1/Tests/WebAppNet7/StartupCosmos.cs +++ b/src/V1/Tests/WebAppNet7/StartupCosmos.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Cosmos; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupCosmos(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheCosmos(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheCosmos(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/StartupInMemory.cs b/src/V1/Tests/WebAppNet7/StartupInMemory.cs index 835387c..8a84f77 100644 --- a/src/V1/Tests/WebAppNet7/StartupInMemory.cs +++ b/src/V1/Tests/WebAppNet7/StartupInMemory.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.InMemory; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupInMemory(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheInMemory(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheInMemory(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/StartupMongoDb.cs b/src/V1/Tests/WebAppNet7/StartupMongoDb.cs index 1e97d49..7df79d9 100644 --- a/src/V1/Tests/WebAppNet7/StartupMongoDb.cs +++ b/src/V1/Tests/WebAppNet7/StartupMongoDb.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.MongoDb; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupMongoDb(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheMongoDb(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheMongoDb(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/StartupPostgres.cs b/src/V1/Tests/WebAppNet7/StartupPostgres.cs index e2b1987..68fade0 100644 --- a/src/V1/Tests/WebAppNet7/StartupPostgres.cs +++ b/src/V1/Tests/WebAppNet7/StartupPostgres.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Postgres; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupPostgres(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCachePostgres(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCachePostgres(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/StartupSqlServer.cs b/src/V1/Tests/WebAppNet7/StartupSqlServer.cs index 54c8a7c..81b3290 100644 --- a/src/V1/Tests/WebAppNet7/StartupSqlServer.cs +++ b/src/V1/Tests/WebAppNet7/StartupSqlServer.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.SqlServer; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupSqlServer(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheSqlServer(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheSqlServer(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/StartupSqlite.cs b/src/V1/Tests/WebAppNet7/StartupSqlite.cs index e7124e5..5d2bed3 100644 --- a/src/V1/Tests/WebAppNet7/StartupSqlite.cs +++ b/src/V1/Tests/WebAppNet7/StartupSqlite.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Sqlite; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupSqlite(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheSqlite(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheSqlite(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet7/WebAppNet7.csproj b/src/V1/Tests/WebAppNet7/WebAppNet7.csproj index 1a9722b..f01a550 100644 --- a/src/V1/Tests/WebAppNet7/WebAppNet7.csproj +++ b/src/V1/Tests/WebAppNet7/WebAppNet7.csproj @@ -16,8 +16,7 @@ - - + diff --git a/src/V1/Tests/WebAppNet8/Extensions/ApplicationBuilderExtensions.cs b/src/V1/Tests/WebAppNet8/Extensions/ApplicationBuilderExtensions.cs index 23c5513..6a046e3 100644 --- a/src/V1/Tests/WebAppNet8/Extensions/ApplicationBuilderExtensions.cs +++ b/src/V1/Tests/WebAppNet8/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,6 @@ using ServiceBricks; -using ServiceBricks.Logging; + +//using ServiceBricks.Logging; namespace WebApp.Extensions { @@ -7,8 +8,8 @@ public static class ApplicationBuilderExtensions { private static IApplicationBuilder RegisterMiddleware(this IApplicationBuilder app) { - app.UseMiddleware(); - app.UseMiddleware(); + //app.UseMiddleware(); + //app.UseMiddleware(); app.UseMiddleware(); return app; } diff --git a/src/V1/Tests/WebAppNet8/Program.cs b/src/V1/Tests/WebAppNet8/Program.cs index d44007f..aad8fb3 100644 --- a/src/V1/Tests/WebAppNet8/Program.cs +++ b/src/V1/Tests/WebAppNet8/Program.cs @@ -1,5 +1,6 @@ using ServiceBricks; -using ServiceBricks.Logging; + +//using ServiceBricks.Logging; namespace WebApp { @@ -23,7 +24,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); logging.AddConsole(); logging.AddDebug(); - logging.AddServiceBricksLogging(); + //logging.AddServiceBricksLogging(); }) .ConfigureWebHostDefaults(webBuilder => { diff --git a/src/V1/Tests/WebAppNet8/StartupAzureDataTables.cs b/src/V1/Tests/WebAppNet8/StartupAzureDataTables.cs index b0f0c10..03eb007 100644 --- a/src/V1/Tests/WebAppNet8/StartupAzureDataTables.cs +++ b/src/V1/Tests/WebAppNet8/StartupAzureDataTables.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.AzureDataTables; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupAzureDataTables(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheAzureDataTables(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheAzureDataTables(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/StartupCosmos.cs b/src/V1/Tests/WebAppNet8/StartupCosmos.cs index 58fc021..40d58ee 100644 --- a/src/V1/Tests/WebAppNet8/StartupCosmos.cs +++ b/src/V1/Tests/WebAppNet8/StartupCosmos.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Cosmos; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupCosmos(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheCosmos(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheCosmos(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/StartupInMemory.cs b/src/V1/Tests/WebAppNet8/StartupInMemory.cs index 835387c..8a84f77 100644 --- a/src/V1/Tests/WebAppNet8/StartupInMemory.cs +++ b/src/V1/Tests/WebAppNet8/StartupInMemory.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.InMemory; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupInMemory(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheInMemory(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheInMemory(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/StartupMongoDb.cs b/src/V1/Tests/WebAppNet8/StartupMongoDb.cs index 1e97d49..7df79d9 100644 --- a/src/V1/Tests/WebAppNet8/StartupMongoDb.cs +++ b/src/V1/Tests/WebAppNet8/StartupMongoDb.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.MongoDb; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupMongoDb(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheMongoDb(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheMongoDb(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/StartupPostgres.cs b/src/V1/Tests/WebAppNet8/StartupPostgres.cs index e2b1987..68fade0 100644 --- a/src/V1/Tests/WebAppNet8/StartupPostgres.cs +++ b/src/V1/Tests/WebAppNet8/StartupPostgres.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Postgres; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupPostgres(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCachePostgres(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCachePostgres(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/StartupSqlServer.cs b/src/V1/Tests/WebAppNet8/StartupSqlServer.cs index 54c8a7c..81b3290 100644 --- a/src/V1/Tests/WebAppNet8/StartupSqlServer.cs +++ b/src/V1/Tests/WebAppNet8/StartupSqlServer.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.SqlServer; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupSqlServer(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheSqlServer(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheSqlServer(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/StartupSqlite.cs b/src/V1/Tests/WebAppNet8/StartupSqlite.cs index e7124e5..5d2bed3 100644 --- a/src/V1/Tests/WebAppNet8/StartupSqlite.cs +++ b/src/V1/Tests/WebAppNet8/StartupSqlite.cs @@ -1,6 +1,7 @@ using ServiceBricks; using ServiceBricks.Cache.Sqlite; -using ServiceBricks.Logging.InMemory; + +//using ServiceBricks.Logging.InMemory; using WebApp.Extensions; namespace WebApp @@ -17,7 +18,7 @@ public StartupSqlite(IConfiguration configuration) public virtual void ConfigureServices(IServiceCollection services) { services.AddServiceBricks(Configuration); - services.AddServiceBricksLoggingInMemory(Configuration); + //services.AddServiceBricksLoggingInMemory(Configuration); services.AddServiceBricksCacheSqlite(Configuration); services.AddCustomWebsite(Configuration); services.AddServiceBricksComplete(); @@ -26,7 +27,7 @@ public virtual void ConfigureServices(IServiceCollection services) public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) { app.StartServiceBricks(); - app.StartServiceBricksLoggingInMemory(); + //app.StartServiceBricksLoggingInMemory(); app.StartServiceBricksCacheSqlite(); app.StartCustomWebsite(webHostEnvironment); var logger = app.ApplicationServices.GetRequiredService>(); diff --git a/src/V1/Tests/WebAppNet8/WebAppNet8.csproj b/src/V1/Tests/WebAppNet8/WebAppNet8.csproj index 9e16bc6..c135240 100644 --- a/src/V1/Tests/WebAppNet8/WebAppNet8.csproj +++ b/src/V1/Tests/WebAppNet8/WebAppNet8.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -15,9 +15,8 @@ - - - + +