diff --git a/booking.rest b/booking.rest index 7654805..291dfa7 100644 --- a/booking.rest +++ b/booking.rest @@ -42,10 +42,10 @@ authorization: bearer {{Authenticate.response.body.access_token}} "firstName": "John", "lastName": "Do", "username": "admin", - "passportNumber": "1290000000", + "passportNumber": "12900000000", "email": "admin@admin.com", - "password": "Admin6@12345", - "confirmPassword": "Admin6@12345" + "password": "Admin@12345", + "confirmPassword": "Admin@12345" } ### @@ -121,7 +121,7 @@ Content-Type: application/json authorization: bearer {{Authenticate.response.body.access_token}} { - "flightNumber": "12BB44", + "flightNumber": "12BB", "aircraftId": 1, "departureAirportId": 1, "departureDate": "2022-03-01T14:55:41.255Z", @@ -219,7 +219,7 @@ Content-Type: application/json authorization: bearer {{Authenticate.response.body.access_token}} { - "passportNumber": "123456789", + "passportNumber": "12900000000", "passengerType": 1, "age": 30 } @@ -251,7 +251,7 @@ Content-Type: application/json authorization: bearer {{Authenticate.response.body.access_token}} { - "passengerId": 4779536520052736, + "passengerId": 7201620062109696, "flightId": 1, "description": "I want to fly to iran" } diff --git a/src/ApiGateway/src/ApiGateway.csproj b/src/ApiGateway/src/ApiGateway.csproj index 5eda3b5..0b9fd3d 100644 --- a/src/ApiGateway/src/ApiGateway.csproj +++ b/src/ApiGateway/src/ApiGateway.csproj @@ -1,12 +1,21 @@ - net6.0 + net7.0 enable - + + + + + + + + + + diff --git a/src/BuildingBlocks/BuildingBlocks.csproj b/src/BuildingBlocks/BuildingBlocks.csproj index ab0dddd..9f78129 100644 --- a/src/BuildingBlocks/BuildingBlocks.csproj +++ b/src/BuildingBlocks/BuildingBlocks.csproj @@ -1,101 +1,103 @@ - net6.0 + net7.0 enable - - - - + + + + - + - - - - - - - + + + + + + + + + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - - - + + + - - - - - - - - - + + + + + + + + + - + - + - - - - + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + @@ -109,23 +111,29 @@ - - + + - - + + - - - - + + + - + + + + + + + + diff --git a/src/BuildingBlocks/Caching/CachingBehavior.cs b/src/BuildingBlocks/Caching/CachingBehavior.cs index 4bd3889..39d5676 100644 --- a/src/BuildingBlocks/Caching/CachingBehavior.cs +++ b/src/BuildingBlocks/Caching/CachingBehavior.cs @@ -22,9 +22,8 @@ public class CachingBehavior : IPipelineBehavior Handle(TRequest request, CancellationToken cancellationToken, - RequestHandlerDelegate next) + public async Task Handle(TRequest request, RequestHandlerDelegate next, + CancellationToken cancellationToken) { if (request is not ICacheRequest || _cacheRequest == null) // No cache request found, so just continue through the pipeline diff --git a/src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs b/src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs index 8ccf866..deb156d 100644 --- a/src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs +++ b/src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs @@ -1,7 +1,3 @@ -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using EasyCaching.Core; using MediatR; using Microsoft.Extensions.Logging; @@ -26,8 +22,7 @@ namespace BuildingBlocks.Caching _invalidateCacheRequest = invalidateCacheRequest; } - public async Task Handle(TRequest request, CancellationToken cancellationToken, - RequestHandlerDelegate next) + public async Task Handle(TRequest request, RequestHandlerDelegate next, CancellationToken cancellationToken) { if (request is not IInvalidateCacheRequest || _invalidateCacheRequest == null) { diff --git a/src/BuildingBlocks/EFCore/EfTxBehavior.cs b/src/BuildingBlocks/EFCore/EfTxBehavior.cs index 15dbc6f..b0a6e76 100644 --- a/src/BuildingBlocks/EFCore/EfTxBehavior.cs +++ b/src/BuildingBlocks/EFCore/EfTxBehavior.cs @@ -25,10 +25,8 @@ public class EfTxBehavior : IPipelineBehavior Handle( - TRequest request, - CancellationToken cancellationToken, - RequestHandlerDelegate next) + public async Task Handle(TRequest request, RequestHandlerDelegate next, + CancellationToken cancellationToken) { _logger.LogInformation( "{Prefix} Handled command {MediatrRequest}", diff --git a/src/BuildingBlocks/Logging/LoggingBehavior.cs b/src/BuildingBlocks/Logging/LoggingBehavior.cs index e56c2c1..5bbb120 100644 --- a/src/BuildingBlocks/Logging/LoggingBehavior.cs +++ b/src/BuildingBlocks/Logging/LoggingBehavior.cs @@ -15,10 +15,8 @@ public class LoggingBehavior : IPipelineBehavior Handle( - TRequest request, - CancellationToken cancellationToken, - RequestHandlerDelegate next) + public async Task Handle(TRequest request, RequestHandlerDelegate next, + CancellationToken cancellationToken) { const string prefix = nameof(LoggingBehavior); diff --git a/src/BuildingBlocks/TestBase/IntegrationTestBase.cs b/src/BuildingBlocks/TestBase/IntegrationTestBase.cs index 5c61aba..6423ae4 100644 --- a/src/BuildingBlocks/TestBase/IntegrationTestBase.cs +++ b/src/BuildingBlocks/TestBase/IntegrationTestBase.cs @@ -346,6 +346,7 @@ public class IntegrationTestFixtureCore : IAsyncLifetime public async Task InitializeAsync() { + //Todo: upgrade to new version Respawn _checkpointDefaultDB = new Checkpoint {TablesToIgnore = new[] {"__EFMigrationsHistory"}}; _checkpointPersistMessageDB = new Checkpoint {TablesToIgnore = new[] {"__EFMigrationsHistory"}}; diff --git a/src/BuildingBlocks/Validation/ValidationBehavior.cs b/src/BuildingBlocks/Validation/ValidationBehavior.cs index f8a23bf..d9b82c2 100644 --- a/src/BuildingBlocks/Validation/ValidationBehavior.cs +++ b/src/BuildingBlocks/Validation/ValidationBehavior.cs @@ -14,14 +14,16 @@ public sealed class ValidationBehavior : IPipelineBehavior< { _serviceProvider = serviceProvider; } - public async Task Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate next) + + public async Task Handle(TRequest request, RequestHandlerDelegate next, + CancellationToken cancellationToken) { _validator = _serviceProvider.GetService>(); if (_validator is null) return await next(); - + await _validator.HandleValidationAsync(request); return await next(); } -} \ No newline at end of file +} diff --git a/src/Services/Booking/src/Booking.Api/Booking.Api.csproj b/src/Services/Booking/src/Booking.Api/Booking.Api.csproj index 278265d..af8b754 100644 --- a/src/Services/Booking/src/Booking.Api/Booking.Api.csproj +++ b/src/Services/Booking/src/Booking.Api/Booking.Api.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/src/Services/Booking/src/Booking.Api/appsettings.json b/src/Services/Booking/src/Booking.Api/appsettings.json index e300ef0..1cfcba1 100644 --- a/src/Services/Booking/src/Booking.Api/appsettings.json +++ b/src/Services/Booking/src/Booking.Api/appsettings.json @@ -39,7 +39,7 @@ "PersistMessageOptions": { "Interval": 30, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "AllowedHosts": "*" } diff --git a/src/Services/Booking/src/Booking.Api/appsettings.test.json b/src/Services/Booking/src/Booking.Api/appsettings.test.json index 7e087dc..4673fd0 100644 --- a/src/Services/Booking/src/Booking.Api/appsettings.test.json +++ b/src/Services/Booking/src/Booking.Api/appsettings.test.json @@ -16,7 +16,7 @@ "PersistMessageOptions": { "Interval": 1, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "MongoOptions": { "ConnectionString": "mongodb://localhost:27017", diff --git a/src/Services/Booking/src/Booking/Booking.csproj b/src/Services/Booking/src/Booking/Booking.csproj index 8397725..704b1db 100644 --- a/src/Services/Booking/src/Booking/Booking.csproj +++ b/src/Services/Booking/src/Booking/Booking.csproj @@ -1,16 +1,16 @@ - net6.0 + net7.0 enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj b/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj index c48e4af..559d998 100644 --- a/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj +++ b/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -10,17 +10,13 @@ PreserveNewest - + - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Services/Flight/src/Flight.Api/Flight.Api.csproj b/src/Services/Flight/src/Flight.Api/Flight.Api.csproj index e1016b5..94e43ad 100644 --- a/src/Services/Flight/src/Flight.Api/Flight.Api.csproj +++ b/src/Services/Flight/src/Flight.Api/Flight.Api.csproj @@ -1,15 +1,11 @@ - net6.0 + net7.0 enable enable - - - - diff --git a/src/Services/Flight/src/Flight.Api/appsettings.json b/src/Services/Flight/src/Flight.Api/appsettings.json index d32d545..95ff233 100644 --- a/src/Services/Flight/src/Flight.Api/appsettings.json +++ b/src/Services/Flight/src/Flight.Api/appsettings.json @@ -16,7 +16,7 @@ } }, "ConnectionStrings": { - "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "MongoOptions": { "ConnectionString": "mongodb://localhost:27017", @@ -35,7 +35,7 @@ "PersistMessageOptions": { "Interval": 30, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "AllowedHosts": "*" } diff --git a/src/Services/Flight/src/Flight.Api/appsettings.test.json b/src/Services/Flight/src/Flight.Api/appsettings.test.json index dee31b4..cebe947 100644 --- a/src/Services/Flight/src/Flight.Api/appsettings.test.json +++ b/src/Services/Flight/src/Flight.Api/appsettings.test.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "RabbitMq": { "HostName": "localhost", @@ -19,6 +19,6 @@ "PersistMessageOptions": { "Interval": 1, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" } } diff --git a/src/Services/Flight/src/Flight/Flight.csproj b/src/Services/Flight/src/Flight/Flight.csproj index a89a5de..23644c6 100644 --- a/src/Services/Flight/src/Flight/Flight.csproj +++ b/src/Services/Flight/src/Flight/Flight.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj b/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj index 368989b..59b5659 100644 --- a/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj +++ b/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -12,15 +12,11 @@ - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Services/Flight/tests/UnitTest/Unit.Test.csproj b/src/Services/Flight/tests/UnitTest/Unit.Test.csproj index 7bbbfad..47357b0 100644 --- a/src/Services/Flight/tests/UnitTest/Unit.Test.csproj +++ b/src/Services/Flight/tests/UnitTest/Unit.Test.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -12,13 +12,11 @@ - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Services/Identity/src/Identity.Api/Identity.Api.csproj b/src/Services/Identity/src/Identity.Api/Identity.Api.csproj index 1a10b24..3ad417a 100644 --- a/src/Services/Identity/src/Identity.Api/Identity.Api.csproj +++ b/src/Services/Identity/src/Identity.Api/Identity.Api.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/src/Services/Identity/src/Identity.Api/appsettings.json b/src/Services/Identity/src/Identity.Api/appsettings.json index e687693..7ab6d31 100644 --- a/src/Services/Identity/src/Identity.Api/appsettings.json +++ b/src/Services/Identity/src/Identity.Api/appsettings.json @@ -3,7 +3,7 @@ "Name": "Identity-Service" }, "ConnectionStrings": { - "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "RabbitMq": { "HostName": "localhost", @@ -27,7 +27,7 @@ "PersistMessageOptions": { "Interval": 30, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "AllowedHosts": "*" } diff --git a/src/Services/Identity/src/Identity.Api/appsettings.test.json b/src/Services/Identity/src/Identity.Api/appsettings.test.json index 07d4bdb..e6dacae 100644 --- a/src/Services/Identity/src/Identity.Api/appsettings.test.json +++ b/src/Services/Identity/src/Identity.Api/appsettings.test.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "RabbitMq": { "HostName": "localhost", @@ -19,6 +19,6 @@ "PersistMessageOptions": { "Interval": 1, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" } } diff --git a/src/Services/Identity/src/Identity.Api/keys/is-signing-key-DBA1A35FADC54B3029F893520A76F5EF.json b/src/Services/Identity/src/Identity.Api/keys/is-signing-key-DBA1A35FADC54B3029F893520A76F5EF.json deleted file mode 100644 index a869c8f..0000000 --- a/src/Services/Identity/src/Identity.Api/keys/is-signing-key-DBA1A35FADC54B3029F893520A76F5EF.json +++ /dev/null @@ -1 +0,0 @@ -{"Version":1,"Id":"DBA1A35FADC54B3029F893520A76F5EF","Created":"2022-07-28T16:47:11.7018861Z","Algorithm":"RS256","IsX509Certificate":false,"Data":"CfDJ8Pyl4Q0BTFBNj7ITVoMSIQgxsejdUpcAxnjG-PMMtbZfHoKFjS53dsihg0Mn4-xfYVT2L9VBiLgWQuec7YAQ5GbE991LR2gBWUYeLdHGtuvgMTWWkDA9p_NlDAVjUfHlG9j19XUDWaYSyumpE9zGlnb2hKewIhZxPOpRWuZRaJ93vCV9SziCb4WeLwb54wB4svAU1r2VGdxdsPuRuQvBScfQ8kQHI0MkWElp3PIPL79sDJxA4zwvX07WXM9_lCOXGpt_lhl9Bqh0V0FHMird1TZzNd8itXLi2AiRTyiyo2KaCLQwGRJju8zXbFn-HsHtzB-FvuNPHQFHdHG7if6qRiD-TXKFqPouGQHVZCiyPOCIiUPUWfpIJ5C5VrqkkTAEiqNDXGuSvHmwtjbhEtQlR1Q5Tzn9luT94sGrrmg6COnhVRlUondbqvqRS8_OdPefQPPPej_x67BHA7NNxXyrkT157ykDgm_xL4SdomM1MtTcg0Rer1QfqdiHzZ3FSvD4RoRx1NKfzEqZM2W_JxdnK058qoyMuJ34YihvE8wdORS17AznpDvNkb-ofoo3rqTMfyE0kuc0sEiLLknPjkW_k9kXbvrxMM7CDcCu6VkG697PkGB-fzdfxumZ0QN0omP1gO1aBrV3GtdN91hbL8dGyNBw3M16b1lmkh_2Hm_ezC4odU2aU0Rgat7hhVZCcTRg0du-01PmnJG36uA_NhM_3qcWAOnXd9LR2KuwvjI4Yh-CwnrvgXJb2amYwO_n2MKX9ANhZYzglM3Wa0UpTJ7ke5-Ys901cPHhhOf6WZpp70AjrLwPpJDYw5SikFvVG2SBT39hVSn0bCINOiu-RIQJ0KBgA-BpqD_OVaB648tPtVbHOPVm0D-pGVWl9PAylu9_MT0WCOPaAxyZ_83qwe-EXHX6XsYDhvL-ldb2qPKJaaOZ2nntOzciGjzWhqeNDeqAyt8nIkrnjJNM48Cn0lIU28GTsK9Xr4UNNSruQafXVUrZOD1v7FHJEtVYpOnQDGY1hPtTA1x-ScHFArV6y9WlLN0s_sR3KCMXilPsWFyRkO4sUic2Ly2rKJ_8LKV-urlW9K1-1OyVHI6vKjlpBNpEH1eT9n1L4Ktwcn8xGwu02y6uqHZeQaXEjG7IJBHAThdEySSV86zijyoida3yFU-atWJE3w0eiiuW94xvQgNfYiTtqmXU8b7vcf9uyvqmIupr0nMM0ISb-Z0uQxjWUzsE9xjvo6niUQS56ToVDh1RHL31MkZi4UT1VmfNWCKwAbhe989C-wcNoOj7kBh5AUx6z8_baCGUl1k7IZwY_TG35SyOcwoYD7X6tgzMzfh3vr3GJ4ZGaofXIVGHN-tg-hj6h-4vOBX0LYhEmu6K82mj25X43Dcp-kN8JOKP4BZAJQu9EvBS8ED-Kzxm_IqDc-gdZ2GM1qtUIyIUmPZSIcfGztm69wkJ2wmw5_j_InA1CWWSglOPyxJZezRwEH5uShisIYtLHYc3k_f6FK2SyPDGnqH99AEmVv-QsALLuYY0PbgRvGc3oAMCC5sfMwWU4Zu55ENM7VYEkH2Xym2V1Z2rNAhaxqenDVkrbsZc72nm3rGvmQxi2DLdWzuyCmfT7Qg3v07q0_QqdU7S9UtUEFsBCi61i_mceNl_Ls4pi9sQqaU5c0jF5PWyW-4vKhf6OV0JAau2sD03hDDJKOtxZWRELTqUaQZjOPR-M1EmGcN88oJgVBvzZ-DRUVssWuAMvOJ_-H9s_5MdB3p4YKgWKEl3GEmsRuNfaOAs6NNQpV9MtNm-uPUROJ-xBfd4MV6CJVMt9duGMMRtaNqIueNz8Z0WyuubjFT1CdisHUCSODjIZuoqiid8hEDo6e_VaEskTzxwZc17c2ZrXptkiKpw8LtWGUOcIaE3Dcp48y6tc8R6aTA1zFygT2L-P91JwKJBc_YdRNAm1Ts1on92p1xi_7AG_ZhFJUPWjpluGAni5Y9wwCKVUvY0NGNBUMYtLsn0PpMFCnIPqS4Yq5SLfiSXUjWikDa_ek3kloFEbk8zF2tKNr4MXR78XdDPluBvFNR8NjhhxkaWgCmA0BTS9TqP9xlDAChwwWJJqpCoNWLad3RA6SHHnkkarLPjheVC4BVLGX1otEKVp5igEMGOGMoamEtkzuIaTvddEXXt2u2r0_mlzlxbOXIETB-NEy376Q1Akh8XWPcEB0X7V9BDPlJmd1aYUAVNF1AdqXOmFbLkqBF63C6De1WuPOiRblj5nGSSk6bsPIvm-PhTupzsJcBFrCVCHJbQvqZb7gS-crJqnmf88mBj8iPgUN-c-j8x4srV0tCvwV-tKtu3wgWzblnVrEvWgSMw0CLtHBbm_b9HBpWLmK12SVodiwyGskYYzX9f69KZRHizhWgaiaPJW4OHsZOuHUd1pqxDEeVa88JX0Mj8LhCTYBo4Pgf5zBDuW6RDB9c-ZamJRo0ObSyakzhC0bfQcrpv","DataProtected":true} \ No newline at end of file diff --git a/src/Services/Identity/src/Identity/Identity.csproj b/src/Services/Identity/src/Identity/Identity.csproj index 42086cb..57491c9 100644 --- a/src/Services/Identity/src/Identity/Identity.csproj +++ b/src/Services/Identity/src/Identity/Identity.csproj @@ -1,11 +1,11 @@ - net6.0 + net7.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj b/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj index 26fcae7..22a9fc8 100644 --- a/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj +++ b/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -10,17 +10,13 @@ PreserveNewest - + - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj b/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj index f39ceab..347e509 100644 --- a/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj +++ b/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.json b/src/Services/Passenger/src/Passenger.Api/appsettings.json index ed468a5..31dc86a 100644 --- a/src/Services/Passenger/src/Passenger.Api/appsettings.json +++ b/src/Services/Passenger/src/Passenger.Api/appsettings.json @@ -3,7 +3,7 @@ "Name": "Passenger-Service" }, "ConnectionStrings": { - "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "MongoOptions": { "ConnectionString": "mongodb://localhost:27017", @@ -35,7 +35,7 @@ "PersistMessageOptions": { "Interval": 30, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "AllowedHosts": "*" } diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.test.json b/src/Services/Passenger/src/Passenger.Api/appsettings.test.json index 266dad5..859397a 100644 --- a/src/Services/Passenger/src/Passenger.Api/appsettings.test.json +++ b/src/Services/Passenger/src/Passenger.Api/appsettings.test.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true" + "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" }, "RabbitMq": { "HostName": "localhost", @@ -19,6 +19,6 @@ "PersistMessageOptions": { "Interval": 1, "Enabled": true, - "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True" } } diff --git a/src/Services/Passenger/src/Passenger/Passenger.csproj b/src/Services/Passenger/src/Passenger/Passenger.csproj index 3e9a9b8..5080fe6 100644 --- a/src/Services/Passenger/src/Passenger/Passenger.csproj +++ b/src/Services/Passenger/src/Passenger/Passenger.csproj @@ -1,13 +1,13 @@ - net6.0 + net7.0 enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj b/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj index c1d3846..36c4c98 100644 --- a/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj +++ b/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -12,15 +12,11 @@ - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all