diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 4466ccb..b40d9e2 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,3 +1,17 @@ +# 1.2.0 +- Upgrade ServiceBricks Version and all related packages to latest version +- Fix for WebRequestMessage to write to in-memory queue and save on background timer and task, same as CustomLogger +- Remove resources folder from webapp projects + +# 1.1.3 +- Upgrade ServiceBricks Version + +# 1.1.2 +- Upgrade ServiceBricks Version + +# 1.1.1 +- Upgrade ServiceBricks Version + # 1.1.0 - Official Production Release diff --git a/ServiceBricksLoggingV1.sln b/ServiceBricksLoggingV1.sln index 0e4b0f3..83ed73c 100644 --- a/ServiceBricksLoggingV1.sln +++ b/ServiceBricksLoggingV1.sln @@ -93,6 +93,28 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebAppNet8", "src\V1\Tests\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.Microservice", "src\V1\ServiceBricks.Logging.Microservice\ServiceBricks.Logging.Microservice.csproj", "{D8BF900A-B587-4B60-9E66-5F83B915D83C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net9", "Net9", "{74A654A3-3C30-4CED-B021-978F40BBD029}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.AzureDataTables.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.AzureDataTables.XunitNet9\ServiceBricks.Logging.AzureDataTables.XunitNet9.csproj", "{1A319722-AFF1-444E-9E88-4A0C07DDB5BB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.Client.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.Client.XunitNet9\ServiceBricks.Logging.Client.XunitNet9.csproj", "{33599FE2-C4D4-478B-B62C-CE8E6B87B2BA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.Cosmos.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.Cosmos.XunitNet9\ServiceBricks.Logging.Cosmos.XunitNet9.csproj", "{DBB6CDAC-B569-40ED-A70B-DC9D958F54DA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.InMemory.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.InMemory.XunitNet9\ServiceBricks.Logging.InMemory.XunitNet9.csproj", "{DC472685-773F-4B04-8563-E237A5357EE2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.MongoDb.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.MongoDb.XunitNet9\ServiceBricks.Logging.MongoDb.XunitNet9.csproj", "{851477D4-6438-4214-BC36-65A3C62BB9C6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.Postgres.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.Postgres.XunitNet9\ServiceBricks.Logging.Postgres.XunitNet9.csproj", "{09166E74-90B7-4BD9-BAE5-6D951FFD6BE9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.Sqlite.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.Sqlite.XunitNet9\ServiceBricks.Logging.Sqlite.XunitNet9.csproj", "{C3092397-D487-4282-A055-06CBB353383A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.SqlServer.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.SqlServer.XunitNet9\ServiceBricks.Logging.SqlServer.XunitNet9.csproj", "{300C1CA2-F25B-4261-AF15-B5FC189A0058}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceBricks.Logging.XunitNet9", "src\V1\Tests\ServiceBricks.Logging.XunitNet9\ServiceBricks.Logging.XunitNet9.csproj", "{B74CD01D-1DAF-41B6-9ED1-BBC6CD1BDBBF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAppNet9", "src\V1\Tests\WebAppNet9\WebAppNet9.csproj", "{032CE5F1-EA66-4BBD-AA38-A43B936BC3FC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -263,6 +285,46 @@ Global {D8BF900A-B587-4B60-9E66-5F83B915D83C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8BF900A-B587-4B60-9E66-5F83B915D83C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8BF900A-B587-4B60-9E66-5F83B915D83C}.Release|Any CPU.Build.0 = Release|Any CPU + {1A319722-AFF1-444E-9E88-4A0C07DDB5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A319722-AFF1-444E-9E88-4A0C07DDB5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A319722-AFF1-444E-9E88-4A0C07DDB5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A319722-AFF1-444E-9E88-4A0C07DDB5BB}.Release|Any CPU.Build.0 = Release|Any CPU + {33599FE2-C4D4-478B-B62C-CE8E6B87B2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33599FE2-C4D4-478B-B62C-CE8E6B87B2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33599FE2-C4D4-478B-B62C-CE8E6B87B2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33599FE2-C4D4-478B-B62C-CE8E6B87B2BA}.Release|Any CPU.Build.0 = Release|Any CPU + {DBB6CDAC-B569-40ED-A70B-DC9D958F54DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DBB6CDAC-B569-40ED-A70B-DC9D958F54DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DBB6CDAC-B569-40ED-A70B-DC9D958F54DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DBB6CDAC-B569-40ED-A70B-DC9D958F54DA}.Release|Any CPU.Build.0 = Release|Any CPU + {DC472685-773F-4B04-8563-E237A5357EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC472685-773F-4B04-8563-E237A5357EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC472685-773F-4B04-8563-E237A5357EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC472685-773F-4B04-8563-E237A5357EE2}.Release|Any CPU.Build.0 = Release|Any CPU + {851477D4-6438-4214-BC36-65A3C62BB9C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {851477D4-6438-4214-BC36-65A3C62BB9C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {851477D4-6438-4214-BC36-65A3C62BB9C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {851477D4-6438-4214-BC36-65A3C62BB9C6}.Release|Any CPU.Build.0 = Release|Any CPU + {09166E74-90B7-4BD9-BAE5-6D951FFD6BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09166E74-90B7-4BD9-BAE5-6D951FFD6BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09166E74-90B7-4BD9-BAE5-6D951FFD6BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09166E74-90B7-4BD9-BAE5-6D951FFD6BE9}.Release|Any CPU.Build.0 = Release|Any CPU + {C3092397-D487-4282-A055-06CBB353383A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C3092397-D487-4282-A055-06CBB353383A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C3092397-D487-4282-A055-06CBB353383A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C3092397-D487-4282-A055-06CBB353383A}.Release|Any CPU.Build.0 = Release|Any CPU + {300C1CA2-F25B-4261-AF15-B5FC189A0058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {300C1CA2-F25B-4261-AF15-B5FC189A0058}.Debug|Any CPU.Build.0 = Debug|Any CPU + {300C1CA2-F25B-4261-AF15-B5FC189A0058}.Release|Any CPU.ActiveCfg = Release|Any CPU + {300C1CA2-F25B-4261-AF15-B5FC189A0058}.Release|Any CPU.Build.0 = Release|Any CPU + {B74CD01D-1DAF-41B6-9ED1-BBC6CD1BDBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B74CD01D-1DAF-41B6-9ED1-BBC6CD1BDBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B74CD01D-1DAF-41B6-9ED1-BBC6CD1BDBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B74CD01D-1DAF-41B6-9ED1-BBC6CD1BDBBF}.Release|Any CPU.Build.0 = Release|Any CPU + {032CE5F1-EA66-4BBD-AA38-A43B936BC3FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {032CE5F1-EA66-4BBD-AA38-A43B936BC3FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {032CE5F1-EA66-4BBD-AA38-A43B936BC3FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {032CE5F1-EA66-4BBD-AA38-A43B936BC3FC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -302,6 +364,17 @@ Global {84C65BA8-CD93-4FB3-8581-9F9BE96D7600} = {2DB5BDD9-A93E-4928-B40C-CA47E5D02977} {41155F3C-28B8-4589-8FCB-0B5FD10D6A9F} = {2DB5BDD9-A93E-4928-B40C-CA47E5D02977} {2D3512F6-AA28-4D20-B9F7-F235C98493F6} = {2DB5BDD9-A93E-4928-B40C-CA47E5D02977} + {74A654A3-3C30-4CED-B021-978F40BBD029} = {88B1428A-EB13-437B-9B06-420DB5522C4B} + {1A319722-AFF1-444E-9E88-4A0C07DDB5BB} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {33599FE2-C4D4-478B-B62C-CE8E6B87B2BA} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {DBB6CDAC-B569-40ED-A70B-DC9D958F54DA} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {DC472685-773F-4B04-8563-E237A5357EE2} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {851477D4-6438-4214-BC36-65A3C62BB9C6} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {09166E74-90B7-4BD9-BAE5-6D951FFD6BE9} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {C3092397-D487-4282-A055-06CBB353383A} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {300C1CA2-F25B-4261-AF15-B5FC189A0058} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {B74CD01D-1DAF-41B6-9ED1-BBC6CD1BDBBF} = {74A654A3-3C30-4CED-B021-978F40BBD029} + {032CE5F1-EA66-4BBD-AA38-A43B936BC3FC} = {74A654A3-3C30-4CED-B021-978F40BBD029} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3F52D6BF-7492-4077-81D0-216BDE78C9EA} diff --git a/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj b/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj index b6fec34..513eac8 100644 --- a/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj +++ b/src/V1/ServiceBricks.Logging.AzureDataTables/ServiceBricks.Logging.AzureDataTables.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.AzureDataTables ServiceBricks.Logging.AzureDataTables @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;azure;azuredatatables @@ -36,6 +36,6 @@ - + diff --git a/src/V1/ServiceBricks.Logging.Cosmos/Model/LoggingCosmosContext.cs b/src/V1/ServiceBricks.Logging.Cosmos/Model/LoggingCosmosContext.cs index 98c3d05..923ee78 100644 --- a/src/V1/ServiceBricks.Logging.Cosmos/Model/LoggingCosmosContext.cs +++ b/src/V1/ServiceBricks.Logging.Cosmos/Model/LoggingCosmosContext.cs @@ -1,6 +1,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using ServiceBricks.Storage.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Diagnostics; namespace ServiceBricks.Logging.Cosmos { @@ -58,15 +59,26 @@ protected override void OnModelCreating(ModelBuilder builder) // AI: Create the model for each table builder.Entity().HasKey(p => p.Key); builder.Entity().HasPartitionKey(p => p.PartitionKey); - builder.Entity().HasIndex(key => new { key.Application, key.Level, key.CreateDate }); builder.Entity().ToContainer(LoggingCosmosConstants.GetContainerName(nameof(LogMessage))); builder.Entity().HasKey(p => p.Key); builder.Entity().HasPartitionKey(p => p.PartitionKey); - builder.Entity().HasIndex(key => new { key.Application, key.UserStorageKey, key.CreateDate }); builder.Entity().ToContainer(LoggingCosmosConstants.GetContainerName(nameof(WebRequestMessage))); } + /// + /// OnConfiguring + /// + /// + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { +#if NET9_0 + optionsBuilder.ConfigureWarnings(w => w.Ignore(CosmosEventId.SyncNotSupported)); +#endif + + base.OnConfiguring(optionsBuilder); + } + /// /// Create context. /// diff --git a/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj b/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj index 7e79d8f..807ccc2 100644 --- a/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj +++ b/src/V1/ServiceBricks.Logging.Cosmos/ServiceBricks.Logging.Cosmos.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Cosmos ServiceBricks.Logging.Cosmos @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;cosmos;cosmosdb @@ -36,7 +36,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj b/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj index 2679b94..a8b4e95 100644 --- a/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj +++ b/src/V1/ServiceBricks.Logging.EntityFrameworkCore/ServiceBricks.Logging.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.EntityFrameworkCore ServiceBricks.Logging.EntityFrameworkCore @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;entityframeworkcore;efc @@ -36,7 +36,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj b/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj index 8b1a229..1064a23 100644 --- a/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj +++ b/src/V1/ServiceBricks.Logging.InMemory/ServiceBricks.Logging.InMemory.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.InMemory ServiceBricks.Logging.InMemory @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;inmemory @@ -36,7 +36,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.Microservice/ServiceBricks.Logging.Microservice.csproj b/src/V1/ServiceBricks.Logging.Microservice/ServiceBricks.Logging.Microservice.csproj index a457c0c..6b648ec 100644 --- a/src/V1/ServiceBricks.Logging.Microservice/ServiceBricks.Logging.Microservice.csproj +++ b/src/V1/ServiceBricks.Logging.Microservice/ServiceBricks.Logging.Microservice.csproj @@ -1,7 +1,7 @@  - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Microservice ServiceBricks.Logging.Microservice @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;microservice @@ -34,7 +34,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj b/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj index 7bfeb23..206e3a6 100644 --- a/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj +++ b/src/V1/ServiceBricks.Logging.MongoDb/ServiceBricks.Logging.MongoDb.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.MongoDb ServiceBricks.Logging.MongoDb @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;mongo;mongodb @@ -36,6 +36,6 @@ - + diff --git a/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj b/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj index 669d92c..a8e9e65 100644 --- a/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj +++ b/src/V1/ServiceBricks.Logging.Postgres/ServiceBricks.Logging.Postgres.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Postgres ServiceBricks.Logging.Postgres @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;postgres;postgresql @@ -36,7 +36,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj b/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj index bada0f0..f7cfecd 100644 --- a/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj +++ b/src/V1/ServiceBricks.Logging.SqlServer/ServiceBricks.Logging.SqlServer.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.SqlServer ServiceBricks.Logging.SqlServer @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;sql;sqlserver @@ -36,7 +36,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj b/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj index 81b95ee..52dd2cc 100644 --- a/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj +++ b/src/V1/ServiceBricks.Logging.Sqlite/ServiceBricks.Logging.Sqlite.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging.Sqlite ServiceBricks.Logging.Sqlite @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging;sqlite @@ -36,7 +36,7 @@ - + diff --git a/src/V1/ServiceBricks.Logging/Background/WebRequestMessageWriteTask.cs b/src/V1/ServiceBricks.Logging/Background/WebRequestMessageWriteTask.cs new file mode 100644 index 0000000..6a0b9d3 --- /dev/null +++ b/src/V1/ServiceBricks.Logging/Background/WebRequestMessageWriteTask.cs @@ -0,0 +1,91 @@ +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; + +namespace ServiceBricks.Logging +{ + /// + /// This is a background task that writes log messages from the CusomLogger.MessageQueue to the database. + /// + public static class WebRequestMessageWriteTask + { + /// + /// Queue the work to the background task queue. + /// + /// + public static void QueueWork(this ITaskQueue backgroundTaskQueue) + { + backgroundTaskQueue.Queue(new Detail()); + } + + /// + /// The detail class provides any additional information needed to perform the work. + /// In this case, no additional information is needed as it will pull messages from the WebRequestMessageLogger.MessageQueue. + /// + public class Detail : ITaskDetail + { + } + + /// + /// The worker class performs the work detail. It should also be registered as a scoped service in the DI container in ServiceCollectionExtensions. + /// + public class Worker : ITaskWork + { + private readonly ILogger _logger; + private readonly IWebRequestMessageApiService _webRequestMessageApiService; + + /// + /// Constructor for the worker class. + /// + /// + /// + public Worker( + ILoggerFactory loggerFactory, + IWebRequestMessageApiService webRequestMessageApiService) + { + _logger = loggerFactory.CreateLogger(); + _webRequestMessageApiService = webRequestMessageApiService; + } + + /// + /// Perform the work detail. + /// + /// + /// + /// + public async Task DoWork(Detail detail, CancellationToken cancellationToken) + { + // AI: Iterate through the message queue and write to the database + while (WebRequestMessageLogger.MessageQueue.Count > 0) + { + // AI: While writing messages, check if cancellation is requested and exit + if (cancellationToken.IsCancellationRequested) + return; + + // AI: Peek at the message from the queue and try to process it first + WebRequestMessageDto msg = null; + if (WebRequestMessageLogger.MessageQueue.TryPeek(out msg)) + { + try + { + // AI: Create record + var respCreate = await _webRequestMessageApiService.CreateAsync(msg); + + // AI: If successful, dequeue the message + if (respCreate.Success) + WebRequestMessageLogger.MessageQueue.TryDequeue(out msg); + else + { + // AI: There is an error, maybe database down. It will be retried the next time the next task cycle runs. + return; + } + } + catch (Exception ex) + { + _logger.LogError(ex, ex.Message); + } + } + } + } + } + } +} \ No newline at end of file diff --git a/src/V1/ServiceBricks.Logging/Background/WebRequestMessageWriteTimer.cs b/src/V1/ServiceBricks.Logging/Background/WebRequestMessageWriteTimer.cs new file mode 100644 index 0000000..ea932ac --- /dev/null +++ b/src/V1/ServiceBricks.Logging/Background/WebRequestMessageWriteTimer.cs @@ -0,0 +1,58 @@ +using Microsoft.Extensions.Logging; + +namespace ServiceBricks.Logging +{ + /// + /// This is a timer that will execute the process to write webrequestmessages to the database. + /// Do not seal the class to allow for overriding values. + /// + public partial class WebRequestMessageWriteTimer : TaskTimerHostedService + { + /// + /// Constructor for the LoggingWriteMessageTimer. + /// + /// + /// + public WebRequestMessageWriteTimer( + IServiceProvider serviceProvider, + ILoggerFactory logger) : base(serviceProvider, logger) + { + } + + /// + /// The interval at which the timer will tick. + /// + public override TimeSpan TimerTickInterval + { + get { return TimeSpan.FromSeconds(1); } + } + + /// + /// The initial delay before the timer will tick. + /// + public override TimeSpan TimerDueTime + { + get { return TimeSpan.FromSeconds(1); } + } + + /// + /// The task detail for the timer that will be executed. + /// + public override ITaskDetail TaskDetail + { + get { return new WebRequestMessageWriteTask.Detail(); } + } + + /// + /// Determine if the timer should process the run. + /// + /// + public override bool TimerTickShouldProcessRun() + { + // AI: Check if the module has started, the timer is not currently running, and there are messages in the queue + return LoggingModule.Instance.Started && + !IsCurrentlyRunning && + WebRequestMessageLogger.MessageQueue.Count > 0; + } + } +} \ No newline at end of file diff --git a/src/V1/ServiceBricks.Logging/Middleware/WebRequestMessageMiddleware.cs b/src/V1/ServiceBricks.Logging/Middleware/WebRequestMessageMiddleware.cs index 4a15061..6edf423 100644 --- a/src/V1/ServiceBricks.Logging/Middleware/WebRequestMessageMiddleware.cs +++ b/src/V1/ServiceBricks.Logging/Middleware/WebRequestMessageMiddleware.cs @@ -154,7 +154,7 @@ private async Task WriteMessage(HttpContext context, Exception exception) responseContentLength = Encoding.UTF8.GetBytes(_responseBody).Length; // AI: Create record in the WebRequestMessageDto API service - await _webRequestMessageApiService.CreateAsync(new WebRequestMessageDto() + var msg = new WebRequestMessageDto() { CreateDate = DateTimeOffset.UtcNow, Application = _applicationOptions.Name, @@ -185,7 +185,8 @@ await _webRequestMessageApiService.CreateAsync(new WebRequestMessageDto() ResponseStatusCode = _webRequestOptions.EnableResponseStatusCode ? context.Response.StatusCode : null, ResponseTotalMilliseconds = _webRequestOptions.EnableResponseTotalMilliseconds ? _watch.ElapsedMilliseconds : null, Exception = _webRequestOptions.EnableExceptions && exception != null ? exception.ToString() : null - }); + }; + WebRequestMessageLogger.MessageQueue.Enqueue(msg); } /// @@ -197,12 +198,12 @@ private async Task GetRequestBody(HttpRequest request) { // AI: Enable buffering to read the body request.EnableBuffering(); - var buffer = new byte[Convert.ToInt32(request.ContentLength)]; - await request.Body.ReadAsync(buffer, 0, buffer.Length); - var bodyAsText = Encoding.UTF8.GetString(buffer); + // do not add using statement, will dispose stream + StreamReader sr = new StreamReader(request.Body); + string text = await sr.ReadToEndAsync(); if (request.Body.CanSeek) request.Body.Position = 0; - return bodyAsText; + return text; } /// @@ -214,7 +215,9 @@ private async Task GetResponseBody(HttpResponse response) { // AI: Get the response body response.Body.Seek(0, SeekOrigin.Begin); - string text = await new StreamReader(response.Body).ReadToEndAsync(); + // do not add using statement, will dispose stream + var sr = new StreamReader(response.Body); + string text = await sr.ReadToEndAsync(); response.Body.Seek(0, SeekOrigin.Begin); return text; } diff --git a/src/V1/ServiceBricks.Logging/Model/WebRequestMessageLogger.cs b/src/V1/ServiceBricks.Logging/Model/WebRequestMessageLogger.cs new file mode 100644 index 0000000..3dd5966 --- /dev/null +++ b/src/V1/ServiceBricks.Logging/Model/WebRequestMessageLogger.cs @@ -0,0 +1,16 @@ +using System.Collections.Concurrent; + +namespace ServiceBricks.Logging +{ + /// + /// THis is used to store messages in memory to be pulled off later + /// + public sealed class WebRequestMessageLogger + { + /// + /// This is the queue where log messages are stored. + /// + public static ConcurrentQueue MessageQueue = + new ConcurrentQueue(); + } +} \ No newline at end of file diff --git a/src/V1/ServiceBricks.Logging/Rule/LoggingModuleAddRule.cs b/src/V1/ServiceBricks.Logging/Rule/LoggingModuleAddRule.cs index d84dea4..44088f0 100644 --- a/src/V1/ServiceBricks.Logging/Rule/LoggingModuleAddRule.cs +++ b/src/V1/ServiceBricks.Logging/Rule/LoggingModuleAddRule.cs @@ -58,9 +58,11 @@ public override IResponse ExecuteRule(IBusinessRuleContext context) // AI: Add hosted services for the module services.AddHostedService(); + services.AddHostedService(); // AI: Add workers for tasks in the module services.AddScoped(); + services.AddScoped(); // AI: Configure all options for the module services.Configure(configuration.GetSection(LoggingConstants.APPSETTING_WEBREQUESTMESSAGE)); diff --git a/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj b/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj index fdd211b..4b0491c 100644 --- a/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj +++ b/src/V1/ServiceBricks.Logging/ServiceBricks.Logging.csproj @@ -1,7 +1,7 @@ - 1.1.3 + 1.2.0 The open source microservices platform. Visit https://ServiceBricks.com to learn more. ServiceBricks.Logging ServiceBricks.Logging @@ -9,9 +9,9 @@ holomodular HoloModular LLC ServiceBricks - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 disable - Copyright © 2024 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. + Copyright © 2025 HoloModular LLC. All Rights Reserved. Visit https://HoloModular.com to learn more. https://ServiceBricks.com logo.png servicebricks;logging @@ -33,7 +33,7 @@ - + diff --git a/src/V1/Tests/MigrationsHost/MigrationsHost.csproj b/src/V1/Tests/MigrationsHost/MigrationsHost.csproj index 1efccae..9378167 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/ServiceBricks.Logging.AzureDataTables.XunitNet6/ServiceBricks.Logging.AzureDataTables.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet6/ServiceBricks.Logging.AzureDataTables.XunitNet6.csproj index 252ac5c..f86302a 100644 --- a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet6/ServiceBricks.Logging.AzureDataTables.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet6/ServiceBricks.Logging.AzureDataTables.XunitNet6.csproj @@ -24,18 +24,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet7/ServiceBricks.Logging.AzureDataTables.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet7/ServiceBricks.Logging.AzureDataTables.XunitNet7.csproj index c53a80b..8404bab 100644 --- a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet7/ServiceBricks.Logging.AzureDataTables.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet7/ServiceBricks.Logging.AzureDataTables.XunitNet7.csproj @@ -24,17 +24,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet8/ServiceBricks.Logging.AzureDataTables.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet8/ServiceBricks.Logging.AzureDataTables.XunitNet8.csproj index c65c7e0..fa43620 100644 --- a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet8/ServiceBricks.Logging.AzureDataTables.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet8/ServiceBricks.Logging.AzureDataTables.XunitNet8.csproj @@ -23,18 +23,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet9/ServiceBricks.Logging.AzureDataTables.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet9/ServiceBricks.Logging.AzureDataTables.XunitNet9.csproj new file mode 100644 index 0000000..17fff09 --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet9/ServiceBricks.Logging.AzureDataTables.XunitNet9.csproj @@ -0,0 +1,48 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + Always + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.AzureDataTables.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet6/ServiceBricks.Logging.Client.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet6/ServiceBricks.Logging.Client.XunitNet6.csproj index 8e2b37c..1743eb3 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet6/ServiceBricks.Logging.Client.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet6/ServiceBricks.Logging.Client.XunitNet6.csproj @@ -24,18 +24,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet7/ServiceBricks.Logging.Client.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet7/ServiceBricks.Logging.Client.XunitNet7.csproj index f15d593..e7d7077 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet7/ServiceBricks.Logging.Client.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet7/ServiceBricks.Logging.Client.XunitNet7.csproj @@ -25,17 +25,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet8/ServiceBricks.Logging.Client.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet8/ServiceBricks.Logging.Client.XunitNet8.csproj index f77dfc6..f2704ed 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet8/ServiceBricks.Logging.Client.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet8/ServiceBricks.Logging.Client.XunitNet8.csproj @@ -24,18 +24,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet9/ServiceBricks.Logging.Client.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet9/ServiceBricks.Logging.Client.XunitNet9.csproj new file mode 100644 index 0000000..f727edb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet9/ServiceBricks.Logging.Client.XunitNet9.csproj @@ -0,0 +1,48 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + + Always + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Client.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet6/ServiceBricks.Logging.Cosmos.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet6/ServiceBricks.Logging.Cosmos.XunitNet6.csproj index 0f3094c..c848964 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet6/ServiceBricks.Logging.Cosmos.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet6/ServiceBricks.Logging.Cosmos.XunitNet6.csproj @@ -23,18 +23,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet7/ServiceBricks.Logging.Cosmos.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet7/ServiceBricks.Logging.Cosmos.XunitNet7.csproj index 94f413e..88c5a66 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet7/ServiceBricks.Logging.Cosmos.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet7/ServiceBricks.Logging.Cosmos.XunitNet7.csproj @@ -29,17 +29,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet8/ServiceBricks.Logging.Cosmos.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet8/ServiceBricks.Logging.Cosmos.XunitNet8.csproj index ded3221..f984b75 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet8/ServiceBricks.Logging.Cosmos.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet8/ServiceBricks.Logging.Cosmos.XunitNet8.csproj @@ -23,18 +23,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet9/ServiceBricks.Logging.Cosmos.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet9/ServiceBricks.Logging.Cosmos.XunitNet9.csproj new file mode 100644 index 0000000..3e82cc9 --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet9/ServiceBricks.Logging.Cosmos.XunitNet9.csproj @@ -0,0 +1,46 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + Always + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Cosmos.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet6/ServiceBricks.Logging.InMemory.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet6/ServiceBricks.Logging.InMemory.XunitNet6.csproj index 2461d8b..b02f9ea 100644 --- a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet6/ServiceBricks.Logging.InMemory.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet6/ServiceBricks.Logging.InMemory.XunitNet6.csproj @@ -26,18 +26,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet7/ServiceBricks.Logging.InMemory.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet7/ServiceBricks.Logging.InMemory.XunitNet7.csproj index ae213c1..08b3ff0 100644 --- a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet7/ServiceBricks.Logging.InMemory.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet7/ServiceBricks.Logging.InMemory.XunitNet7.csproj @@ -27,17 +27,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet8/ServiceBricks.Logging.InMemory.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet8/ServiceBricks.Logging.InMemory.XunitNet8.csproj index a98611a..34cf8c2 100644 --- a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet8/ServiceBricks.Logging.InMemory.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet8/ServiceBricks.Logging.InMemory.XunitNet8.csproj @@ -25,18 +25,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet9/ServiceBricks.Logging.InMemory.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet9/ServiceBricks.Logging.InMemory.XunitNet9.csproj new file mode 100644 index 0000000..93d8cad --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet9/ServiceBricks.Logging.InMemory.XunitNet9.csproj @@ -0,0 +1,48 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + + + + Always + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.InMemory.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet6/ServiceBricks.Logging.MongoDb.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet6/ServiceBricks.Logging.MongoDb.XunitNet6.csproj index 42f09d5..1216943 100644 --- a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet6/ServiceBricks.Logging.MongoDb.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet6/ServiceBricks.Logging.MongoDb.XunitNet6.csproj @@ -24,18 +24,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet7/ServiceBricks.Logging.MongoDb.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet7/ServiceBricks.Logging.MongoDb.XunitNet7.csproj index 37ce1ae..a266e40 100644 --- a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet7/ServiceBricks.Logging.MongoDb.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet7/ServiceBricks.Logging.MongoDb.XunitNet7.csproj @@ -25,17 +25,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet8/ServiceBricks.Logging.MongoDb.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet8/ServiceBricks.Logging.MongoDb.XunitNet8.csproj index 7dab5f6..35fd503 100644 --- a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet8/ServiceBricks.Logging.MongoDb.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet8/ServiceBricks.Logging.MongoDb.XunitNet8.csproj @@ -25,18 +25,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet9/ServiceBricks.Logging.MongoDb.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet9/ServiceBricks.Logging.MongoDb.XunitNet9.csproj new file mode 100644 index 0000000..9bfd314 --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet9/ServiceBricks.Logging.MongoDb.XunitNet9.csproj @@ -0,0 +1,48 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + + + Always + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.MongoDb.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet6/ServiceBricks.Logging.Postgres.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet6/ServiceBricks.Logging.Postgres.XunitNet6.csproj index a1e62e3..7cbd97f 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet6/ServiceBricks.Logging.Postgres.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet6/ServiceBricks.Logging.Postgres.XunitNet6.csproj @@ -30,18 +30,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet7/ServiceBricks.Logging.Postgres.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet7/ServiceBricks.Logging.Postgres.XunitNet7.csproj index c029a2a..4b8e318 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet7/ServiceBricks.Logging.Postgres.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet7/ServiceBricks.Logging.Postgres.XunitNet7.csproj @@ -26,17 +26,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet8/ServiceBricks.Logging.Postgres.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet8/ServiceBricks.Logging.Postgres.XunitNet8.csproj index e2683ee..8f4a461 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet8/ServiceBricks.Logging.Postgres.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet8/ServiceBricks.Logging.Postgres.XunitNet8.csproj @@ -25,18 +25,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet9/ServiceBricks.Logging.Postgres.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet9/ServiceBricks.Logging.Postgres.XunitNet9.csproj new file mode 100644 index 0000000..a39f78a --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet9/ServiceBricks.Logging.Postgres.XunitNet9.csproj @@ -0,0 +1,48 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + + + Always + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Postgres.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet6/ServiceBricks.Logging.SqlServer.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet6/ServiceBricks.Logging.SqlServer.XunitNet6.csproj index ff046b9..423e24b 100644 --- a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet6/ServiceBricks.Logging.SqlServer.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet6/ServiceBricks.Logging.SqlServer.XunitNet6.csproj @@ -23,18 +23,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet7/ServiceBricks.Logging.SqlServer.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet7/ServiceBricks.Logging.SqlServer.XunitNet7.csproj index 8d149af..45a66ba 100644 --- a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet7/ServiceBricks.Logging.SqlServer.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet7/ServiceBricks.Logging.SqlServer.XunitNet7.csproj @@ -24,17 +24,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet8/ServiceBricks.Logging.SqlServer.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet8/ServiceBricks.Logging.SqlServer.XunitNet8.csproj index d24f265..0cffb9a 100644 --- a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet8/ServiceBricks.Logging.SqlServer.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet8/ServiceBricks.Logging.SqlServer.XunitNet8.csproj @@ -29,18 +29,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet9/ServiceBricks.Logging.SqlServer.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet9/ServiceBricks.Logging.SqlServer.XunitNet9.csproj new file mode 100644 index 0000000..5748aa2 --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet9/ServiceBricks.Logging.SqlServer.XunitNet9.csproj @@ -0,0 +1,54 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + Always + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.SqlServer.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet6/ServiceBricks.Logging.Sqlite.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet6/ServiceBricks.Logging.Sqlite.XunitNet6.csproj index 40b6a38..4da3389 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet6/ServiceBricks.Logging.Sqlite.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet6/ServiceBricks.Logging.Sqlite.XunitNet6.csproj @@ -28,18 +28,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet7/ServiceBricks.Logging.Sqlite.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet7/ServiceBricks.Logging.Sqlite.XunitNet7.csproj index 8b6e7b4..507c9c1 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet7/ServiceBricks.Logging.Sqlite.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet7/ServiceBricks.Logging.Sqlite.XunitNet7.csproj @@ -24,17 +24,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet8/ServiceBricks.Logging.Sqlite.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet8/ServiceBricks.Logging.Sqlite.XunitNet8.csproj index 998b308..76a860c 100644 --- a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet8/ServiceBricks.Logging.Sqlite.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet8/ServiceBricks.Logging.Sqlite.XunitNet8.csproj @@ -23,18 +23,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet9/ServiceBricks.Logging.Sqlite.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet9/ServiceBricks.Logging.Sqlite.XunitNet9.csproj new file mode 100644 index 0000000..df149cb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet9/ServiceBricks.Logging.Sqlite.XunitNet9.csproj @@ -0,0 +1,46 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + Always + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.Sqlite.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/ServiceBricks.Logging.XunitNet6/ServiceBricks.Logging.XunitNet6.csproj b/src/V1/Tests/ServiceBricks.Logging.XunitNet6/ServiceBricks.Logging.XunitNet6.csproj index a5c911c..5b7357a 100644 --- a/src/V1/Tests/ServiceBricks.Logging.XunitNet6/ServiceBricks.Logging.XunitNet6.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.XunitNet6/ServiceBricks.Logging.XunitNet6.csproj @@ -17,22 +17,22 @@ - + - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.XunitNet7/ServiceBricks.Logging.XunitNet7.csproj b/src/V1/Tests/ServiceBricks.Logging.XunitNet7/ServiceBricks.Logging.XunitNet7.csproj index 3dc8979..a22666b 100644 --- a/src/V1/Tests/ServiceBricks.Logging.XunitNet7/ServiceBricks.Logging.XunitNet7.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.XunitNet7/ServiceBricks.Logging.XunitNet7.csproj @@ -17,22 +17,22 @@ - + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.XunitNet8/ServiceBricks.Logging.XunitNet8.csproj b/src/V1/Tests/ServiceBricks.Logging.XunitNet8/ServiceBricks.Logging.XunitNet8.csproj index bc8c05b..13b8296 100644 --- a/src/V1/Tests/ServiceBricks.Logging.XunitNet8/ServiceBricks.Logging.XunitNet8.csproj +++ b/src/V1/Tests/ServiceBricks.Logging.XunitNet8/ServiceBricks.Logging.XunitNet8.csproj @@ -17,22 +17,22 @@ - + - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/V1/Tests/ServiceBricks.Logging.XunitNet9/ServiceBricks.Logging.XunitNet9.csproj b/src/V1/Tests/ServiceBricks.Logging.XunitNet9/ServiceBricks.Logging.XunitNet9.csproj new file mode 100644 index 0000000..cccc781 --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.XunitNet9/ServiceBricks.Logging.XunitNet9.csproj @@ -0,0 +1,43 @@ + + + + net9.0 + enable + disable + + false + true + + + + + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/src/V1/Tests/ServiceBricks.Logging.XunitNet9/Usings.cs b/src/V1/Tests/ServiceBricks.Logging.XunitNet9/Usings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/src/V1/Tests/ServiceBricks.Logging.XunitNet9/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/src/V1/Tests/TestFiles/StartupAzureDataTables.cs b/src/V1/Tests/TestFiles/StartupAzureDataTables.cs index ea08307..278bcf3 100644 --- a/src/V1/Tests/TestFiles/StartupAzureDataTables.cs +++ b/src/V1/Tests/TestFiles/StartupAzureDataTables.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingAzureDataTables(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManager>(); services.AddScoped, WebRequestMessageTestManager>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/StartupCosmos.cs b/src/V1/Tests/TestFiles/StartupCosmos.cs index 1c685d1..209623c 100644 --- a/src/V1/Tests/TestFiles/StartupCosmos.cs +++ b/src/V1/Tests/TestFiles/StartupCosmos.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingCosmos(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManager>(); services.AddScoped, WebRequestMessageTestManager>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/StartupInMemory.cs b/src/V1/Tests/TestFiles/StartupInMemory.cs index 2028875..91044b8 100644 --- a/src/V1/Tests/TestFiles/StartupInMemory.cs +++ b/src/V1/Tests/TestFiles/StartupInMemory.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingInMemory(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManager>(); services.AddScoped, WebRequestMessageTestManager>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/StartupMongoDb.cs b/src/V1/Tests/TestFiles/StartupMongoDb.cs index 5e9fa42..f848179 100644 --- a/src/V1/Tests/TestFiles/StartupMongoDb.cs +++ b/src/V1/Tests/TestFiles/StartupMongoDb.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingMongoDb(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManagerMongoDb>(); services.AddScoped, WebRequestMessageTestManagerMongoDb>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/StartupPostgres.cs b/src/V1/Tests/TestFiles/StartupPostgres.cs index c62255c..40c7fa5 100644 --- a/src/V1/Tests/TestFiles/StartupPostgres.cs +++ b/src/V1/Tests/TestFiles/StartupPostgres.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingPostgres(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManagerPostgres>(); services.AddScoped, WebRequestMessageTestManagerPostgres>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/StartupSqlServer.cs b/src/V1/Tests/TestFiles/StartupSqlServer.cs index 757d7f8..713cb6b 100644 --- a/src/V1/Tests/TestFiles/StartupSqlServer.cs +++ b/src/V1/Tests/TestFiles/StartupSqlServer.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingSqlServer(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManager>(); services.AddScoped, WebRequestMessageTestManager>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/StartupSqlite.cs b/src/V1/Tests/TestFiles/StartupSqlite.cs index 2278d89..4900408 100644 --- a/src/V1/Tests/TestFiles/StartupSqlite.cs +++ b/src/V1/Tests/TestFiles/StartupSqlite.cs @@ -18,6 +18,7 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) services.AddSingleton(Configuration); services.AddServiceBricks(Configuration); services.AddServiceBricksLoggingSqlite(Configuration); + services.AddServiceBricksComplete(Configuration); // Remove all background tasks/timers for unit testing var logtimer = services.Where(x => x.ImplementationType == typeof(CustomLoggerWriteMessageTimer)).FirstOrDefault(); @@ -27,8 +28,6 @@ public virtual void ConfigureDevelopmentServices(IServiceCollection services) // Register TestManager services.AddScoped, LogMessageTestManager>(); services.AddScoped, WebRequestMessageTestManager>(); - - services.AddServiceBricksComplete(Configuration); } public virtual void Configure(IApplicationBuilder app) diff --git a/src/V1/Tests/TestFiles/webapp/appsettings.json b/src/V1/Tests/TestFiles/webapp/appsettings.json index 390a205..82a035f 100644 --- a/src/V1/Tests/TestFiles/webapp/appsettings.json +++ b/src/V1/Tests/TestFiles/webapp/appsettings.json @@ -22,7 +22,7 @@ "EnableExceptions": true, "EnableUserStorageKey": true, "EnableRequestIPAddress": true, - "EnableRequestBody": false, + "EnableRequestBody": true, "EnableRequestBodyOnError": true, "EnableRequestProtocol": true, "EnableRequestScheme": true, @@ -30,22 +30,22 @@ "EnableRequestPath": true, "EnableRequestPathBase": true, "EnableRequestQueryString": true, - "EnableRequestQuery": false, - "EnableRequestRouteValues": false, - "EnableRequestHost": false, + "EnableRequestQuery": true, + "EnableRequestRouteValues": true, + "EnableRequestHost": true, "EnableRequestHasFormContentType": true, - "EnableRequestCookies": false, + "EnableRequestCookies": true, "EnableRequestContentType": true, "EnableRequestContentLength": true, - "EnableRequestHeaders": false, + "EnableRequestHeaders": true, "EnableRequestIsHttps": true, "EnableResponseStatusCode": true, - "EnableResponseHeaders": false, - "EnableResponseCookies": false, + "EnableResponseHeaders": true, + "EnableResponseCookies": true, "EnableResponseContentType": true, "EnableResponseContentLength": true, "EnableResponseTotalMilliseconds": true, - "EnableResponseBody": false, + "EnableResponseBody": true, "EnableExcludeRequestPathsRegExExpressions": false, "ExcludeRequestPaths": [ "/css/", diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_CookiesConsentPartial.es.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_CookiesConsentPartial.es.resx deleted file mode 100644 index f7c8b6b..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_CookiesConsentPartial.es.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - De acuerdo - - - Necesitamos su consentimiento para permitirnos utilizar cookies y otras tecnologías para almacenar y procesar datos personales de usted en nuestro sitio web. - - - Retirar el consentimiento de las cookies - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_CookiesConsentPartial.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_CookiesConsentPartial.resx deleted file mode 100644 index c80699e..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_CookiesConsentPartial.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - I Agree - - - We need your consent to allow us to use cookies and other technologies to store and process personal data from you on our website. - - - Withdraw Cookies Consent - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_FooterPartial.es.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_FooterPartial.es.resx deleted file mode 100644 index 3f233c9..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_FooterPartial.es.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Todos los derechos reservados. - - - Derechos de autor - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_FooterPartial.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_FooterPartial.resx deleted file mode 100644 index 78f3dab..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_FooterPartial.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - All Rights Reserved. - - - Copyright - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_HeaderPartial.es.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_HeaderPartial.es.resx deleted file mode 100644 index 1800067..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_HeaderPartial.es.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Aplicación Web API Starter - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_HeaderPartial.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_HeaderPartial.resx deleted file mode 100644 index 752958d..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_HeaderPartial.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Web API Starter Application - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_LanguagePartial.es.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_LanguagePartial.es.resx deleted file mode 100644 index c748989..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_LanguagePartial.es.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Cambio - - - Inglés - - - Idioma - - - Espanol - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_LanguagePartial.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_LanguagePartial.resx deleted file mode 100644 index 82ba138..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_LanguagePartial.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Change - - - English - - - Language - - - Spanish - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_Layout.es.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_Layout.es.resx deleted file mode 100644 index a69a24d..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_Layout.es.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Saltar al contenido principal. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_Layout.resx b/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_Layout.resx deleted file mode 100644 index d45686c..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Pages/Shared/_Layout.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Skip to main content. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Error.es.resx b/src/V1/Tests/WebAppNet6/Resources/Views/Home/Error.es.resx deleted file mode 100644 index 8de61c9..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Error.es.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Se ha producido un error al procesar la solicitud. - - - Error - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Error.resx b/src/V1/Tests/WebAppNet6/Resources/Views/Home/Error.resx deleted file mode 100644 index 2f02984..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Error.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An error happened processing your request. - - - Error - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Index.es.resx b/src/V1/Tests/WebAppNet6/Resources/Views/Home/Index.es.resx deleted file mode 100644 index a089355..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Index.es.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Visite nuestro sitio web en: - - - Esta es la aplicación SERVICE BRICK Web API Starter. - - - Ver página de Swagger - - - Bienvenido - - - Puede modificar esta aplicación como desee. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Index.resx b/src/V1/Tests/WebAppNet6/Resources/Views/Home/Index.resx deleted file mode 100644 index bf417d0..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Views/Home/Index.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Please visit our website at: - - - This is the SERVICE BRICK Web API Starter Application. - - - View Swagger Page - - - Welcome - - - You can modify this application however you like. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Views/Home/RegisterAdmin.es.resx b/src/V1/Tests/WebAppNet6/Resources/Views/Home/RegisterAdmin.es.resx deleted file mode 100644 index 8ac1529..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Views/Home/RegisterAdmin.es.resx +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Se requiere un administrador para administrar este sitio web. - - - Correo electrónico - - - Contraseña - - - Introduzca un correo electrónico y una contraseña a continuación para registrarse como administrador. - - - Registrar admin - - - Enviar - - - Esta es la aplicación SERVICE BRICK Web API Starter. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/Resources/Views/Home/RegisterAdmin.resx b/src/V1/Tests/WebAppNet6/Resources/Views/Home/RegisterAdmin.resx deleted file mode 100644 index 0ca6696..0000000 --- a/src/V1/Tests/WebAppNet6/Resources/Views/Home/RegisterAdmin.resx +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An administrator is required to manage this website. - - - Email - - - Password - - - Please enter an email and password below to register as an Admin. - - - Register Admin - - - Submit - - - This is the SERVICE BRICK Web API Starter Application. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet6/WebAppNet6.csproj b/src/V1/Tests/WebAppNet6/WebAppNet6.csproj index bb2b2a2..7d210a0 100644 --- a/src/V1/Tests/WebAppNet6/WebAppNet6.csproj +++ b/src/V1/Tests/WebAppNet6/WebAppNet6.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_CookiesConsentPartial.es.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_CookiesConsentPartial.es.resx deleted file mode 100644 index f7c8b6b..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_CookiesConsentPartial.es.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - De acuerdo - - - Necesitamos su consentimiento para permitirnos utilizar cookies y otras tecnologías para almacenar y procesar datos personales de usted en nuestro sitio web. - - - Retirar el consentimiento de las cookies - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_CookiesConsentPartial.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_CookiesConsentPartial.resx deleted file mode 100644 index c80699e..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_CookiesConsentPartial.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - I Agree - - - We need your consent to allow us to use cookies and other technologies to store and process personal data from you on our website. - - - Withdraw Cookies Consent - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_FooterPartial.es.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_FooterPartial.es.resx deleted file mode 100644 index 3f233c9..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_FooterPartial.es.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Todos los derechos reservados. - - - Derechos de autor - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_FooterPartial.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_FooterPartial.resx deleted file mode 100644 index 78f3dab..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_FooterPartial.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - All Rights Reserved. - - - Copyright - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_HeaderPartial.es.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_HeaderPartial.es.resx deleted file mode 100644 index 1800067..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_HeaderPartial.es.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Aplicación Web API Starter - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_HeaderPartial.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_HeaderPartial.resx deleted file mode 100644 index 752958d..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_HeaderPartial.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Web API Starter Application - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_LanguagePartial.es.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_LanguagePartial.es.resx deleted file mode 100644 index c748989..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_LanguagePartial.es.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Cambio - - - Inglés - - - Idioma - - - Espanol - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_LanguagePartial.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_LanguagePartial.resx deleted file mode 100644 index 82ba138..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_LanguagePartial.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Change - - - English - - - Language - - - Spanish - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_Layout.es.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_Layout.es.resx deleted file mode 100644 index a69a24d..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_Layout.es.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Saltar al contenido principal. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_Layout.resx b/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_Layout.resx deleted file mode 100644 index d45686c..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Pages/Shared/_Layout.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Skip to main content. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Error.es.resx b/src/V1/Tests/WebAppNet7/Resources/Views/Home/Error.es.resx deleted file mode 100644 index 8de61c9..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Error.es.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Se ha producido un error al procesar la solicitud. - - - Error - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Error.resx b/src/V1/Tests/WebAppNet7/Resources/Views/Home/Error.resx deleted file mode 100644 index 2f02984..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Error.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An error happened processing your request. - - - Error - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Index.es.resx b/src/V1/Tests/WebAppNet7/Resources/Views/Home/Index.es.resx deleted file mode 100644 index a089355..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Index.es.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Visite nuestro sitio web en: - - - Esta es la aplicación SERVICE BRICK Web API Starter. - - - Ver página de Swagger - - - Bienvenido - - - Puede modificar esta aplicación como desee. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Index.resx b/src/V1/Tests/WebAppNet7/Resources/Views/Home/Index.resx deleted file mode 100644 index bf417d0..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Views/Home/Index.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Please visit our website at: - - - This is the SERVICE BRICK Web API Starter Application. - - - View Swagger Page - - - Welcome - - - You can modify this application however you like. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Views/Home/RegisterAdmin.es.resx b/src/V1/Tests/WebAppNet7/Resources/Views/Home/RegisterAdmin.es.resx deleted file mode 100644 index 8ac1529..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Views/Home/RegisterAdmin.es.resx +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Se requiere un administrador para administrar este sitio web. - - - Correo electrónico - - - Contraseña - - - Introduzca un correo electrónico y una contraseña a continuación para registrarse como administrador. - - - Registrar admin - - - Enviar - - - Esta es la aplicación SERVICE BRICK Web API Starter. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/Resources/Views/Home/RegisterAdmin.resx b/src/V1/Tests/WebAppNet7/Resources/Views/Home/RegisterAdmin.resx deleted file mode 100644 index 0ca6696..0000000 --- a/src/V1/Tests/WebAppNet7/Resources/Views/Home/RegisterAdmin.resx +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An administrator is required to manage this website. - - - Email - - - Password - - - Please enter an email and password below to register as an Admin. - - - Register Admin - - - Submit - - - This is the SERVICE BRICK Web API Starter Application. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet7/WebAppNet7.csproj b/src/V1/Tests/WebAppNet7/WebAppNet7.csproj index e279de0..8359944 100644 --- a/src/V1/Tests/WebAppNet7/WebAppNet7.csproj +++ b/src/V1/Tests/WebAppNet7/WebAppNet7.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_CookiesConsentPartial.es.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_CookiesConsentPartial.es.resx deleted file mode 100644 index f7c8b6b..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_CookiesConsentPartial.es.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - De acuerdo - - - Necesitamos su consentimiento para permitirnos utilizar cookies y otras tecnologías para almacenar y procesar datos personales de usted en nuestro sitio web. - - - Retirar el consentimiento de las cookies - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_CookiesConsentPartial.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_CookiesConsentPartial.resx deleted file mode 100644 index c80699e..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_CookiesConsentPartial.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - I Agree - - - We need your consent to allow us to use cookies and other technologies to store and process personal data from you on our website. - - - Withdraw Cookies Consent - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_FooterPartial.es.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_FooterPartial.es.resx deleted file mode 100644 index 3f233c9..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_FooterPartial.es.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Todos los derechos reservados. - - - Derechos de autor - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_FooterPartial.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_FooterPartial.resx deleted file mode 100644 index 78f3dab..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_FooterPartial.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - All Rights Reserved. - - - Copyright - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_HeaderPartial.es.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_HeaderPartial.es.resx deleted file mode 100644 index 1800067..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_HeaderPartial.es.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Aplicación Web API Starter - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_HeaderPartial.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_HeaderPartial.resx deleted file mode 100644 index 752958d..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_HeaderPartial.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Web API Starter Application - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_LanguagePartial.es.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_LanguagePartial.es.resx deleted file mode 100644 index c748989..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_LanguagePartial.es.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Cambio - - - Inglés - - - Idioma - - - Espanol - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_LanguagePartial.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_LanguagePartial.resx deleted file mode 100644 index 82ba138..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_LanguagePartial.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Change - - - English - - - Language - - - Spanish - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_Layout.es.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_Layout.es.resx deleted file mode 100644 index a69a24d..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_Layout.es.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Saltar al contenido principal. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_Layout.resx b/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_Layout.resx deleted file mode 100644 index d45686c..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Pages/Shared/_Layout.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Skip to main content. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Error.es.resx b/src/V1/Tests/WebAppNet8/Resources/Views/Home/Error.es.resx deleted file mode 100644 index 8de61c9..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Error.es.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Se ha producido un error al procesar la solicitud. - - - Error - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Error.resx b/src/V1/Tests/WebAppNet8/Resources/Views/Home/Error.resx deleted file mode 100644 index 2f02984..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Error.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An error happened processing your request. - - - Error - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Index.es.resx b/src/V1/Tests/WebAppNet8/Resources/Views/Home/Index.es.resx deleted file mode 100644 index a089355..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Index.es.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Visite nuestro sitio web en: - - - Esta es la aplicación SERVICE BRICK Web API Starter. - - - Ver página de Swagger - - - Bienvenido - - - Puede modificar esta aplicación como desee. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Index.resx b/src/V1/Tests/WebAppNet8/Resources/Views/Home/Index.resx deleted file mode 100644 index bf417d0..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Views/Home/Index.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Please visit our website at: - - - This is the SERVICE BRICK Web API Starter Application. - - - View Swagger Page - - - Welcome - - - You can modify this application however you like. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Views/Home/RegisterAdmin.es.resx b/src/V1/Tests/WebAppNet8/Resources/Views/Home/RegisterAdmin.es.resx deleted file mode 100644 index 8ac1529..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Views/Home/RegisterAdmin.es.resx +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Se requiere un administrador para administrar este sitio web. - - - Correo electrónico - - - Contraseña - - - Introduzca un correo electrónico y una contraseña a continuación para registrarse como administrador. - - - Registrar admin - - - Enviar - - - Esta es la aplicación SERVICE BRICK Web API Starter. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/Resources/Views/Home/RegisterAdmin.resx b/src/V1/Tests/WebAppNet8/Resources/Views/Home/RegisterAdmin.resx deleted file mode 100644 index 0ca6696..0000000 --- a/src/V1/Tests/WebAppNet8/Resources/Views/Home/RegisterAdmin.resx +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - An administrator is required to manage this website. - - - Email - - - Password - - - Please enter an email and password below to register as an Admin. - - - Register Admin - - - Submit - - - This is the SERVICE BRICK Web API Starter Application. - - \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet8/WebAppNet8.csproj b/src/V1/Tests/WebAppNet8/WebAppNet8.csproj index 130be4b..a2edd91 100644 --- a/src/V1/Tests/WebAppNet8/WebAppNet8.csproj +++ b/src/V1/Tests/WebAppNet8/WebAppNet8.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/V1/Tests/WebAppNet9/Controllers/HomeController.cs b/src/V1/Tests/WebAppNet9/Controllers/HomeController.cs new file mode 100644 index 0000000..4daa9aa --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Controllers/HomeController.cs @@ -0,0 +1,66 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using ServiceBricks; + +//using ServiceBricks.Security.Api; +using WebApp.ViewModel.Home; + +namespace WebApp.Controllers +{ + [AllowAnonymous] + [Route("")] + [Route("Home")] + public class HomeController : Controller + { + private IServiceBus _serviceBus; + + public HomeController(IServiceBus serviceBus) + { + _serviceBus = serviceBus; + } + + [HttpGet] + [Route("")] + [Route("Index")] + public IActionResult Index() + { + HomeViewModel model = new HomeViewModel(); + return View(model); + } + + [HttpGet] + [Route("ServiceBus")] + public IActionResult ServiceBus() + { + var log = new CreateApplicationLogBroadcast(new ApplicationLogDto() + { + Application = "ApplicationTest", + CreateDate = DateTimeOffset.UtcNow, + Category = "CategoryTest", + Exception = "ExceptionTest", + Level = "LevelTest", + Message = "MessageTest", + Path = "PathTest", + Properties = "PropertiesTest", + Server = "ServerTest", + StorageKey = "StorageKeyTest", + UserStorageKey = "UserStorageKeyTest" + }); + _serviceBus.Send(log); + + HomeViewModel model = new HomeViewModel(); + return View("Index", model); + } + + [HttpGet] + [Route("Error")] + public IActionResult Error(string message = null) + { + var model = new ErrorViewModel() + { + Message = message + }; + return View("Error", model); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Controllers/api/v1/ExampleController.cs b/src/V1/Tests/WebAppNet9/Controllers/api/v1/ExampleController.cs new file mode 100644 index 0000000..c73c751 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Controllers/api/v1/ExampleController.cs @@ -0,0 +1,35 @@ +using Asp.Versioning; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System.Net; + +namespace WebApp.Controllers.api.v1 +{ + [AllowAnonymous] + [ApiController] + [ApiVersion("1.0")] + [Produces("application/json", "application/problem+json")] + [Route("api/v{version:apiVersion}/[controller]")] + public class ExampleController : ControllerBase + { + [HttpGet] + [ProducesResponseType(typeof(ProblemDetails), (int)HttpStatusCode.InternalServerError)] + [ProducesResponseType(typeof(List), (int)HttpStatusCode.OK)] + [Route("GetFiveNumbers")] + public IActionResult GetFiveNumbers() + { + return Ok( + Enumerable.Range(1, 5).Select(x => + Random.Shared.Next(0, 100)).ToList()); + } + + [HttpPost] + [ProducesResponseType(typeof(ProblemDetails), (int)HttpStatusCode.InternalServerError)] + [ProducesResponseType(typeof(string), (int)HttpStatusCode.OK)] + [Route("ThrowNotSupportedException")] + public IActionResult ThrowNotSupportedException() + { + throw new NotSupportedException(nameof(ThrowNotSupportedException)); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Controllers/api/v2/ExampleController.cs b/src/V1/Tests/WebAppNet9/Controllers/api/v2/ExampleController.cs new file mode 100644 index 0000000..19c032a --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Controllers/api/v2/ExampleController.cs @@ -0,0 +1,26 @@ +using Asp.Versioning; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System.Net; + +namespace WebApp.Controllers.api.v2 +{ + [AllowAnonymous] + [ApiController] + [ApiVersion("2.0")] + [Produces("application/json", "application/problem+json")] + [Route("api/v{version:apiVersion}/[controller]")] + public class ExampleController : v1.ExampleController + { + [HttpGet] + [ProducesResponseType(typeof(ProblemDetails), (int)HttpStatusCode.InternalServerError)] + [ProducesResponseType(typeof(List), (int)HttpStatusCode.OK)] + [Route("GetTenNumbers")] + public IActionResult GetTenNumbers() + { + return Ok( + Enumerable.Range(1, 10).Select(x => + Random.Shared.Next(0, 100)).ToList()); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Extensions/ApplicationBuilderExtensions.cs b/src/V1/Tests/WebAppNet9/Extensions/ApplicationBuilderExtensions.cs new file mode 100644 index 0000000..84e709c --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Extensions/ApplicationBuilderExtensions.cs @@ -0,0 +1,51 @@ +using ServiceBricks; +using ServiceBricks.Logging; + +namespace WebApp.Extensions +{ + public static class ApplicationBuilderExtensions + { + private static IApplicationBuilder RegisterMiddleware(this IApplicationBuilder app) + { + app.UseMiddleware(); + app.UseMiddleware(); + app.UseMiddleware(); + return app; + } + + public static IApplicationBuilder StartCustomWebsite(this IApplicationBuilder app, IWebHostEnvironment env) + { + if (!env.IsDevelopment()) + app.UseHsts(); + + app.UseHttpsRedirection(); + app.UseStaticFiles(); + app.UseRouting(); + app.UseCors(); + app.UseAuthentication(); + app.UseAuthorization(); + + // Register Middleware after UseAuth() so user context is available + app.RegisterMiddleware(); + + app.UseEndpoints(endpoints => + { + endpoints.MapDefaultControllerRoute(); + endpoints.MapControllers(); + endpoints.MapRazorPages(); + }); + + if (env.IsDevelopment()) + { + app.UseSwagger(); + app.UseSwaggerUI(x => + { + x.SwaggerEndpoint("/swagger/v1/swagger.json", "API v1"); + x.SwaggerEndpoint("/swagger/v2/swagger.json", "API v2"); + }); + } + + return app; + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Extensions/ServiceCollectionExtensions.cs b/src/V1/Tests/WebAppNet9/Extensions/ServiceCollectionExtensions.cs new file mode 100644 index 0000000..6cd2eed --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Extensions/ServiceCollectionExtensions.cs @@ -0,0 +1,69 @@ +using Asp.Versioning; +using Microsoft.OpenApi.Models; +using ServiceBricks; +using WebApp.Model; + +namespace WebApp.Extensions +{ + public static class ServiceCollectionExtensions + { + public static IServiceCollection AddCustomWebsite(this IServiceCollection services, IConfiguration Configuration) + { + services.AddControllers(); + services.AddRazorPages(); + services.AddControllersWithViews().AddRazorRuntimeCompilation(); + services.AddCors(); + + // Add Authorization + services.AddAuthorization(options => + { + //Add Built-in Security Policies + options.AddPolicy(ServiceBricksConstants.SECURITY_POLICY_ADMIN, policy => + policy.RequireAssertion(context => true)); + + options.AddPolicy(ServiceBricksConstants.SECURITY_POLICY_USER, policy => + policy.RequireAssertion(context => true)); + }); + + services.AddMvc(); + + services.AddCustomSwagger(Configuration); + + return services; + } + + public static IServiceCollection AddCustomSwagger(this IServiceCollection services, IConfiguration configuration) + { + services.AddEndpointsApiExplorer(); + var apiVersioningBuilder = services.AddApiVersioning(options => + { + options.ReportApiVersions = true; + options.DefaultApiVersion = new ApiVersion(1, 0); + options.AssumeDefaultVersionWhenUnspecified = true; + options.ApiVersionReader = new MediaTypeApiVersionReader(); + }); + apiVersioningBuilder.AddApiExplorer(options => + { + options.GroupNameFormat = "'v'VVV"; + options.SubstituteApiVersionInUrl = true; + }); + services.AddSwaggerGen(options => + { + options.ResolveConflictingActions(descriptions => + { + return descriptions.First(); + }); + options.CustomSchemaIds(x => x.FullName); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "API v1", Version = "1.0" }); + options.SwaggerDoc("v2", new OpenApiInfo { Title = "API v2", Version = "2.0" }); + options.OperationFilter(); + options.DocumentFilter(); + options.DocInclusionPredicate((docName, apiDesc) => + { + return docName == apiDesc.GroupName; + }); + }); + return services; + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Mapping/ProblemDetailsProfile.cs b/src/V1/Tests/WebAppNet9/Mapping/ProblemDetailsProfile.cs new file mode 100644 index 0000000..28e268e --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Mapping/ProblemDetailsProfile.cs @@ -0,0 +1,21 @@ +using AutoMapper; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using System.Net; + +namespace WebApp.Mapping +{ + public class ProblemDetailsProfile : Profile + { + public ProblemDetailsProfile() + { + CreateMap() + .ForMember(x => x.Detail, y => y.MapFrom(z => JsonConvert.SerializeObject(z))) + .ForMember(x => x.Status, y => y.MapFrom(z => (int)HttpStatusCode.InternalServerError)) + .ForMember(x => x.Type, y => y.MapFrom(z => z.GetType().FullName)) + .ForMember(x => x.Title, y => y.MapFrom(z => z.Message)) + .ForMember(x => x.Instance, y => y.Ignore()) + .ForMember(x => x.Extensions, y => y.Ignore()); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Model/SwaggerRemoveVersionOperationFilter.cs b/src/V1/Tests/WebAppNet9/Model/SwaggerRemoveVersionOperationFilter.cs new file mode 100644 index 0000000..8b56084 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Model/SwaggerRemoveVersionOperationFilter.cs @@ -0,0 +1,15 @@ +using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.SwaggerGen; + +namespace WebApp.Model +{ + public class SwaggerRemoveVersionOperationFilter : IOperationFilter + { + public void Apply(OpenApiOperation operation, OperationFilterContext context) + { + var version = operation.Parameters.Where(x => x.Name == "version").FirstOrDefault(); + if (version != null) + operation.Parameters.Remove(version); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Model/SwaggerReplaceVersionDocumentFilter.cs b/src/V1/Tests/WebAppNet9/Model/SwaggerReplaceVersionDocumentFilter.cs new file mode 100644 index 0000000..f5fc285 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Model/SwaggerReplaceVersionDocumentFilter.cs @@ -0,0 +1,16 @@ +using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.SwaggerGen; + +namespace WebApp.Model +{ + public class SwaggerReplaceVersionDocumentFilter : IDocumentFilter + { + public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context) + { + var paths = new OpenApiPaths(); + foreach (var path in swaggerDoc.Paths) + paths.Add(path.Key.Replace("{version}", swaggerDoc.Info.Version), path.Value); + swaggerDoc.Paths = paths; + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Model/WebAppModule.cs b/src/V1/Tests/WebAppNet9/Model/WebAppModule.cs new file mode 100644 index 0000000..0e928d2 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Model/WebAppModule.cs @@ -0,0 +1,15 @@ +using System.Reflection; + +namespace WebApp.Model +{ + public class WebAppModule : ServiceBricks.Module + { + public WebAppModule() + { + AutomapperAssemblies = new List() + { + typeof(WebAppModule).Assembly + }; + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Pages/Shared/_FooterPartial.cshtml b/src/V1/Tests/WebAppNet9/Pages/Shared/_FooterPartial.cshtml new file mode 100644 index 0000000..630b78d --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Pages/Shared/_FooterPartial.cshtml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Pages/Shared/_HeaderPartial.cshtml b/src/V1/Tests/WebAppNet9/Pages/Shared/_HeaderPartial.cshtml new file mode 100644 index 0000000..8ff9033 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Pages/Shared/_HeaderPartial.cshtml @@ -0,0 +1,13 @@ +
+
+
+ ServiceBricks Logo +
+
+ Web API Starter Application +
+
+ +
+
+
\ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Pages/Shared/_Layout.cshtml b/src/V1/Tests/WebAppNet9/Pages/Shared/_Layout.cshtml new file mode 100644 index 0000000..06151cd --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Pages/Shared/_Layout.cshtml @@ -0,0 +1,44 @@ + + + + + + + @ViewData["Title"] + + + + + + + + + + + + + + + @RenderSection("Head", required: false) + + +
Skip to main content.
+ + + +
+ + @RenderBody() +
+ + + + + + + + + @RenderSection("Scripts", required: false) + + + diff --git a/src/V1/Tests/WebAppNet9/Pages/_ViewImports.cshtml b/src/V1/Tests/WebAppNet9/Pages/_ViewImports.cshtml new file mode 100644 index 0000000..8179c16 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Pages/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using WebApp +@namespace WebApp.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/V1/Tests/WebAppNet9/Pages/_ViewStart.cshtml b/src/V1/Tests/WebAppNet9/Pages/_ViewStart.cshtml new file mode 100644 index 0000000..a5f1004 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Pages/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/src/V1/Tests/WebAppNet9/Program.cs b/src/V1/Tests/WebAppNet9/Program.cs new file mode 100644 index 0000000..d44007f --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Program.cs @@ -0,0 +1,34 @@ +using ServiceBricks; +using ServiceBricks.Logging; + +namespace WebApp +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) + { + return Host.CreateDefaultBuilder(args) + .UseContentRoot(Directory.GetCurrentDirectory()) + .ConfigureAppConfiguration((hostingContext, config) => + { + config.AddAppSettingsConfig(); + }) + .ConfigureLogging((hostingContext, logging) => + { + logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); + logging.AddConsole(); + logging.AddDebug(); + logging.AddServiceBricksLogging(); + }) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Properties/launchSettings.json b/src/V1/Tests/WebAppNet9/Properties/launchSettings.json new file mode 100644 index 0000000..3ca25f7 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:57000", + "sslPort": 47000 + } + }, + "profiles": { + "WebApp": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:7000;http://localhost:6000", + "dotnetRunMessages": true + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupAzureDataTables.cs b/src/V1/Tests/WebAppNet9/StartupAzureDataTables.cs new file mode 100644 index 0000000..7daf70b --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupAzureDataTables.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.AzureDataTables; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupAzureDataTables + { + public StartupAzureDataTables(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingAzureDataTables(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupCosmos.cs b/src/V1/Tests/WebAppNet9/StartupCosmos.cs new file mode 100644 index 0000000..e434c3e --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupCosmos.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.Cosmos; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupCosmos + { + public StartupCosmos(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingCosmos(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupInMemory.cs b/src/V1/Tests/WebAppNet9/StartupInMemory.cs new file mode 100644 index 0000000..67ce3f9 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupInMemory.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.InMemory; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupInMemory + { + public StartupInMemory(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingInMemory(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupMongoDb.cs b/src/V1/Tests/WebAppNet9/StartupMongoDb.cs new file mode 100644 index 0000000..48b432f --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupMongoDb.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.MongoDb; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupMongoDb + { + public StartupMongoDb(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingMongoDb(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupPostgres.cs b/src/V1/Tests/WebAppNet9/StartupPostgres.cs new file mode 100644 index 0000000..4e9ae0d --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupPostgres.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.Postgres; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupPostgres + { + public StartupPostgres(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingPostgres(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupSqlServer.cs b/src/V1/Tests/WebAppNet9/StartupSqlServer.cs new file mode 100644 index 0000000..6edd692 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupSqlServer.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.SqlServer; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupSqlServer + { + public StartupSqlServer(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingSqlServer(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/StartupSqlite.cs b/src/V1/Tests/WebAppNet9/StartupSqlite.cs new file mode 100644 index 0000000..7f292fe --- /dev/null +++ b/src/V1/Tests/WebAppNet9/StartupSqlite.cs @@ -0,0 +1,33 @@ +using ServiceBricks; +using ServiceBricks.Logging.Sqlite; +using WebApp.Extensions; + +namespace WebApp +{ + public class StartupSqlite + { + public StartupSqlite(IConfiguration configuration) + { + Configuration = configuration; + } + + public virtual IConfiguration Configuration { get; set; } + + public virtual void ConfigureServices(IServiceCollection services) + { + services.AddServiceBricks(Configuration); + services.AddServiceBricksLoggingSqlite(Configuration); + ModuleRegistry.Instance.Register(new WebApp.Model.WebAppModule()); // Just for automapper registration + services.AddServiceBricksComplete(Configuration); + services.AddCustomWebsite(Configuration); + } + + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment webHostEnvironment) + { + app.StartServiceBricks(); + app.StartCustomWebsite(webHostEnvironment); + var logger = app.ApplicationServices.GetRequiredService>(); + logger.LogInformation("Application Started"); + } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/ViewModel/Home/ErrorViewModel.cs b/src/V1/Tests/WebAppNet9/ViewModel/Home/ErrorViewModel.cs new file mode 100644 index 0000000..c8e340c --- /dev/null +++ b/src/V1/Tests/WebAppNet9/ViewModel/Home/ErrorViewModel.cs @@ -0,0 +1,7 @@ +namespace WebApp.ViewModel.Home +{ + public class ErrorViewModel + { + public string Message { get; set; } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/ViewModel/Home/HomeViewModel.cs b/src/V1/Tests/WebAppNet9/ViewModel/Home/HomeViewModel.cs new file mode 100644 index 0000000..509ab89 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/ViewModel/Home/HomeViewModel.cs @@ -0,0 +1,6 @@ +namespace WebApp.ViewModel.Home +{ + public class HomeViewModel + { + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/ViewModel/Home/RegisterAdminViewModel.cs b/src/V1/Tests/WebAppNet9/ViewModel/Home/RegisterAdminViewModel.cs new file mode 100644 index 0000000..e7c6937 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/ViewModel/Home/RegisterAdminViewModel.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace WebApp.ViewModel.Home +{ + public class RegisterAdminViewModel + { + [Required] + public string Email { get; set; } + + [Required] + public string Password { get; set; } + } +} \ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Views/Home/Error.cshtml b/src/V1/Tests/WebAppNet9/Views/Home/Error.cshtml new file mode 100644 index 0000000..4eaed11 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Views/Home/Error.cshtml @@ -0,0 +1,16 @@ +@model WebApp.ViewModel.Home.ErrorViewModel +@{ + ViewBag.Title = "Error"; + ViewBag.Description = "Error"; + ViewBag.Keywords = "Error"; +} +

Error

+

+ An error happened processing your request. +

+

+ @if(Model != null) + { + @Model.Message + } +

\ No newline at end of file diff --git a/src/V1/Tests/WebAppNet9/Views/Home/Index.cshtml b/src/V1/Tests/WebAppNet9/Views/Home/Index.cshtml new file mode 100644 index 0000000..65cc5f7 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Views/Home/Index.cshtml @@ -0,0 +1,15 @@ +@model WebApp.ViewModel.Home.HomeViewModel +@{ + ViewBag.Title = "Welcome"; + ViewBag.Description = "Welcome"; + ViewBag.Keywords = "Welcome"; +} +

Welcome

+

+ This is the ServiceBricks Web API Starter Application. + You can modify this application however you like. + Please visit our website at: https://ServiceBricks.com. +

+

+ View Swagger Page +

diff --git a/src/V1/Tests/WebAppNet9/Views/_ViewStart.cshtml b/src/V1/Tests/WebAppNet9/Views/_ViewStart.cshtml new file mode 100644 index 0000000..a5f1004 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/src/V1/Tests/WebAppNet9/WebAppNet9.csproj b/src/V1/Tests/WebAppNet9/WebAppNet9.csproj new file mode 100644 index 0000000..c447334 --- /dev/null +++ b/src/V1/Tests/WebAppNet9/WebAppNet9.csproj @@ -0,0 +1,47 @@ + + + + net9.0 + disable + enable + False + + + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/V1/Tests/WebAppNet9/wwwroot/Logo.png b/src/V1/Tests/WebAppNet9/wwwroot/Logo.png new file mode 100644 index 0000000..d161e16 Binary files /dev/null and b/src/V1/Tests/WebAppNet9/wwwroot/Logo.png differ diff --git a/src/V1/Tests/WebAppNet9/wwwroot/favicon.ico b/src/V1/Tests/WebAppNet9/wwwroot/favicon.ico new file mode 100644 index 0000000..7748ac5 Binary files /dev/null and b/src/V1/Tests/WebAppNet9/wwwroot/favicon.ico differ