From 5acb3ebf6679411812a0e8725d7e63542b2d3c9a Mon Sep 17 00:00:00 2001 From: James Gunn Date: Fri, 20 Dec 2024 11:13:50 +0000 Subject: [PATCH] Combine ServiceDefaults and UiCommon into WebCommon project --- .github/workflows/pr.yml | 1 + TeachingRecordSystem/TeachingRecordSystem.sln | 19 +- .../src/TeachingRecordSystem.Api/Program.cs | 4 +- .../TeachingRecordSystem.Api.csproj | 2 +- .../packages.lock.json | 2 +- .../AuthorizeAccessLinkGenerator.cs | 2 +- ...ViewDataFromFormFlowJourneyResultFilter.cs | 2 +- .../Infrastructure/FormFlow/Extensions.cs | 4 +- .../Middleware/AddAnalyticsDataMiddleware.cs | 2 +- .../Security/FormFlowJourneySignInHandler.cs | 2 +- .../OneLoginAuthenticationSchemeProvider.cs | 2 +- .../Pages/CheckAnswers.cshtml.cs | 2 +- .../Pages/Connect.cshtml.cs | 2 +- .../Pages/DebugIdentity.cshtml.cs | 2 +- .../Pages/Found.cshtml.cs | 2 +- .../Pages/NationalInsuranceNumber.cshtml.cs | 2 +- .../Pages/NotFound.cshtml.cs | 2 +- .../Pages/NotVerified.cshtml.cs | 2 +- .../Pages/RequestTrn/Address.cshtml.cs | 2 +- .../Pages/RequestTrn/CheckAnswers.cshtml.cs | 2 +- .../Pages/RequestTrn/DateOfBirth.cshtml.cs | 2 +- .../Pages/RequestTrn/Email.cshtml.cs | 2 +- .../Pages/RequestTrn/EmailInUse.cshtml.cs | 2 +- .../Pages/RequestTrn/Identity.cshtml.cs | 2 +- .../Pages/RequestTrn/Index.cshtml.cs | 2 +- .../Pages/RequestTrn/Name.cshtml.cs | 2 +- .../NationalInsuranceNumber.cshtml.cs | 2 +- .../Pages/RequestTrn/NotEligible.cshtml.cs | 2 +- .../Pages/RequestTrn/NpqCheck.cshtml.cs | 2 +- .../Pages/RequestTrn/PreviousName.cshtml.cs | 4 +- .../RequestTrn/RequestTrnJourneyState.cs | 2 +- .../Pages/RequestTrn/Submitted.cshtml.cs | 2 +- .../Pages/SignOut.cshtml.cs | 2 +- .../Pages/SupportRequestSubmitted.cshtml.cs | 2 +- .../Pages/Test.cshtml.cs | 2 +- .../Pages/Trn.cshtml.cs | 2 +- .../Program.cs | 10 +- .../SignInJourneyHelper.cs | 4 +- .../SignInJourneyState.cs | 2 +- ...eachingRecordSystem.AuthorizeAccess.csproj | 3 +- .../TestAppConfiguration.cs | 2 +- .../packages.lock.json | 8 +- .../GlobalUsings.cs | 2 +- .../Pages/_ViewImports.cshtml | 2 +- .../TeachingRecordSystem.SupportUi/Program.cs | 8 +- .../TeachingRecordSystem.SupportUi.csproj | 3 +- .../TrsLinkGenerator.cs | 2 +- .../packages.lock.json | 8 +- .../Properties/InternalsVisibleTo.cs | 3 - .../TeachingRecordSystem.UiCommon.csproj | 15 - .../packages.lock.json | 2646 ----------------- .../RequiredIfOtherPropertyEqualsAttribute.cs | 2 +- .../Extensions.cs | 4 +- .../Filters/NoCachePageFilter.cs | 2 +- .../Filters/NotFoundResourceFilter.cs | 2 +- .../FormFlow/ActionJourneyMetadata.cs | 2 +- .../FormFlow/ActivatesJourneyAttribute.cs | 2 +- .../FormFlow/ActivatesJourneyMarker.cs | 2 +- .../FormFlow/Constants.cs | 2 +- ...BindJourneyInstancePropertiesConvention.cs | 2 +- .../Conventions/FormFlowConventions.cs | 2 +- .../FormFlow/DefaultFormFlowOptions.cs | 2 +- .../FormFlow/DiscoverJourneyDescriptors.cs | 2 +- .../Filters/ActivateInstanceFilter.cs | 2 +- .../FormFlow/Filters/MissingInstanceFilter.cs | 2 +- .../FormFlow/FormFlowOptions.cs | 2 +- .../FormFlow/IRegisterJourney.cs | 2 +- .../FormFlow/JourneyAttribute.cs | 2 +- .../FormFlow/JourneyDescriptor.cs | 2 +- .../FormFlow/JourneyInstance.cs | 4 +- .../FormFlow/JourneyInstanceId.cs | 2 +- .../FormFlow/JourneyInstanceProvider.cs | 4 +- .../FormFlow/JourneyRegistry.cs | 2 +- .../FormFlow/KeysBuilder.cs | 2 +- .../FormFlow/MissingInstanceHandler.cs | 2 +- .../JourneyInstanceModelBinder.cs | 2 +- .../FormFlow/PropertiesBuilder.cs | 2 +- .../RedirectToActionResultExtensions.cs | 2 +- .../FormFlow/RequireInstanceMarker.cs | 2 +- .../RequireJourneyInstanceAttribute.cs | 2 +- .../FormFlow/ServiceCollectionExtensions.cs | 10 +- .../State/CommitStateChangesMiddleware.cs | 2 +- .../State/DbUserInstanceStateProvider.cs | 2 +- .../State/DbUserInstanceStateProviderBase.cs | 2 +- .../FormFlow/State/ICurrentUserIdProvider.cs | 0 .../FormFlow/State/IStateSerializer.cs | 2 +- .../State/IUserInstanceStateProvider.cs | 2 +- .../FormFlow/State/JsonOptions.cs | 2 +- .../FormFlow/State/JsonStateSerializer.cs | 2 +- .../Logging/RedactParametersAttribute.cs | 2 +- .../Logging/RedactedParametersMetadata.cs | 2 +- .../RemoveRedactedUrlParametersEnricher.cs | 2 +- ...moveRedactedUrlParametersEventProcessor.cs | 2 +- .../Infrastructure/Logging/UrlRedactor.cs | 2 +- .../WebApplicationBuilderExtensions.cs | 2 +- ...AppendSecurityResponseHeadersMiddleware.cs | 2 +- .../Properties/InternalsVisibleTo.cs | 3 + .../TeachingRecordSystem.WebCommon.csproj} | 4 - .../packages.lock.json | 0 .../packages.lock.json | 28 +- .../HostFixture.cs | 2 +- .../Security/FakeOneLoginHandler.cs | 2 +- .../packages.lock.json | 33 +- .../HostFixture.cs | 2 +- .../JourneyInstanceExtensions.cs | 2 +- .../PageTests/RequestTrn/TestBase.cs | 4 +- .../TestBase.cs | 4 +- .../packages.lock.json | 33 +- .../packages.lock.json | 27 +- .../GlobalUsings.cs | 2 +- .../HostFixture.cs | 2 +- .../TestBase.cs | 2 +- .../packages.lock.json | 33 +- .../FormFlow/InMemoryInstanceStateProvider.cs | 4 +- .../TeachingRecordSystem.UiTestCommon.csproj | 2 +- .../packages.lock.json | 203 +- .../FormFlow/EndToEndTests.cs | 5 +- .../InMemoryInstanceStateProvider.cs | 6 +- .../FormFlow/Infrastructure/MvcTestBase.cs | 6 +- .../FormFlow/Infrastructure/MvcTestFixture.cs | 7 +- .../FormFlow/JourneyInstanceIdTests.cs | 3 +- .../FormFlow/JourneyInstanceProviderTests.cs | 5 +- .../FormFlow/JourneyInstanceTests.cs | 5 +- .../MissingInstanceActionFilterTests.cs | 5 +- .../RouteValueDictionaryExtensions.cs | 2 +- ...achingRecordSystem.WebCommon.Tests.csproj} | 2 +- .../packages.lock.json | 203 +- 127 files changed, 594 insertions(+), 2961 deletions(-) delete mode 100644 TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Properties/InternalsVisibleTo.cs delete mode 100644 TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/TeachingRecordSystem.UiCommon.csproj delete mode 100644 TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs (95%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Extensions.cs (95%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/Filters/NoCachePageFilter.cs (93%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/Filters/NotFoundResourceFilter.cs (88%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/ActionJourneyMetadata.cs (89%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/ActivatesJourneyAttribute.cs (77%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/ActivatesJourneyMarker.cs (75%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/Constants.cs (66%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs (91%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/Conventions/FormFlowConventions.cs (95%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/DefaultFormFlowOptions.cs (83%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/DiscoverJourneyDescriptors.cs (94%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/Filters/ActivateInstanceFilter.cs (96%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/Filters/MissingInstanceFilter.cs (95%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/FormFlowOptions.cs (91%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/IRegisterJourney.cs (64%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/JourneyAttribute.cs (87%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/JourneyDescriptor.cs (89%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/JourneyInstance.cs (97%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/JourneyInstanceId.cs (98%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/JourneyInstanceProvider.cs (99%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/JourneyRegistry.cs (92%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/KeysBuilder.cs (94%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/MissingInstanceHandler.cs (80%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs (96%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/PropertiesBuilder.cs (91%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/RedirectToActionResultExtensions.cs (97%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/RequireInstanceMarker.cs (79%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/RequireJourneyInstanceAttribute.cs (91%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/ServiceCollectionExtensions.cs (90%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/CommitStateChangesMiddleware.cs (90%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/DbUserInstanceStateProvider.cs (98%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/DbUserInstanceStateProviderBase.cs (98%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/ICurrentUserIdProvider.cs (100%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/IStateSerializer.cs (71%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/IUserInstanceStateProvider.cs (91%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/JsonOptions.cs (77%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/FormFlow/State/JsonStateSerializer.cs (90%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Infrastructure/Logging/RedactParametersAttribute.cs (94%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Infrastructure/Logging/RedactedParametersMetadata.cs (68%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs (95%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs (88%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Infrastructure/Logging/UrlRedactor.cs (98%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/Infrastructure/Logging/WebApplicationBuilderExtensions.cs (94%) rename TeachingRecordSystem/src/{TeachingRecordSystem.UiCommon => TeachingRecordSystem.WebCommon}/Middleware/AppendSecurityResponseHeadersMiddleware.cs (91%) create mode 100644 TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Properties/InternalsVisibleTo.cs rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj => TeachingRecordSystem.WebCommon/TeachingRecordSystem.WebCommon.csproj} (92%) rename TeachingRecordSystem/src/{TeachingRecordSystem.ServiceDefaults => TeachingRecordSystem.WebCommon}/packages.lock.json (100%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/EndToEndTests.cs (97%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs (92%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/Infrastructure/MvcTestBase.cs (88%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/Infrastructure/MvcTestFixture.cs (90%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/JourneyInstanceIdTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/JourneyInstanceProviderTests.cs (99%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/JourneyInstanceTests.cs (95%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/MissingInstanceActionFilterTests.cs (94%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/FormFlow/RouteValueDictionaryExtensions.cs (84%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests/TeachingRecordSystem.UiCommon.Tests.csproj => TeachingRecordSystem.WebCommon.Tests/TeachingRecordSystem.WebCommon.Tests.csproj} (86%) rename TeachingRecordSystem/tests/{TeachingRecordSystem.UiCommon.Tests => TeachingRecordSystem.WebCommon.Tests}/packages.lock.json (93%) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index aa031f6ec..ef8ff1fc0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -96,6 +96,7 @@ jobs: TeachingRecordSystem.AuthorizeAccess.Tests, TeachingRecordSystem.SupportUi.EndToEndTests, TeachingRecordSystem.AuthorizeAccess.EndToEndTests, + TeachingRecordSystem.WebCommon.Tests, ] services: diff --git a/TeachingRecordSystem/TeachingRecordSystem.sln b/TeachingRecordSystem/TeachingRecordSystem.sln index 2e2b58064..a3afaf5df 100644 --- a/TeachingRecordSystem/TeachingRecordSystem.sln +++ b/TeachingRecordSystem/TeachingRecordSystem.sln @@ -37,13 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Suppor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Worker", "src\TeachingRecordSystem.Worker\TeachingRecordSystem.Worker.csproj", "{E7D4BCFD-E610-41E2-B209-0BE13799C7A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.ServiceDefaults", "src\TeachingRecordSystem.ServiceDefaults\TeachingRecordSystem.ServiceDefaults.csproj", "{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.AuthorizeAccess", "src\TeachingRecordSystem.AuthorizeAccess\TeachingRecordSystem.AuthorizeAccess.csproj", "{960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.UiCommon", "src\TeachingRecordSystem.UiCommon\TeachingRecordSystem.UiCommon.csproj", "{3B40F089-387D-4721-A79D-1C39E682D550}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.WebCommon", "src\TeachingRecordSystem.WebCommon\TeachingRecordSystem.WebCommon.csproj", "{3B40F089-387D-4721-A79D-1C39E682D550}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.UiCommon.Tests", "tests\TeachingRecordSystem.UiCommon.Tests\TeachingRecordSystem.UiCommon.Tests.csproj", "{8F71F933-72A9-4512-89A1-B28ACEC38BC4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.WebCommon.Tests", "tests\TeachingRecordSystem.WebCommon.Tests\TeachingRecordSystem.WebCommon.Tests.csproj", "{8F71F933-72A9-4512-89A1-B28ACEC38BC4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.AuthorizeAccess.Tests", "tests\TeachingRecordSystem.AuthorizeAccess.Tests\TeachingRecordSystem.AuthorizeAccess.Tests.csproj", "{08E99A19-AD1F-4F95-BF13-31248D486799}" EndProject @@ -197,18 +195,6 @@ Global {E7D4BCFD-E610-41E2-B209-0BE13799C7A8}.Release|x64.Build.0 = Release|Any CPU {E7D4BCFD-E610-41E2-B209-0BE13799C7A8}.Release|x86.ActiveCfg = Release|Any CPU {E7D4BCFD-E610-41E2-B209-0BE13799C7A8}.Release|x86.Build.0 = Release|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x64.ActiveCfg = Debug|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x64.Build.0 = Debug|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x86.ActiveCfg = Debug|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x86.Build.0 = Debug|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|Any CPU.Build.0 = Release|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x64.ActiveCfg = Release|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x64.Build.0 = Release|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x86.ActiveCfg = Release|Any CPU - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x86.Build.0 = Release|Any CPU {960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}.Debug|Any CPU.Build.0 = Debug|Any CPU {960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -309,7 +295,6 @@ Global {EB46905A-F7B4-4BDC-B376-6091264D6303} = {91DCFC76-6636-4AC1-B81C-7F8AE1F22116} {407EB5A5-8B4F-4F7D-80BA-E39AB6AD013C} = {91DCFC76-6636-4AC1-B81C-7F8AE1F22116} {E7D4BCFD-E610-41E2-B209-0BE13799C7A8} = {837E2941-F1CC-41EF-A652-B605101B2E84} - {01E6CAE9-C591-4C04-A3C1-10BB3A7192FF} = {837E2941-F1CC-41EF-A652-B605101B2E84} {960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C} = {837E2941-F1CC-41EF-A652-B605101B2E84} {3B40F089-387D-4721-A79D-1C39E682D550} = {837E2941-F1CC-41EF-A652-B605101B2E84} {8F71F933-72A9-4512-89A1-B28ACEC38BC4} = {91DCFC76-6636-4AC1-B81C-7F8AE1F22116} diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs index 45c9cefdc..db5c7f910 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs @@ -32,8 +32,8 @@ using TeachingRecordSystem.Core.Services.TrnGenerationApi; using TeachingRecordSystem.Core.Services.TrsDataSync; using TeachingRecordSystem.Core.Services.Webhooks; -using TeachingRecordSystem.ServiceDefaults; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +using TeachingRecordSystem.WebCommon; +using TeachingRecordSystem.WebCommon.Infrastructure.Logging; [assembly: ApiController] namespace TeachingRecordSystem.Api; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/TeachingRecordSystem.Api.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.Api/TeachingRecordSystem.Api.csproj index 5fc7020cb..612e4e4dd 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Api/TeachingRecordSystem.Api.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Api/TeachingRecordSystem.Api.csproj @@ -36,7 +36,7 @@ - + diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json index b7f7f85f0..0fe7a7fc0 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json @@ -2343,7 +2343,7 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/AuthorizeAccessLinkGenerator.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/AuthorizeAccessLinkGenerator.cs index c114cf2af..d8d533501 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/AuthorizeAccessLinkGenerator.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/AuthorizeAccessLinkGenerator.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.WebUtilities; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Filters/AssignViewDataFromFormFlowJourneyResultFilter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Filters/AssignViewDataFromFormFlowJourneyResultFilter.cs index 5518a5684..de8eef3c1 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Filters/AssignViewDataFromFormFlowJourneyResultFilter.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Filters/AssignViewDataFromFormFlowJourneyResultFilter.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Filters; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/FormFlow/Extensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/FormFlow/Extensions.cs index fb1f4a232..520989edd 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/FormFlow/Extensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/FormFlow/Extensions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Middleware/AddAnalyticsDataMiddleware.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Middleware/AddAnalyticsDataMiddleware.cs index cfeb0c238..421e78951 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Middleware/AddAnalyticsDataMiddleware.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Middleware/AddAnalyticsDataMiddleware.cs @@ -1,7 +1,7 @@ using Dfe.Analytics; using Dfe.Analytics.AspNetCore; using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Middleware; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/FormFlowJourneySignInHandler.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/FormFlowJourneySignInHandler.cs index 06c509e36..6b9cd0df2 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/FormFlowJourneySignInHandler.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/FormFlowJourneySignInHandler.cs @@ -2,7 +2,7 @@ using System.Security.Claims; using Microsoft.AspNetCore.Authentication; using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/OneLoginAuthenticationSchemeProvider.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/OneLoginAuthenticationSchemeProvider.cs index f1e80cfd7..01df1c69b 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/OneLoginAuthenticationSchemeProvider.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/Security/OneLoginAuthenticationSchemeProvider.cs @@ -9,7 +9,7 @@ using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow; using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.Core.DataStore.Postgres.Models; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; using static TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security.FormFlowJourneySignInHandler; namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/CheckAnswers.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/CheckAnswers.cshtml.cs index 5799a6cfd..6e732dba1 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/CheckAnswers.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/CheckAnswers.cshtml.cs @@ -6,7 +6,7 @@ using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.Core.DataStore.Postgres.Models; using TeachingRecordSystem.Core.Models.SupportTaskData; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Connect.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Connect.cshtml.cs index aedbf0896..e0657ba88 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Connect.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Connect.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/DebugIdentity.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/DebugIdentity.cshtml.cs index 071161e27..296bb9c41 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/DebugIdentity.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/DebugIdentity.cshtml.cs @@ -8,7 +8,7 @@ using TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security; using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.Core.DataStore.Postgres.Models; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Found.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Found.cshtml.cs index 912fec709..213954bd6 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Found.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Found.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NationalInsuranceNumber.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NationalInsuranceNumber.cshtml.cs index 0db2ae5a3..3e6962bcc 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NationalInsuranceNumber.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NationalInsuranceNumber.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotFound.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotFound.cshtml.cs index 0087bbec9..d33e15b76 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotFound.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotFound.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotVerified.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotVerified.cshtml.cs index 56cc7261b..6ebd33357 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotVerified.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotVerified.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Address.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Address.cshtml.cs index 7e966e6bc..568d8a755 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Address.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Address.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs index 111185245..9a4c1533d 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs @@ -5,7 +5,7 @@ using TeachingRecordSystem.Core.Dqt; using TeachingRecordSystem.Core.Dqt.Queries; using TeachingRecordSystem.Core.Services.Files; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/DateOfBirth.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/DateOfBirth.cshtml.cs index 00cff5ee5..8e65af1a9 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/DateOfBirth.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/DateOfBirth.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Email.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Email.cshtml.cs index 82c1ef97d..33019c11a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Email.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Email.cshtml.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using TeachingRecordSystem.Core.Dqt; using TeachingRecordSystem.Core.Dqt.Queries; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; using EmailAddress = TeachingRecordSystem.AuthorizeAccess.DataAnnotations.EmailAddressAttribute; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/EmailInUse.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/EmailInUse.cshtml.cs index c17af751a..58e655e87 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/EmailInUse.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/EmailInUse.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Identity.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Identity.cshtml.cs index 59c9838f7..76f6f141c 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Identity.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Identity.cshtml.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using TeachingRecordSystem.AuthorizeAccess.DataAnnotations; using TeachingRecordSystem.Core.Services.Files; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Index.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Index.cshtml.cs index f3a09a1b5..ce12f43c5 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Index.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Index.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs index 9978389b6..7268ade55 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NationalInsuranceNumber.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NationalInsuranceNumber.cshtml.cs index feda48e7f..592f0b0c5 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NationalInsuranceNumber.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NationalInsuranceNumber.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml.cs index 8771963a0..4a5d8d3c9 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NpqCheck.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NpqCheck.cshtml.cs index 6d24a6a87..3d3ab31a9 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NpqCheck.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NpqCheck.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/PreviousName.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/PreviousName.cshtml.cs index 15691b990..f85403cac 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/PreviousName.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/PreviousName.cshtml.cs @@ -2,8 +2,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.DataAnnotations; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.DataAnnotations; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/RequestTrnJourneyState.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/RequestTrnJourneyState.cs index 83340c7b4..31d781fa3 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/RequestTrnJourneyState.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/RequestTrnJourneyState.cs @@ -1,4 +1,4 @@ -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Submitted.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Submitted.cshtml.cs index ca8d32b42..0cbe2cb05 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Submitted.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Submitted.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SignOut.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SignOut.cshtml.cs index ec490dd1c..ecafe5e2b 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SignOut.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SignOut.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SupportRequestSubmitted.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SupportRequestSubmitted.cshtml.cs index f3accca5a..a2fe0580a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SupportRequestSubmitted.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SupportRequestSubmitted.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Test.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Test.cshtml.cs index 36296364d..146080a94 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Test.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Test.cshtml.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Trn.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Trn.cshtml.cs index b68839043..232e7f2b0 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Trn.cshtml.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Trn.cshtml.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Pages; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Program.cs index 0c974cd57..1b4f575b8 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Program.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Program.cs @@ -26,12 +26,12 @@ using TeachingRecordSystem.Core.Infrastructure; using TeachingRecordSystem.Core.Services.Files; using TeachingRecordSystem.Core.Services.PersonMatching; -using TeachingRecordSystem.ServiceDefaults; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; using TeachingRecordSystem.SupportUi.Infrastructure.FormFlow; -using TeachingRecordSystem.UiCommon.Filters; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.Middleware; +using TeachingRecordSystem.WebCommon; +using TeachingRecordSystem.WebCommon.Filters; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.Infrastructure.Logging; +using TeachingRecordSystem.WebCommon.Middleware; using static OpenIddict.Abstractions.OpenIddictConstants; var builder = WebApplication.CreateBuilder(args); diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs index fc4aa78ce..75c93447c 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs @@ -10,8 +10,8 @@ using TeachingRecordSystem.Core.DataStore.Postgres.Models; using TeachingRecordSystem.Core.Dqt.Models; using TeachingRecordSystem.Core.Services.PersonMatching; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; using static TeachingRecordSystem.AuthorizeAccess.IdModelTypes; namespace TeachingRecordSystem.AuthorizeAccess; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyState.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyState.cs index 3e19b27ef..72c9556cb 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyState.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyState.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using Microsoft.AspNetCore.Authentication; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TeachingRecordSystem.AuthorizeAccess.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TeachingRecordSystem.AuthorizeAccess.csproj index 64c7dea76..8710097ca 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TeachingRecordSystem.AuthorizeAccess.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TeachingRecordSystem.AuthorizeAccess.csproj @@ -19,8 +19,7 @@ - - + diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TestAppConfiguration.cs b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TestAppConfiguration.cs index 9d63711f0..9ad5ab03c 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TestAppConfiguration.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TestAppConfiguration.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.OAuth.Claims; using Microsoft.AspNetCore.Mvc.RazorPages; -using TeachingRecordSystem.UiCommon.Filters; +using TeachingRecordSystem.WebCommon.Filters; using static IdentityModel.OidcConstants; namespace TeachingRecordSystem.AuthorizeAccess; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json index da55bc74b..73f5ee791 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json @@ -2415,7 +2415,7 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", @@ -2428,12 +2428,6 @@ "prometheus-net.AspNetCore": "[8.2.1, )" } }, - "teachingrecordsystem.uicommon": { - "type": "Project", - "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" - } - }, "AngleSharp": { "type": "CentralTransitive", "requested": "[1.1.2, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/GlobalUsings.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/GlobalUsings.cs index bc3657786..5e58911dc 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/GlobalUsings.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/GlobalUsings.cs @@ -1,5 +1,5 @@ global using TeachingRecordSystem.Core.Dqt; -global using TeachingRecordSystem.UiCommon.FormFlow; +global using TeachingRecordSystem.WebCommon.FormFlow; global using ColumnSet = Microsoft.Xrm.Sdk.Query.ColumnSet; global using CrmTask = TeachingRecordSystem.Core.Dqt.Models.Task; global using UiDefaults = TeachingRecordSystem.SupportUi.Pages.Common.UiDefaults; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/_ViewImports.cshtml b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/_ViewImports.cshtml index 0044d9d32..f8ead7c44 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/_ViewImports.cshtml +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/_ViewImports.cshtml @@ -1,6 +1,6 @@ @using Microsoft.AspNetCore.Http.Features @using TeachingRecordSystem.Core.Models -@using TeachingRecordSystem.UiCommon +@using TeachingRecordSystem.WebCommon @using TeachingRecordSystem.SupportUi @namespace TeachingRecordSystem.SupportUi.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Program.cs index a2cfed576..1d48b6fac 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Program.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Program.cs @@ -18,8 +18,6 @@ using TeachingRecordSystem.Core.Services.Files; using TeachingRecordSystem.Core.Services.PersonMatching; using TeachingRecordSystem.Core.Services.TrsDataSync; -using TeachingRecordSystem.ServiceDefaults; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; using TeachingRecordSystem.SupportUi; using TeachingRecordSystem.SupportUi.Infrastructure; using TeachingRecordSystem.SupportUi.Infrastructure.Filters; @@ -30,8 +28,10 @@ using TeachingRecordSystem.SupportUi.Pages; using TeachingRecordSystem.SupportUi.Services; using TeachingRecordSystem.SupportUi.TagHelpers; -using TeachingRecordSystem.UiCommon.Filters; -using TeachingRecordSystem.UiCommon.Middleware; +using TeachingRecordSystem.WebCommon; +using TeachingRecordSystem.WebCommon.Filters; +using TeachingRecordSystem.WebCommon.Infrastructure.Logging; +using TeachingRecordSystem.WebCommon.Middleware; var builder = WebApplication.CreateBuilder(args); diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TeachingRecordSystem.SupportUi.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TeachingRecordSystem.SupportUi.csproj index f1a6d54ca..a3a2f35a8 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TeachingRecordSystem.SupportUi.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TeachingRecordSystem.SupportUi.csproj @@ -21,7 +21,6 @@ - - + diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TrsLinkGenerator.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TrsLinkGenerator.cs index 9e57f1c46..5f3d59ad0 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TrsLinkGenerator.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TrsLinkGenerator.cs @@ -387,7 +387,7 @@ private string GetRequiredPathByPage(string page, string? handler = null, object if (journeyInstanceId?.UniqueKey is string journeyInstanceUniqueKey) { - url = QueryHelpers.AddQueryString(url, UiCommon.FormFlow.Constants.UniqueKeyQueryParameterName, journeyInstanceUniqueKey); + url = QueryHelpers.AddQueryString(url, WebCommon.FormFlow.Constants.UniqueKeyQueryParameterName, journeyInstanceUniqueKey); } return url; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json index be547d0e6..5f91e8bf6 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json @@ -2370,7 +2370,7 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", @@ -2383,12 +2383,6 @@ "prometheus-net.AspNetCore": "[8.2.1, )" } }, - "teachingrecordsystem.uicommon": { - "type": "Project", - "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" - } - }, "AngleSharp": { "type": "CentralTransitive", "requested": "[1.1.2, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Properties/InternalsVisibleTo.cs b/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Properties/InternalsVisibleTo.cs deleted file mode 100644 index 4f9fdd936..000000000 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Properties/InternalsVisibleTo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("TeachingRecordSystem.UiCommon.Tests")] diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/TeachingRecordSystem.UiCommon.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/TeachingRecordSystem.UiCommon.csproj deleted file mode 100644 index 4e0cf906f..000000000 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/TeachingRecordSystem.UiCommon.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net8.0 - - - - - - - - - - - diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json deleted file mode 100644 index 49d3690e6..000000000 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json +++ /dev/null @@ -1,2646 +0,0 @@ -{ - "version": 2, - "dependencies": { - "net8.0": { - "Microsoft.VisualStudio.Threading.Analyzers": { - "type": "Direct", - "requested": "[17.12.19, )", - "resolved": "17.12.19", - "contentHash": "v3IYeedjoktvZ+GqYmLudxZJngmf/YWIxNT2Uy6QMMN19cvw+nkWoip1Gr1RtnFkUo1MPUVMis4C8Kj8d8DpSQ==" - }, - "Apache.Arrow": { - "type": "Transitive", - "resolved": "11.0.0", - "contentHash": "Pc5Mh8JKnJrszFUm1i1cwzCcoudY06TNPVy4VnSPAgfwZWReJkIduANjn6wrIekgpH/o9B9HyyraDPQXNXg8Ww==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.42.0", - "contentHash": "Fg88OsrjD2nAvz3N0pk2d/AwIHQRrs9CjA9A35OW1YgYhMo0OTz4WkntQK6V2tf84g7SnfJM8ORcZl+bH6P9Cg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.12.0", - "contentHash": "OBIM3aPz8n9oEO5fdnee+Vsc5Nl4W3FeslPpESyDiyByntQI5BAa76KD60eFXm9ulevnwxGZP9YXL8Y+paI5Uw==", - "dependencies": { - "Azure.Core": "1.40.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Dapper": { - "type": "Transitive", - "resolved": "2.0.123", - "contentHash": "RDFF4rBLLmbpi6pwkY7q/M6UXHRJEOerplDGE5jwEkP/JGJnBauAClYavNKJPW1yOTWRPIyfj4is3EaJxQXILQ==" - }, - "dbup-core": { - "type": "Transitive", - "resolved": "5.0.37", - "contentHash": "++z5z25tgkJ4eiLp3MahAmTkEDQogj5SoGXfDX0PxatjQfGszuR5hK3JBaB1orfCJ68mjZGtKWEp9YcxXa4jjg==", - "dependencies": { - "Microsoft.CSharp": "4.7.0", - "System.Diagnostics.TraceSource": "4.3.0" - } - }, - "DistributedLock.Core": { - "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "WFAz6x82K+4uiByDk1Qz2lmcm2FrOyCzZjNauzbLeHPou6Ur2C9Ig7d6vxP7/kKvzSrrQoW6k3pUOOcikb9Jgw==" - }, - "EntityFrameworkCore.Projectables.Abstractions": { - "type": "Transitive", - "resolved": "3.0.4", - "contentHash": "kgt6jRnomAaRvb6c/2kRIGXYeDH9MdLr8MuHXejwnw32JI7/B8z5d6LIEd9TpDWjDGgvQ3UQtxkyYtpJyJdTRQ==" - }, - "Google.Api.Gax": { - "type": "Transitive", - "resolved": "4.8.0", - "contentHash": "xlV8Jq/G5CQAA3PwYAuKGjfzGOP7AvjhREnE6vgZlzxREGYchHudZWa2PWSqFJL+MBtz9YgitLpRogANN3CVvg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "Newtonsoft.Json": "13.0.3" - } - }, - "Google.Api.Gax.Rest": { - "type": "Transitive", - "resolved": "4.8.0", - "contentHash": "zaA5LZ2VvGj/wwIzRB68swr7khi2kWNgqWvsB0fYtScIAl3kGkGtqiBcx63H1YLeKr5xau1866bFjTeReH6FSQ==", - "dependencies": { - "Google.Api.Gax": "4.8.0", - "Google.Apis.Auth": "[1.67.0, 2.0.0)", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" - } - }, - "Google.Apis": { - "type": "Transitive", - "resolved": "1.67.0", - "contentHash": "XM8/fViJaB1pN61OdXy5RMZoQEqd3hKlWvA/K431gFSb5XtQ48BynfgrbBkUtFcPbSRa4BdjBHzSbkBh/skyMg==", - "dependencies": { - "Google.Apis.Core": "1.67.0" - } - }, - "Google.Apis.Auth": { - "type": "Transitive", - "resolved": "1.67.0", - "contentHash": "Bs9BlbZ12Y4NXzMONjpzQhZr9VbwLUTGMHkcQRF36aYnk2fYrmj5HNVNh7PPHDDq1fcEQpCtPic2nSlpYQLKXw==", - "dependencies": { - "Google.Apis": "1.67.0", - "Google.Apis.Core": "1.67.0", - "System.Management": "7.0.2" - } - }, - "Google.Apis.Core": { - "type": "Transitive", - "resolved": "1.67.0", - "contentHash": "IPq0I3B01NYZraPoMl8muELFLg4Vr2sbfyZp4PR2Xe3MAhHkZCiKyV28Yh1L14zIKUb0X0snol1sR5/mx4S6Iw==", - "dependencies": { - "Newtonsoft.Json": "13.0.3" - } - }, - "Google.Apis.Storage.v1": { - "type": "Transitive", - "resolved": "1.67.0.3365", - "contentHash": "N9Rp8aRUV8Fsjl6uojZeJnzZ/zwtImB+crkPz/HsUtIKcC8rx/ZhNdizNJ5YcNFKiVlvGC60p0K7M+Ywk2xTPQ==", - "dependencies": { - "Google.Apis": "1.67.0", - "Google.Apis.Auth": "1.67.0" - } - }, - "IronCompress": { - "type": "Transitive", - "resolved": "1.5.2", - "contentHash": "ZjWIOrO1a1/xBcpzp0sOxU0JuuajqRjiuhYuDJn3F5sM8R0vZ5K2pxm8b+ck1+OS8RUW1QxNgG3qtbC8uGXm6A==", - "dependencies": { - "Snappier": "1.1.6", - "ZstdSharp.Port": "0.8.1" - } - }, - "JWT": { - "type": "Transitive", - "resolved": "7.1.0", - "contentHash": "z33XjdWSKszw/SRde6fvVsCL2gaKdktZDHJIfpp0RqzNU7RQIaWC4wHUVV2i3RzQSsvQ4bjI3/2kwEAT5S62nA==", - "dependencies": { - "Newtonsoft.Json": "9.0.1", - "System.ComponentModel.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.7.0", - "System.Security.Cryptography.Csp": "4.3.0" - } - }, - "Microsoft.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.20.0", - "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.Azure.Services.AppAuthentication": { - "type": "Transitive", - "resolved": "1.6.2", - "contentHash": "rSQhTv43ionr9rWvE4vxIe/i73XR5hoBYfh7UUgdaVOGW1MZeikR9RmgaJhonTylimCcCuJvrU0zXsSIFOsTGw==", - "dependencies": { - "Microsoft.IdentityModel.Clients.ActiveDirectory": "5.2.9", - "System.Diagnostics.Process": "4.3.0" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, - "Microsoft.Data.Analysis": { - "type": "Transitive", - "resolved": "0.21.1", - "contentHash": "bcvvIkthkOWqH2HRdGZEfyxbtZOBq6AK8Oa1prdSefDCyQsPWRSCZRRqt1Txr8oGZgfdxERT0+BXRYUEKKApPQ==", - "dependencies": { - "Apache.Arrow": "11.0.0", - "Microsoft.ML.DataView": "3.0.1", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Microsoft.Data.SqlClient.SNI.runtime": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" - }, - "Microsoft.EntityFrameworkCore": { - "type": "Transitive", - "resolved": "8.0.10", - "contentHash": "PPkQdIqfR1nU3n6YgGGDk8G+eaYbaAKM1AzIQtlPNTKf10Osg3N9T+iK9AlnSA/ujsK00flPpFHVfJrbuBFS1A==", - "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "8.0.10", - "Microsoft.EntityFrameworkCore.Analyzers": "8.0.10", - "Microsoft.Extensions.Caching.Memory": "8.0.1", - "Microsoft.Extensions.Logging": "8.0.1" - } - }, - "Microsoft.EntityFrameworkCore.Abstractions": { - "type": "Transitive", - "resolved": "8.0.10", - "contentHash": "FV0QlcX9INY4kAD2o72uPtyOh0nZut2jB11Jf9mNYBtHay8gDLe+x4AbXFwuQg+eSvofjT7naV82e827zGfyMg==" - }, - "Microsoft.EntityFrameworkCore.Analyzers": { - "type": "Transitive", - "resolved": "8.0.10", - "contentHash": "51KkPIc0EMv/gVXhPIUi6cwJE9Mvh+PLr4Lap4naLcsoGZ0lF2SvOPgUUprwRV3MnN7nyD1XPhT5RJ/p+xFAXw==" - }, - "Microsoft.Extensions.Caching.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Caching.Memory": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", - "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", - "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.Extensions.Options": "8.0.2", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration.CommandLine": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "NZuZMz3Q8Z780nKX3ifV1fE7lS+6pynDHK71OfU4OZ1ItgvDOhyOC7E6z+JMZrAj63zRpwbdldYFk499t3+1dQ==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "plvZ0ZIpq+97gdPNNvhwvrEZ92kNml9hd1pe3idMA7svR0PztdzVLkoWLcRFgySYXUJc3kSM3Xw3mNFMo/bxRA==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "McP+Lz/EKwvtCv48z0YImw+L1gi1gy5rHhNaNIY2CrjloV+XY8gydT8DjMR6zWeL13AFK+DioVpppwAuO1Gi1w==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Physical": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" - }, - "Microsoft.Extensions.DependencyModel": { - "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "mUBDZZRgZrSyFOsJ2qJJ9fXfqd/kXJwf3AiDoqLD9m6TjY5OO/vLNOb9fb4juC0487eq4hcGN/M2Rh/CKS7QYw==" - }, - "Microsoft.Extensions.Diagnostics": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3PZp/YSkIXrF7QK7PfC1bkyRYwqOHpWFad8Qx+4wkuumAeXo1NHaxpS9LboNA9OvNSAu+QOVlXbMyoY+pHSqcw==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" - } - }, - "Microsoft.Extensions.Diagnostics.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0" - } - }, - "Microsoft.Extensions.FileProviders.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.FileProviders.Physical": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", - "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.FileSystemGlobbing": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" - }, - "Microsoft.Extensions.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Logging": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "4x+pzsQEbqxhNf1QYRr5TDkLP9UsLT3A6MdRKDDEgrW7h1ljiEPgTNhKYUhNCCAaVpQECVQ+onA91PTPnIp6Lw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.2", - "Microsoft.Extensions.Options": "8.0.2" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" - } - }, - "Microsoft.Extensions.Logging.Configuration": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" - } - }, - "Microsoft.Extensions.Logging.Console": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "e+48o7DztoYog+PY430lPxrM4mm3PbA6qucvQtUDDwVo4MO+ejMw7YGc/o2rnxbxj4isPxdfKFzTxvXMwAz83A==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Configuration": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "System.Text.Json": "8.0.0" - } - }, - "Microsoft.Extensions.Logging.Debug": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dt0x21qBdudHLW/bjMJpkixv858RRr8eSomgVbU8qljOyfrfDGi1JQvpF9w8S7ziRPtRKisuWaOwFxJM82GxeA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Logging.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3X9D3sl7EmOu7vQp5MJrmIJBl5XSdOhZPYXUeFfYa6Nnm9+tok8x3t3IVPLhm7UJtPOU61ohFchw8rNm9tIYOQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "System.Diagnostics.EventLog": "8.0.0" - } - }, - "Microsoft.Extensions.Logging.EventSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "oKcPMrw+luz2DUAKhwFXrmFikZWnyc8l2RKoQwqU3KIZZjcfoJE0zRHAnqATfhRZhtcbjl/QkiY2Xjxp0xu+6w==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0", - "System.Text.Json": "8.0.0" - } - }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "5.0.10", - "contentHash": "pp9tbGqIhdEXL6Q1yJl+zevAJSq4BsxqhS1GXzBvEsEz9DDNu9GLNzgUy2xyFc4YjB4m4Ff2YEWTnvQvVYdkvQ==" - }, - "Microsoft.Extensions.Options": { - "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Primitives": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", - "dependencies": { - "Microsoft.Identity.Client": "4.61.3", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "7.2.0", - "contentHash": "7YgmrhCORuOP8miZJLdQhSEzyHdD5PfRjaqINbqSzS9LKEfOoHq8S9o4FVmK9Mu7Gts8MfL46sshwCk4AgjNyw==" - }, - "Microsoft.IdentityModel.Clients.ActiveDirectory": { - "type": "Transitive", - "resolved": "5.2.9", - "contentHash": "WhBAG/9hWiMHIXve4ZgwXP3spRwf7kFFfejf76QA5BvumgnPp8iDkDCiJugzAcpW1YaHB526z1UVxHhVT1E5qw==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "NETStandard.Library": "1.6.1", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Net.Http": "4.3.4", - "System.Private.Uri": "4.3.2", - "System.Runtime.Serialization.Formatters": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.SecureString": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "7.2.0", - "contentHash": "U15cZGq0JfkFXKDaDalq75WKGJniZnV0D6tCbaqc/NgLpIIO/Sq56PGr1v9fhPmXW2xb6ParGFfZkfryewmpWQ==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "7.2.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "7.2.0", - "contentHash": "ycDxTRKNG2ad+y8166YuE0vqbzONEcgoZhMeOfqOoC4GDNOGEYlMoSS+Qm6n/GBHgW6FNmNxpXOUJLRMbJxcWQ==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "7.2.0" - } - }, - "Microsoft.IO.RecyclableMemoryStream": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==" - }, - "Microsoft.ML.DataView": { - "type": "Transitive", - "resolved": "3.0.1", - "contentHash": "mkZt1r6Nx5CAoD3klhC7VMQFzwWMHHjoYpv3X9u+GMvTMbSRaDdiA88HUoOzT7kCeq4/L1nKctmrByhLK28Xjw==", - "dependencies": { - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.5" - } - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" - }, - "Microsoft.Rest.ClientRuntime": { - "type": "Transitive", - "resolved": "2.3.24", - "contentHash": "hZH7XgM3eV2jFrnq7Yf0nBD4WVXQzDrer2gEY7HMNiwio2hwDsTHO6LWuueNQAfRpNp4W7mKxcXpwXUiuVIlYw==", - "dependencies": { - "Newtonsoft.Json": "10.0.3" - } - }, - "Microsoft.SqlServer.Server": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" - }, - "Microsoft.VisualBasic": { - "type": "Transitive", - "resolved": "10.3.0", - "contentHash": "AvMDjmJHjz9bdlvxiSdEHHcWP+sZtp7zwule5ab6DaUbgoBnwCsd7nymj69vSz18ypXuEv3SI7ZUNwbIKrvtMA==" - }, - "Microsoft.Win32.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" - }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.Compression.ZipFile": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0" - } - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, - "Npgsql": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "zRG5V8cyeZLpzJlKzFKjEwkRMYIYnHWJvEor2lWXeccS2E1G2nIWYYhnukB51iz5XsWSVEtqg3AxTWM0QJ6vfg==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "8.0.0" - } - }, - "NSign.Abstractions": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "UGgFyDoeyz0fLm7P/Qu7TqOqeLEBySIU8qCRCPKoCmn3wmp67OXLkYyxAUL4s9J1SwVhWjPc8AdvBHSJecJ+cw==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "8.0.1", - "Microsoft.Extensions.Options": "8.0.2", - "Microsoft.Extensions.Options.DataAnnotations": "8.0.0", - "StructuredFieldValues": "0.6.3", - "System.Collections.Immutable": "8.0.0" - } - }, - "OpenIddict.Abstractions": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "7v96FahB57w9VXH29iqHzp/s9MVZGGV9ePtkwIWgjcBCMN1wawl+0Xvn/S1ikHJ5+aqkWoJCEpn5ztMlAg4KxQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0", - "Microsoft.IdentityModel.Tokens": "7.2.0" - } - }, - "OpenIddict.Core": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "V9jNa1exoZsUlY0UJLI/1jTqwe7CKSCi+CXwJxEk8XLlHPAg6QwIMy2rr6tcpnNxPq24A13pzhKyFza4KEmDrA==", - "dependencies": { - "Microsoft.Extensions.Caching.Memory": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Options": "8.0.1", - "OpenIddict.Abstractions": "5.2.0" - } - }, - "OpenIddict.EntityFrameworkCore.Models": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "CMzogVlVEaeZK/xlYPAeqDsZM01512x4dMQsgFKH2RzE+o5tI8LzpwX+0pQ2WKaNq6cl82zDEHS2rnOPIOUCUg==" - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" - }, - "Sentry": { - "type": "Transitive", - "resolved": "4.12.1", - "contentHash": "OLf7885OKHWLaTLTyw884mwOT4XKCWj2Hz5Wuz/TJemJqXwCIdIljkJBIoeHviRUPvtB7ulDgeYXf/Z7ScToSA==" - }, - "SharpZipLib": { - "type": "Transitive", - "resolved": "1.3.3", - "contentHash": "N8+hwhsKZm25tDJfWpBSW7EGhH/R7EMuiX+KJ4C4u+fCWVc1lJ5zg1u3S1RPPVYgTqhx/C3hxrqUpi6RwK5+Tg==" - }, - "SixLabors.Fonts": { - "type": "Transitive", - "resolved": "1.0.0-beta17", - "contentHash": "qubgVovAoSR7vyv9tJ68gSzRIPWz7HBjTM9rwAaLjpcJ6T50arnX+GHAZcC0r2mVagyRMknCNda3DGoe8StUUQ==" - }, - "SixLabors.ImageSharp": { - "type": "Transitive", - "resolved": "1.0.4", - "contentHash": "H2rPiEr2ddBOltOuqRYhpLBAsQXDAhbzMMhhuksnBG2oefup1MXMchALe7yYkKJksNbtxbZHKeM6dn/68I75qw==" - }, - "Snappier": { - "type": "Transitive", - "resolved": "1.1.6", - "contentHash": "aLJu7Q0mVk0e9QwjJLEh70tXQ0Url8fHITrHXwqF+eq7N20jGMOhkmTXUUjpPim+rCm0I4fARcVBRzJPSipN+w==" - }, - "StructuredFieldValues": { - "type": "Transitive", - "resolved": "0.6.3", - "contentHash": "EgCsxEnSeXuamDL6AV8ygCI+WHNodfgARlpqBT1MQjy4Qxg8VQA7IHlH5jFbzhXKpWIL2mU8+/Ed3yW/At9vWg==" - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.ClientModel": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", - "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" - } - }, - "System.CodeDom": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "GLltyqEsE5/3IE+zYRP5sNa1l44qKl9v+bfdMcwg+M9qnQf47wK3H0SUR/T+3N4JEQXF3vV4CSuuo0rsg+nq2A==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" - }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", - "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", - "System.Security.Cryptography.ProtectedData": "8.0.0" - } - }, - "System.Console": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" - }, - "System.Diagnostics.Process": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.TraceSource": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VnYp1NxGx8Ww731y2LJ1vpfb/DKVNKEZ8Jsh5SgQTZREL/YpWRArgh9pI8CDLmgHspZmLL697CaLvH85qQpRiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Drawing.Common": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" - } - }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==" - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" - } - }, - "System.IO.Compression.ZipFile": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==" - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Management": { - "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "/qEUN91mP/MUQmJnM5y5BdT7ZoPuVrtxnFlbJ8a3kBJGhe2wCzBfnPFtK2wTtEEcf3DMGR9J00GZZfg6HRI6yA==", - "dependencies": { - "System.CodeDom": "7.0.0" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Net.Sockets": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Private.DataContractSerialization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" - } - }, - "System.Private.ServiceModel": { - "type": "Transitive", - "resolved": "4.10.3", - "contentHash": "BcUV7OERlLqGxDXZuIyIMMmk1PbqBblLRbAoigmzIUx/M8A+8epvyPyXRpbgoucKH7QmfYdQIev04Phx2Co08A==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.ObjectPool": "5.0.10", - "System.Numerics.Vectors": "4.5.0", - "System.Reflection.DispatchProxy": "4.7.1", - "System.Security.Cryptography.Xml": "6.0.1", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.DispatchProxy": { - "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "C1sMLwIG6ILQ2bmOT4gh62V6oJlyF4BlHcVMrOoor49p0Ji2tA8QAoqyMcIhAdH6OHKJ8m7BU+r4LK2CUEOKqw==" - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "8.0.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Runtime.Serialization.Formatters": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0" - } - }, - "System.Runtime.Serialization.Json": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", - "dependencies": { - "System.IO": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", - "dependencies": { - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Serialization.Xml": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "nUQx/5OVgrqEba3+j7OdiofvVq9koWZAC7Z3xGI8IIViZqApWnZ5+lLcwYgTlbkobrl/Rat+Jb8GeD4WQESD2A==", - "dependencies": { - "System.IO": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Pkcs": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "ynmbW2GjIGg9K1wXmVIRs4IlyDolf0JXNpzFQ8JCVgwM+myUC2JeUggl2PwQig2PNVMegKmN1aAx7WPQ8tI3vA==", - "dependencies": { - "System.Formats.Asn1": "6.0.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Xml": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "5e5bI28T0x73AwTsbuFP4qSRzthmU2C0Gqgg3AZ3KTxmSyA+Uhk31puA3srdaeWaacVnHhLdJywCzqOiEpbO/w==", - "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Security.Cryptography.Pkcs": "6.0.1" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Windows.Extensions": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Security.SecureString": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ServiceModel.Http": { - "type": "Transitive", - "resolved": "4.10.3", - "contentHash": "hodkn0rPTYmoZ9EIPwcleUrOi1gZBPvU0uFvzmJbyxl1lIpVM5GxTrs/pCETStjOXCiXhBDoZQYajquOEfeW/w==", - "dependencies": { - "System.Private.ServiceModel": "4.10.3", - "System.ServiceModel.Primitives": "4.10.3" - } - }, - "System.ServiceModel.Primitives": { - "type": "Transitive", - "resolved": "4.10.3", - "contentHash": "aNcdry95wIP1J+/HcLQM/f/AA73LnBQDNc2uCoZ+c1//KpVRp8nMZv5ApMwK+eDNVdCK8G0NLInF+xG3mfQL+g==", - "dependencies": { - "System.Private.ServiceModel": "4.10.3" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==" - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } - }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Threading.Timer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", - "dependencies": { - "System.Drawing.Common": "6.0.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlSerializer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, - "ZstdSharp.Port": { - "type": "Transitive", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==" - }, - "teachingrecordsystem.core": { - "type": "Project", - "dependencies": { - "AngleSharp": "[1.1.2, )", - "Azure.Storage.Blobs": "[12.19.1, )", - "CloudNative.CloudEvents": "[2.8.0, )", - "CloudNative.CloudEvents.SystemTextJson": "[2.8.0, )", - "CsvHelper": "[30.1.0, )", - "DistributedLock.Azure": "[1.0.0, )", - "DistributedLock.FileSystem": "[1.0.2, )", - "EFCore.NamingConventions": "[8.0.3, )", - "EntityFrameworkCore.Projectables": "[3.0.4, )", - "Google.Cloud.Storage.V1": "[4.10.0, )", - "GovukNotify": "[6.1.0, )", - "Hangfire.Core": "[1.8.14, )", - "Hangfire.NetCore": "[1.8.14, )", - "Hangfire.PostgreSql": "[1.20.10, )", - "IdentityModel": "[6.2.0, )", - "Microsoft.Data.SqlClient": "[5.2.2, )", - "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", - "Microsoft.Extensions.Azure": "[1.7.5, )", - "Microsoft.Extensions.Configuration.Abstractions": "[8.0.0, )", - "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )", - "Microsoft.Extensions.Configuration.Json": "[8.0.0, )", - "Microsoft.Extensions.Configuration.UserSecrets": "[8.0.0, )", - "Microsoft.Extensions.Hosting": "[8.0.0, )", - "Microsoft.Extensions.Http": "[8.0.0, )", - "Microsoft.Extensions.Options.ConfigurationExtensions": "[8.0.0, )", - "Microsoft.Extensions.Options.DataAnnotations": "[8.0.0, )", - "Microsoft.PowerPlatform.Dataverse.Client": "[1.1.27, )", - "Microsoft.PowerPlatform.Dataverse.Client.Dynamics": "[1.1.27, )", - "NSign.Client": "[1.1.0, )", - "NSign.SignatureProviders": "[1.1.0, )", - "Npgsql.DependencyInjection": "[8.0.3, )", - "Npgsql.EntityFrameworkCore.PostgreSQL": "[8.0.10, )", - "OpenIddict.EntityFrameworkCore": "[5.2.0, )", - "Optional": "[4.0.0, )", - "Parquet.Net": "[4.24.0, )", - "PdfSharpCore": "[1.3.62, )", - "Polly.Core": "[8.2.1, )", - "Scrutor": "[5.0.1, )", - "Sentry.Serilog": "[4.12.1, )", - "Serilog.Expressions": "[5.0.0, )", - "Serilog.Formatting.Compact": "[3.0.0, )", - "Serilog.Settings.Configuration": "[8.0.4, )", - "Serilog.Sinks.ApplicationInsights": "[4.0.0, )", - "Serilog.Sinks.Console": "[6.0.0, )", - "SerilogTimings": "[3.1.0, )", - "System.Net.Http.Json": "[8.0.0, )", - "System.Reactive": "[6.0.1, )", - "dbup-sqlserver": "[5.0.37, )" - } - }, - "AngleSharp": { - "type": "CentralTransitive", - "requested": "[1.1.2, )", - "resolved": "1.1.2", - "contentHash": "aRFpAqixbuj1Vmqy2hsWPF0PJygo1SfjvmpBvVWZv6i+/u+C/L4wDdwFIzyCGUbjqr61NsZdPNPqDE8wlmG2qA==", - "dependencies": { - "System.Text.Encoding.CodePages": "8.0.0" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "CloudNative.CloudEvents": { - "type": "CentralTransitive", - "requested": "[2.8.0, )", - "resolved": "2.8.0", - "contentHash": "RvabvAQV7u3FZcZL5UlRmFz3/T5nMl86GpChpRvHKRHbO+/I4LBcZ0xRqYnNfAh30gM+h/JkSBHEnbhl0zmGtA==" - }, - "CloudNative.CloudEvents.SystemTextJson": { - "type": "CentralTransitive", - "requested": "[2.8.0, )", - "resolved": "2.8.0", - "contentHash": "En3Bvf7tTbGyB/AWJIPGw8ksh1OgiSI3cBXmNvuH9+PMR4l0vVRlp9YsTu+gY7S/0VFyJDHP66P3uZHzgsRQ7w==", - "dependencies": { - "CloudNative.CloudEvents": "2.8.0" - } - }, - "CsvHelper": { - "type": "CentralTransitive", - "requested": "[30.1.0, )", - "resolved": "30.1.0", - "contentHash": "R7sRLng2mOBOCtpg9q3B8Wna7qw4CARq9d68t4rBh09obGjEP2OC2RzGojtnIN0LBau15VRMmh1MfYpQwk2Kbw==", - "dependencies": { - "System.Linq.Async": "4.0.0" - } - }, - "dbup-sqlserver": { - "type": "CentralTransitive", - "requested": "[5.0.37, )", - "resolved": "5.0.37", - "contentHash": "nSmm8ImnqY/cyvlUolyn7cl+xekEe2syq2jb6mpqCsGvDUnJNFTQGE2N0R3wtIDBBc/e/waTMzYvVCgQkLxNnw==", - "dependencies": { - "Microsoft.Azure.Services.AppAuthentication": "1.6.2", - "Microsoft.Data.SqlClient": "5.1.1", - "dbup-core": "5.0.37" - } - }, - "DistributedLock.Azure": { - "type": "CentralTransitive", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "4ZhznBRIlngEtYxtCg9mSZnShESXyvV4P9PJdQlw341INuUcTfFtzxbNIQKwn15a0GrrLG6aebVIioVlp9TgQg==", - "dependencies": { - "Azure.Storage.Blobs": "12.7.0", - "DistributedLock.Core": "[1.0.0, 1.1.0)" - } - }, - "DistributedLock.FileSystem": { - "type": "CentralTransitive", - "requested": "[1.0.2, )", - "resolved": "1.0.2", - "contentHash": "sr6p3R/DzRjb8bCYQTmZsWNIlvsULQY4Eg4Y4JPYcYwrzGhsftp+khOjOupcMoUDU48cijCm1xHQEULSwRq5cg==", - "dependencies": { - "DistributedLock.Core": "[1.0.6, 1.1.0)" - } - }, - "EFCore.NamingConventions": { - "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "TdDarM6kyIS2oVIhrs3W+r+xL/76ooFJxIXxfhzsNJQu0pB9VdFZwuyKvKJnhoc7OHYFNTBP08AN37kr4CPc+Q==", - "dependencies": { - "Microsoft.EntityFrameworkCore": "[8.0.0, 9.0.0)", - "Microsoft.EntityFrameworkCore.Relational": "[8.0.0, 9.0.0)", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" - } - }, - "EntityFrameworkCore.Projectables": { - "type": "CentralTransitive", - "requested": "[3.0.4, )", - "resolved": "3.0.4", - "contentHash": "wq3/uT0iW6vmUiGXWsSwLmypeoFz7fnVXeb1lwSmen6Rqx8WgRXSDf3IEaSy/ZoHTu9cMZQ3PSeBHBcJn0ilIg==", - "dependencies": { - "EntityFrameworkCore.Projectables.Abstractions": "3.0.4", - "Microsoft.EntityFrameworkCore": "6.0.0" - } - }, - "Google.Cloud.Storage.V1": { - "type": "CentralTransitive", - "requested": "[4.10.0, )", - "resolved": "4.10.0", - "contentHash": "a4hHQzDkzR/5Fm2gvfKnvuajYwgTJAZ944+8S3gO7S3qxXkXI+rasx8Jz8ldflyq1zHO5MWTyFiHc7+dfmwYhg==", - "dependencies": { - "Google.Api.Gax.Rest": "[4.8.0, 5.0.0)", - "Google.Apis.Storage.v1": "[1.67.0.3365, 2.0.0)" - } - }, - "GovukNotify": { - "type": "CentralTransitive", - "requested": "[6.1.0, )", - "resolved": "6.1.0", - "contentHash": "gQxZtymzwlSruHdTaQL0ItberaBspk2K2WgoHja5wn8Kyzq++fapT/9/7bMEbLKKyJ5eOdR9VjZxF7V9AZETzQ==", - "dependencies": { - "JWT": "[7.1.0, 9.0.0)", - "Newtonsoft.Json": "[10.0.3, 14.0.0)", - "System.Collections.Specialized": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "Hangfire.Core": { - "type": "CentralTransitive", - "requested": "[1.8.14, )", - "resolved": "1.8.14", - "contentHash": "tj/+J8/UdaxydFX6VQr5IEyBtVbAOvkQ8X8tIQKwY9zlpmK83hP4iHEQQQ26zzGUpcE1HlPc6PBUv0NgUDXS3A==", - "dependencies": { - "Newtonsoft.Json": "11.0.1" - } - }, - "Hangfire.NetCore": { - "type": "CentralTransitive", - "requested": "[1.8.14, )", - "resolved": "1.8.14", - "contentHash": "fBLdsxWYFdrQuenvVHEj/z8nOXoOTqpWIl4qYoinBAUCVmp4qlxfFsY3Aq3VVbwket0wBH472aG2LAmYm6hjxw==", - "dependencies": { - "Hangfire.Core": "[1.8.14]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "3.0.0", - "Microsoft.Extensions.Logging.Abstractions": "3.0.0" - } - }, - "Hangfire.PostgreSql": { - "type": "CentralTransitive", - "requested": "[1.20.10, )", - "resolved": "1.20.10", - "contentHash": "Nn/88KoBvmy/xyopC9s+lXkwxQ6VB+RKyM8tjX3EgfSARDFxl2sEsFu0lw7WrjFdosg+E3naGzM5MzyiiL5i6w==", - "dependencies": { - "Dapper": "2.0.123", - "Hangfire.Core": "1.8.0", - "Microsoft.CSharp": "4.7.0", - "Npgsql": "6.0.11" - } - }, - "IdentityModel": { - "type": "CentralTransitive", - "requested": "[6.2.0, )", - "resolved": "6.2.0", - "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "Microsoft.SqlServer.Server": "1.0.0", - "System.Configuration.ConfigurationManager": "8.0.0", - "System.Runtime.Caching": "8.0.0" - } - }, - "Microsoft.EntityFrameworkCore.Relational": { - "type": "CentralTransitive", - "requested": "[8.0.10, )", - "resolved": "8.0.10", - "contentHash": "OefBEE47kGKPRPV3OT+FAW6o5BFgLk2D9EoeWVy7NbOepzUneayLQxbVE098FfedTyMwxvZQoDD9LrvZc3MadA==", - "dependencies": { - "Microsoft.EntityFrameworkCore": "8.0.10", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Azure": { - "type": "CentralTransitive", - "requested": "[1.7.5, )", - "resolved": "1.7.5", - "contentHash": "g4yVHO4qlOKEwniz57o4sb/Pl4/ne6o5ecGLJIMp46PdMMIicIFcKPb1+IQNWLPAvg0LxNAeR2qHwdqAA7BKMg==", - "dependencies": { - "Azure.Core": "1.42.0", - "Azure.Identity": "1.12.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", - "Microsoft.Extensions.Configuration.Binder": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.1.0", - "Microsoft.Extensions.Options": "2.1.0" - } - }, - "Microsoft.Extensions.Configuration.Abstractions": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration.Binder": { - "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration.Json": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "C2wqUoh9OmRL1akaCcKSTmRU8z0kckfImG7zLNI8uyi47Lp+zd5LWAD17waPQEqCz3ioWOCrFUo+JJuoeZLOBw==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "System.Text.Json": "8.0.0" - } - }, - "Microsoft.Extensions.Configuration.UserSecrets": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "ihDHu2dJYQird9pl2CbdwuNDfvCZdOS0S7SPlNfhPt0B81UTT+yyZKz2pimFZGUp3AfuBRnqUCxB2SjsZKHVUw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Json": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Physical": "8.0.0" - } - }, - "Microsoft.Extensions.Hosting": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "ItYHpdqVp5/oFLT5QqbopnkKlyFG9EW/9nhM6/yfObeKt6Su0wkBio6AizgRHGNwhJuAtlE5VIjow5JOTrip6w==", - "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "8.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "8.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "8.0.0", - "Microsoft.Extensions.Configuration.Json": "8.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "8.0.0", - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Diagnostics": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Physical": "8.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Configuration": "8.0.0", - "Microsoft.Extensions.Logging.Console": "8.0.0", - "Microsoft.Extensions.Logging.Debug": "8.0.0", - "Microsoft.Extensions.Logging.EventLog": "8.0.0", - "Microsoft.Extensions.Logging.EventSource": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" - } - }, - "Microsoft.Extensions.Http": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Diagnostics": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" - } - }, - "Microsoft.Extensions.Options.ConfigurationExtensions": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Options.DataAnnotations": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "z6p6q/N/hiU19A9tK7pjhXHpiYArO4oIICipxUviBEIOiDIoKRO7k6qItvw7alKcLtfHZOWmspuSKpvIvH0N8w==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" - } - }, - "Microsoft.PowerPlatform.Dataverse.Client": { - "type": "CentralTransitive", - "requested": "[1.1.27, )", - "resolved": "1.1.27", - "contentHash": "CudY7TEo/JJeJb8VWiit77+RUjWnMTZigK5WICFcvIG/lV4bUWOE9jsjrMEvkcFUnNTqkHAX8hcucFM1c5+9Sw==", - "dependencies": { - "Microsoft.Extensions.Caching.Memory": "3.1.8", - "Microsoft.Extensions.DependencyInjection": "3.1.8", - "Microsoft.Extensions.Http": "3.1.8", - "Microsoft.Extensions.Logging": "3.1.8", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "Microsoft.Rest.ClientRuntime": "2.3.24", - "Microsoft.VisualBasic": "10.3.0", - "Newtonsoft.Json": "13.0.1", - "System.Collections": "4.3.0", - "System.Configuration.ConfigurationManager": "6.0.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.TypeExtensions": "4.7.0", - "System.Runtime.Caching": "4.7.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Runtime.Serialization.Xml": "4.3.0", - "System.Security.Permissions": "6.0.0", - "System.ServiceModel.Http": "4.10.3", - "System.ServiceModel.Primitives": "4.10.3", - "System.Text.Json": "7.0.3" - } - }, - "Microsoft.PowerPlatform.Dataverse.Client.Dynamics": { - "type": "CentralTransitive", - "requested": "[1.1.27, )", - "resolved": "1.1.27", - "contentHash": "2kkIhlFpGyN/aCQBo6vdPxpcq1CzhjD3HBYZz17oU3P0i0QFTTKshhUivIvBFcq7vQFnnY4PZbYYL8MON1TZog==", - "dependencies": { - "Microsoft.PowerPlatform.Dataverse.Client": "1.1.0" - } - }, - "Npgsql.DependencyInjection": { - "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "+5YsjIr2j8vV2IllGWbIrRkMYyHEUBUoH3nCrADg9nI4V/QhQATXjRtnq95z37/U6JQKb5m4eL388QWcKFmqUQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Npgsql": "8.0.3" - } - }, - "Npgsql.EntityFrameworkCore.PostgreSQL": { - "type": "CentralTransitive", - "requested": "[8.0.10, )", - "resolved": "8.0.10", - "contentHash": "gFPl9Dmxih7Yi4tZ3bITzZFzbxFMBx04gqTqcjoL2r5VEW+O2TA5UVw/wm/XW26NAJ7sg59Je0+9QrwiZt6MPQ==", - "dependencies": { - "Microsoft.EntityFrameworkCore": "8.0.10", - "Microsoft.EntityFrameworkCore.Abstractions": "8.0.10", - "Microsoft.EntityFrameworkCore.Relational": "8.0.10", - "Npgsql": "8.0.5" - } - }, - "NSign.Client": { - "type": "CentralTransitive", - "requested": "[1.1.0, )", - "resolved": "1.1.0", - "contentHash": "wfHRl6NDEc92nJXZjPqCgEBvqC8z/+uLWUOQ+YcBna5BHdb+Xx2Rr8Ixc1yjNVC6TioxjJjtqXaVpJhPVLPh/Q==", - "dependencies": { - "Microsoft.Extensions.Http": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.1", - "Microsoft.Extensions.Options": "8.0.2", - "NSign.Abstractions": "1.1.0", - "StructuredFieldValues": "0.6.3", - "System.Collections.Immutable": "8.0.0", - "System.IO.Pipelines": "8.0.0" - } - }, - "NSign.SignatureProviders": { - "type": "CentralTransitive", - "requested": "[1.1.0, )", - "resolved": "1.1.0", - "contentHash": "poa3Qez1ds4w28TWQyPzKa/Yd4WOY9Pto8qWI96wNRHp76ZfV9M2kfZ6JH7ma3uAgInwpYEoAc+2Z0h6/E/sSA==", - "dependencies": { - "NSign.Abstractions": "1.1.0" - } - }, - "OpenIddict.EntityFrameworkCore": { - "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "z2qjB+jQ3Z0vd+VRbcx/VSmtcdBgHTIXo2MQNyJTUNaEAnTgDCnewtu8aeuTOas6bqasXbXpf4u26rOL4brsCw==", - "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "8.0.1", - "OpenIddict.Core": "5.2.0", - "OpenIddict.EntityFrameworkCore.Models": "5.2.0" - } - }, - "Optional": { - "type": "CentralTransitive", - "requested": "[4.0.0, )", - "resolved": "4.0.0", - "contentHash": "Q9NdZ39K/tPuV8JDs6ntRxW3idN9J4jSoBK/2ovld+Gh8if4Yhs+OTPvI84mN5YGAI3pzbhLcNUrm+VFKutC3Q==" - }, - "Parquet.Net": { - "type": "CentralTransitive", - "requested": "[4.24.0, )", - "resolved": "4.24.0", - "contentHash": "30XaI5kj3llACxFUdCj9TNZkJGqJ3QMjB1ySaHhEMior9cT6C3SygyftzF7eS2I460M07DK6VbGFBWTWRjod8g==", - "dependencies": { - "IronCompress": "1.5.2", - "Microsoft.Data.Analysis": "0.21.1", - "Microsoft.IO.RecyclableMemoryStream": "3.0.0" - } - }, - "PdfSharpCore": { - "type": "CentralTransitive", - "requested": "[1.3.62, )", - "resolved": "1.3.62", - "contentHash": "O5oxuQsjBy/IHYU0pksUBWbqrZ5QNXWJGfvIxJJoMkrH3iH2qYHwWmSBqPWiyzTgeumN7H8co/kiS4wXNjScFw==", - "dependencies": { - "SharpZipLib": "1.3.3", - "SixLabors.Fonts": "1.0.0-beta17", - "SixLabors.ImageSharp": "1.0.4" - } - }, - "Polly.Core": { - "type": "CentralTransitive", - "requested": "[8.2.1, )", - "resolved": "8.2.1", - "contentHash": "/Z3EspfWBdTla4I9IAcQn32/7kB5WS3rSnOYloz8YlVyClu8h7uuYf4pfUvffOYVbxmDX/mFRfxwzqW2Zs96ZA==" - }, - "Scrutor": { - "type": "CentralTransitive", - "requested": "[5.0.1, )", - "resolved": "5.0.1", - "contentHash": "lODLSduex32544jZZom2bN73mg4DfyGCNdywismPv2D2Hslv4jaq1Y+apV24xTW65tDMXskZHwVFSg2xIs3jtQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.1", - "Microsoft.Extensions.DependencyModel": "8.0.1" - } - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[4.12.1, )", - "resolved": "4.12.1", - "contentHash": "wdkeVWOqrF/IQ+yUKdtjbRYludqjw2mSHece2Io+8HRZeF6WhMffqS2od44Fu3C4mSgm1CJegUAenUv/ZjHlBw==", - "dependencies": { - "Sentry": "4.12.1", - "Serilog": "2.10.0" - } - }, - "Serilog": { - "type": "CentralTransitive", - "requested": "[3.1.1, )", - "resolved": "4.0.0", - "contentHash": "2jDkUrSh5EofOp7Lx5Zgy0EB+7hXjjxE2ktTb1WVQmU00lDACR2TdROGKU0K1pDTBSJBN1PqgYpgOZF8mL7NJw==" - }, - "Serilog.Expressions": { - "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "QhZjXtUcA2QfQRA60m+DfyIfidKsQV7HBstbYEDqzJKMbJH/KnKthkkjciRuYrmFE+scWv1JibC5LlXrdtOUmw==", - "dependencies": { - "Serilog": "4.0.0" - } - }, - "Serilog.Formatting.Compact": { - "type": "CentralTransitive", - "requested": "[3.0.0, )", - "resolved": "3.0.0", - "contentHash": "wQsv14w9cqlfB5FX2MZpNsTawckN4a8dryuNGbebB/3Nh1pXnROHZov3swtu3Nj5oNG7Ba+xdu7Et/ulAUPanQ==", - "dependencies": { - "Serilog": "4.0.0" - } - }, - "Serilog.Settings.Configuration": { - "type": "CentralTransitive", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "pkxvq0umBKK8IKFJc1aV5S/HGRG/NIxJ6FV42KaTPLfDmBOAbBUB1m5gqqlGxzEa1MgDDWtQlWJdHTSxVWNx+Q==", - "dependencies": { - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyModel": "8.0.2", - "Serilog": "3.1.1" - } - }, - "Serilog.Sinks.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[4.0.0, )", - "resolved": "4.0.0", - "contentHash": "AlYq1JFqh+RFKwLKZ3X224Zbe1gnkMbqSELp2FApLN0iMyRPdwwxMJBCCrk49C8qOefBd4zN+J/1Tq3i75DunA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.20.0", - "Serilog": "2.11.0" - } - }, - "Serilog.Sinks.Console": { - "type": "CentralTransitive", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "fQGWqVMClCP2yEyTXPIinSr5c+CBGUvBybPxjAGcf7ctDhadFhrQw03Mv8rJ07/wR5PDfFjewf2LimvXCDzpbA==", - "dependencies": { - "Serilog": "4.0.0" - } - }, - "SerilogTimings": { - "type": "CentralTransitive", - "requested": "[3.1.0, )", - "resolved": "3.1.0", - "contentHash": "hCMeW6+4jzbIDwRJulxVsBlAPEtQjZcbVyw8C5yYpI/shQZlYXeSivrjEexeo3nPO/H14wOPoAjE9NDXAWiPxg==", - "dependencies": { - "Serilog": "2.10.0" - } - }, - "System.Linq.Async": { - "type": "CentralTransitive", - "requested": "[6.0.1, )", - "resolved": "4.0.0", - "contentHash": "WbiYEedFZeM+psmMyoCt1AKbZppAZg8Eq1ZTQ+521fGNeXqlgJj0tZYV5n1LsKRO5osQuitYxGNuzPTy3213sg==" - }, - "System.Net.Http.Json": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "48Bxrd6zcGeQzS4GMEDVjuqCcAw/9wcEWnIu48FQJ5IzfKPiMR1nGtz9LrvGzU4+3TLbx/9FDlGmCUeLin1Eqg==", - "dependencies": { - "System.Text.Json": "8.0.0" - } - }, - "System.Reactive": { - "type": "CentralTransitive", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "rHaWtKDwCi9qJ3ObKo8LHPMuuwv33YbmQi7TcUK1C264V3MFnOr5Im7QgCTdLniztP3GJyeiSg5x8NqYJFqRmg==" - } - } - } -} \ No newline at end of file diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs similarity index 95% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs index 064485b5d..6816c0bf7 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/DataAnnotations/RequiredIfOtherPropertyEqualsAttribute.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TeachingRecordSystem.UiCommon.DataAnnotations; +namespace TeachingRecordSystem.WebCommon.DataAnnotations; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)] public class RequiredIfOtherPropertyEqualsAttribute : RequiredAttribute diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Extensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Extensions.cs similarity index 95% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Extensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Extensions.cs index f1dd94cb9..985e5b1c2 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Extensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Extensions.cs @@ -8,9 +8,9 @@ using Npgsql; using Prometheus; using TeachingRecordSystem.Core.Infrastructure.Configuration; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +using TeachingRecordSystem.WebCommon.Infrastructure.Logging; -namespace TeachingRecordSystem.ServiceDefaults; +namespace TeachingRecordSystem.WebCommon; public static class Extensions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Filters/NoCachePageFilter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Filters/NoCachePageFilter.cs similarity index 93% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Filters/NoCachePageFilter.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Filters/NoCachePageFilter.cs index 7c9723096..35f0e335d 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Filters/NoCachePageFilter.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Filters/NoCachePageFilter.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Net.Http.Headers; -namespace TeachingRecordSystem.UiCommon.Filters; +namespace TeachingRecordSystem.WebCommon.Filters; public class NoCachePageFilter : IPageFilter { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Filters/NotFoundResourceFilter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Filters/NotFoundResourceFilter.cs similarity index 88% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Filters/NotFoundResourceFilter.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Filters/NotFoundResourceFilter.cs index a8f8181aa..546231e77 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Filters/NotFoundResourceFilter.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Filters/NotFoundResourceFilter.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -namespace TeachingRecordSystem.UiCommon.Filters; +namespace TeachingRecordSystem.WebCommon.Filters; public class NotFoundResourceFilter : IResourceFilter { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActionJourneyMetadata.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActionJourneyMetadata.cs similarity index 89% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActionJourneyMetadata.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActionJourneyMetadata.cs index 0a4ef7e16..190f7b0d1 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActionJourneyMetadata.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActionJourneyMetadata.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Abstractions; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; internal sealed class ActionJourneyMetadata(string journeyName) { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActivatesJourneyAttribute.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActivatesJourneyAttribute.cs similarity index 77% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActivatesJourneyAttribute.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActivatesJourneyAttribute.cs index 4fd591b96..4f61ff388 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActivatesJourneyAttribute.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActivatesJourneyAttribute.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = false)] public sealed class ActivatesJourneyAttribute : Attribute diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActivatesJourneyMarker.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActivatesJourneyMarker.cs similarity index 75% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActivatesJourneyMarker.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActivatesJourneyMarker.cs index 14aa26b1c..fc79866ee 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ActivatesJourneyMarker.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ActivatesJourneyMarker.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; internal sealed class ActivatesJourneyMarker { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Constants.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Constants.cs similarity index 66% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Constants.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Constants.cs index a33460b0c..9a296699d 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Constants.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Constants.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public static class Constants { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs index d9701ddd3..a6687e1f8 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Conventions/BindJourneyInstancePropertiesConvention.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace TeachingRecordSystem.UiCommon.FormFlow.Conventions; +namespace TeachingRecordSystem.WebCommon.FormFlow.Conventions; public class BindJourneyInstancePropertiesConvention : IPageApplicationModelConvention { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Conventions/FormFlowConventions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Conventions/FormFlowConventions.cs similarity index 95% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Conventions/FormFlowConventions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Conventions/FormFlowConventions.cs index 7de87679b..e4e4931bc 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Conventions/FormFlowConventions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Conventions/FormFlowConventions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels; -namespace TeachingRecordSystem.UiCommon.FormFlow.Conventions; +namespace TeachingRecordSystem.WebCommon.FormFlow.Conventions; internal class FormFlowConventions : IPageApplicationModelConvention, diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/DefaultFormFlowOptions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/DefaultFormFlowOptions.cs similarity index 83% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/DefaultFormFlowOptions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/DefaultFormFlowOptions.cs index c27888c28..434ece50c 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/DefaultFormFlowOptions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/DefaultFormFlowOptions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public static class DefaultFormFlowOptions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/DiscoverJourneyDescriptors.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/DiscoverJourneyDescriptors.cs similarity index 94% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/DiscoverJourneyDescriptors.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/DiscoverJourneyDescriptors.cs index ae2132a29..5ddcde903 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/DiscoverJourneyDescriptors.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/DiscoverJourneyDescriptors.cs @@ -1,7 +1,7 @@ using System.Reflection; using Microsoft.Extensions.Options; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; internal class DiscoverJourneyDescriptors(Assembly assembly) : IConfigureOptions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Filters/ActivateInstanceFilter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Filters/ActivateInstanceFilter.cs similarity index 96% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Filters/ActivateInstanceFilter.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Filters/ActivateInstanceFilter.cs index 830e9d286..a46c9fd86 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Filters/ActivateInstanceFilter.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Filters/ActivateInstanceFilter.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.WebUtilities; -namespace TeachingRecordSystem.UiCommon.FormFlow.Filters; +namespace TeachingRecordSystem.WebCommon.FormFlow.Filters; internal class ActivateInstanceFilter(JourneyInstanceProvider journeyInstanceProvider) : IAsyncResourceFilter, IOrderedFilter { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Filters/MissingInstanceFilter.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Filters/MissingInstanceFilter.cs similarity index 95% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Filters/MissingInstanceFilter.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Filters/MissingInstanceFilter.cs index c9aa287db..ffecdccba 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/Filters/MissingInstanceFilter.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/Filters/MissingInstanceFilter.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; -namespace TeachingRecordSystem.UiCommon.FormFlow.Filters; +namespace TeachingRecordSystem.WebCommon.FormFlow.Filters; internal class MissingInstanceFilter(IOptions optionsAccessor, JourneyInstanceProvider journeyInstanceProvider) : IAsyncResourceFilter, IOrderedFilter { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/FormFlowOptions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/FormFlowOptions.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/FormFlowOptions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/FormFlowOptions.cs index 275d624f6..4904cdbf7 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/FormFlowOptions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/FormFlowOptions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class FormFlowOptions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/IRegisterJourney.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/IRegisterJourney.cs similarity index 64% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/IRegisterJourney.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/IRegisterJourney.cs index a227d471a..e73ca6478 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/IRegisterJourney.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/IRegisterJourney.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public interface IRegisterJourney { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyAttribute.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyAttribute.cs similarity index 87% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyAttribute.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyAttribute.cs index 80e966c5f..9dd7621be 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyAttribute.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyAttribute.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = false)] public sealed class JourneyAttribute : Attribute diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyDescriptor.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyDescriptor.cs similarity index 89% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyDescriptor.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyDescriptor.cs index 3c07c3e40..bd11417e2 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyDescriptor.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyDescriptor.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class JourneyDescriptor( string journeyName, diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstance.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstance.cs similarity index 97% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstance.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstance.cs index 61d8971e2..bb48c2ab8 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstance.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstance.cs @@ -1,6 +1,6 @@ -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class JourneyInstance { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstanceId.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstanceId.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstanceId.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstanceId.cs index 1aef13e91..a99161d1e 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstanceId.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstanceId.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Primitives; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; [DebuggerDisplay("{Serialize(),nq}")] public readonly struct JourneyInstanceId(string journeyName, IReadOnlyDictionary keys) : IEquatable diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstanceProvider.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstanceProvider.cs similarity index 99% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstanceProvider.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstanceProvider.cs index 58e0fdac0..02b9f1445 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyInstanceProvider.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyInstanceProvider.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.Extensions.Options; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class JourneyInstanceProvider( IUserInstanceStateProvider stateProvider, diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyRegistry.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyRegistry.cs similarity index 92% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyRegistry.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyRegistry.cs index 6157886cd..b1f8a444e 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/JourneyRegistry.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/JourneyRegistry.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class JourneyRegistry { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/KeysBuilder.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/KeysBuilder.cs similarity index 94% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/KeysBuilder.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/KeysBuilder.cs index 7ae3baf56..a3d1f9f35 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/KeysBuilder.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/KeysBuilder.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using Microsoft.Extensions.Primitives; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class KeysBuilder { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/MissingInstanceHandler.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/MissingInstanceHandler.cs similarity index 80% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/MissingInstanceHandler.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/MissingInstanceHandler.cs index 8312ee5b1..e3816b882 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/MissingInstanceHandler.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/MissingInstanceHandler.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public delegate IActionResult MissingInstanceHandler( JourneyDescriptor journeyDescriptor, diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs similarity index 96% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs index 9a8b73c49..ba93c905d 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ModelBinding/JourneyInstanceModelBinder.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.Extensions.DependencyInjection; -namespace TeachingRecordSystem.UiCommon.FormFlow.ModelBinding; +namespace TeachingRecordSystem.WebCommon.FormFlow.ModelBinding; internal class JourneyInstanceModelBinder : IModelBinder { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/PropertiesBuilder.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/PropertiesBuilder.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/PropertiesBuilder.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/PropertiesBuilder.cs index b641d7eb3..4a350dbef 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/PropertiesBuilder.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/PropertiesBuilder.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public class PropertiesBuilder { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RedirectToActionResultExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RedirectToActionResultExtensions.cs similarity index 97% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RedirectToActionResultExtensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RedirectToActionResultExtensions.cs index 95b840890..4a4c6a390 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RedirectToActionResultExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RedirectToActionResultExtensions.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public static class ResultExtensions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RequireInstanceMarker.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RequireInstanceMarker.cs similarity index 79% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RequireInstanceMarker.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RequireInstanceMarker.cs index a297e8a6f..898b013bd 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RequireInstanceMarker.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RequireInstanceMarker.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; internal sealed class RequireInstanceMarker { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RequireJourneyInstanceAttribute.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RequireJourneyInstanceAttribute.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RequireJourneyInstanceAttribute.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RequireJourneyInstanceAttribute.cs index 4bc503066..841923852 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/RequireJourneyInstanceAttribute.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/RequireJourneyInstanceAttribute.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false)] public sealed class RequireJourneyInstanceAttribute : Attribute diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ServiceCollectionExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ServiceCollectionExtensions.cs similarity index 90% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ServiceCollectionExtensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ServiceCollectionExtensions.cs index efd62a4f2..a5bdae635 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/ServiceCollectionExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/ServiceCollectionExtensions.cs @@ -7,12 +7,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -using TeachingRecordSystem.UiCommon.FormFlow.Conventions; -using TeachingRecordSystem.UiCommon.FormFlow.Filters; -using TeachingRecordSystem.UiCommon.FormFlow.ModelBinding; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow.Conventions; +using TeachingRecordSystem.WebCommon.FormFlow.Filters; +using TeachingRecordSystem.WebCommon.FormFlow.ModelBinding; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.FormFlow; +namespace TeachingRecordSystem.WebCommon.FormFlow; public static class ServiceCollectionExtensions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/CommitStateChangesMiddleware.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/CommitStateChangesMiddleware.cs similarity index 90% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/CommitStateChangesMiddleware.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/CommitStateChangesMiddleware.cs index 1e59c377c..ba0aba2c3 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/CommitStateChangesMiddleware.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/CommitStateChangesMiddleware.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http; -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public class CommitStateChangesMiddleware(IUserInstanceStateProvider userInstanceStateProvider, RequestDelegate next) { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/DbUserInstanceStateProvider.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/DbUserInstanceStateProvider.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/DbUserInstanceStateProvider.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/DbUserInstanceStateProvider.cs index 39e9740fc..1bac4877f 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/DbUserInstanceStateProvider.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/DbUserInstanceStateProvider.cs @@ -4,7 +4,7 @@ using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.SupportUi.Infrastructure.FormFlow; -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public class DbWithHttpContextTransactionUserInstanceStateProvider( IHttpContextAccessor httpContextAccessor, diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/DbUserInstanceStateProviderBase.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/DbUserInstanceStateProviderBase.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/DbUserInstanceStateProviderBase.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/DbUserInstanceStateProviderBase.cs index 3bb2efbd1..bee2828a6 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/DbUserInstanceStateProviderBase.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/DbUserInstanceStateProviderBase.cs @@ -3,7 +3,7 @@ using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.Core.DataStore.Postgres.Models; -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public abstract class DbUserInstanceStateProviderBase(IClock clock, IOptions jsonOptionsAccessor) : IUserInstanceStateProvider { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/ICurrentUserIdProvider.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/ICurrentUserIdProvider.cs similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/ICurrentUserIdProvider.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/ICurrentUserIdProvider.cs diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/IStateSerializer.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/IStateSerializer.cs similarity index 71% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/IStateSerializer.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/IStateSerializer.cs index 8318c630f..91b2f4a24 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/IStateSerializer.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/IStateSerializer.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public interface IStateSerializer { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/IUserInstanceStateProvider.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/IUserInstanceStateProvider.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/IUserInstanceStateProvider.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/IUserInstanceStateProvider.cs index dae5b7f07..2712b007a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/IUserInstanceStateProvider.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/IUserInstanceStateProvider.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public interface IUserInstanceStateProvider { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/JsonOptions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/JsonOptions.cs similarity index 77% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/JsonOptions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/JsonOptions.cs index c523d6cfb..5fb8466a4 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/JsonOptions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/JsonOptions.cs @@ -1,6 +1,6 @@ using System.Text.Json; -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public class JsonOptions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/JsonStateSerializer.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/JsonStateSerializer.cs similarity index 90% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/JsonStateSerializer.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/JsonStateSerializer.cs index 0308c71cb..282390c27 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/FormFlow/State/JsonStateSerializer.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/FormFlow/State/JsonStateSerializer.cs @@ -1,7 +1,7 @@ using System.Text.Json; using Microsoft.Extensions.Options; -namespace TeachingRecordSystem.UiCommon.FormFlow.State; +namespace TeachingRecordSystem.WebCommon.FormFlow.State; public class JsonStateSerializer(IOptions jsonOptionsAccessor) : IStateSerializer { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RedactParametersAttribute.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RedactParametersAttribute.cs similarity index 94% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RedactParametersAttribute.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RedactParametersAttribute.cs index 0f3de1fa8..f643f780b 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RedactParametersAttribute.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RedactParametersAttribute.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +using TeachingRecordSystem.WebCommon.Infrastructure.Logging; namespace TeachingRecordSystem; diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RedactedParametersMetadata.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RedactedParametersMetadata.cs similarity index 68% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RedactedParametersMetadata.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RedactedParametersMetadata.cs index b2cc5c047..83ff5e979 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RedactedParametersMetadata.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RedactedParametersMetadata.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +namespace TeachingRecordSystem.WebCommon.Infrastructure.Logging; public class RedactedParametersMetadata { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs similarity index 95% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs index 530094dde..5f58ef3ad 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RemoveRedactedUrlParametersEnricher.cs @@ -2,7 +2,7 @@ using Serilog.Core; using Serilog.Events; -namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +namespace TeachingRecordSystem.WebCommon.Infrastructure.Logging; public class RemoveRedactedUrlParametersEnricher(IHttpContextAccessor httpContextAccessor, UrlRedactor urlRedactor) : ILogEventEnricher { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs similarity index 88% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs index db4731d3b..bcc424674 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/RemoveRedactedUrlParametersEventProcessor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using Sentry.Extensibility; -namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +namespace TeachingRecordSystem.WebCommon.Infrastructure.Logging; public class RemoveRedactedUrlParametersEventProcessor(IHttpContextAccessor httpContextAccessor, UrlRedactor urlRedactor) : ISentryEventProcessor { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/UrlRedactor.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/UrlRedactor.cs similarity index 98% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/UrlRedactor.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/UrlRedactor.cs index c4270a981..552c7f8e5 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/UrlRedactor.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/UrlRedactor.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Routing.Patterns; using Microsoft.AspNetCore.WebUtilities; -namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +namespace TeachingRecordSystem.WebCommon.Infrastructure.Logging; public class UrlRedactor(IHttpContextAccessor httpContextAccessor) { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/WebApplicationBuilderExtensions.cs similarity index 94% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/WebApplicationBuilderExtensions.cs index 77f3e6e2a..b6267df7a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Infrastructure/Logging/WebApplicationBuilderExtensions.cs @@ -6,7 +6,7 @@ using Sentry.Extensibility; using Serilog; -namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; +namespace TeachingRecordSystem.WebCommon.Infrastructure.Logging; public static class WebApplicationBuilderExtensions { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Middleware/AppendSecurityResponseHeadersMiddleware.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Middleware/AppendSecurityResponseHeadersMiddleware.cs similarity index 91% rename from TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Middleware/AppendSecurityResponseHeadersMiddleware.cs rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Middleware/AppendSecurityResponseHeadersMiddleware.cs index 1241725fd..9c8086d80 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/Middleware/AppendSecurityResponseHeadersMiddleware.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Middleware/AppendSecurityResponseHeadersMiddleware.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http; -namespace TeachingRecordSystem.UiCommon.Middleware; +namespace TeachingRecordSystem.WebCommon.Middleware; public class AppendSecurityResponseHeadersMiddleware(RequestDelegate next) { diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Properties/InternalsVisibleTo.cs b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Properties/InternalsVisibleTo.cs new file mode 100644 index 000000000..d0f48532b --- /dev/null +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/Properties/InternalsVisibleTo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("TeachingRecordSystem.WebCommon.Tests")] diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/TeachingRecordSystem.WebCommon.csproj similarity index 92% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/TeachingRecordSystem.WebCommon.csproj index 2ebd02057..24e656962 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/TeachingRecordSystem.WebCommon.csproj @@ -1,15 +1,11 @@ - Library net8.0 - - - diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/packages.lock.json similarity index 100% rename from TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/packages.lock.json rename to TeachingRecordSystem/src/TeachingRecordSystem.WebCommon/packages.lock.json diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json index 3a9a16790..f1dc76bd9 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json @@ -2284,7 +2284,7 @@ "Swashbuckle.AspNetCore": "[6.6.2, )", "Swashbuckle.AspNetCore.Annotations": "[6.6.2, )", "TeachingRecordSystem.Core": "[1.0.0, )", - "TeachingRecordSystem.ServiceDefaults": "[1.0.0, )" + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, "teachingrecordsystem.core": { @@ -2340,19 +2340,6 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { - "type": "Project", - "dependencies": { - "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", - "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", - "Sentry.AspNetCore": "[4.9.0, )", - "Serilog.AspNetCore": "[8.0.3, )", - "TeachingRecordSystem.Core": "[1.0.0, )", - "prometheus-net.AspNetCore": "[8.2.1, )" - } - }, "teachingrecordsystem.testcommon": { "type": "Project", "dependencies": { @@ -2365,6 +2352,19 @@ "xunit.assert": "[2.9.0, )" } }, + "teachingrecordsystem.webcommon": { + "type": "Project", + "dependencies": { + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" + } + }, "AngleSharp": { "type": "CentralTransitive", "requested": "[1.1.2, )", diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/HostFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/HostFixture.cs index 3aa00668d..66f0cd091 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/HostFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/HostFixture.cs @@ -10,8 +10,8 @@ using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.Core.Services.Files; using TeachingRecordSystem.Core.Services.TrsDataSync; -using TeachingRecordSystem.UiCommon.FormFlow.State; using TeachingRecordSystem.UiTestCommon.Infrastructure.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.EndToEndTests; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/Infrastructure/Security/FakeOneLoginHandler.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/Infrastructure/Security/FakeOneLoginHandler.cs index 3c504116e..09316c2f3 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/Infrastructure/Security/FakeOneLoginHandler.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/Infrastructure/Security/FakeOneLoginHandler.cs @@ -5,7 +5,7 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow; using TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security; -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.EndToEndTests.Infrastructure.Security; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json index e125c779b..c61a34b62 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json @@ -2356,8 +2356,7 @@ "Joonasw.AspNetCore.SecurityHeaders": "[5.0.0, )", "OpenIddict.AspNetCore": "[5.2.0, )", "TeachingRecordSystem.Core": "[1.0.0, )", - "TeachingRecordSystem.ServiceDefaults": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, "teachingrecordsystem.core": { @@ -2413,19 +2412,6 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { - "type": "Project", - "dependencies": { - "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", - "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", - "Sentry.AspNetCore": "[4.9.0, )", - "Serilog.AspNetCore": "[8.0.3, )", - "TeachingRecordSystem.Core": "[1.0.0, )", - "prometheus-net.AspNetCore": "[8.2.1, )" - } - }, "teachingrecordsystem.testcommon": { "type": "Project", "dependencies": { @@ -2438,17 +2424,24 @@ "xunit.assert": "[2.9.0, )" } }, - "teachingrecordsystem.uicommon": { + "teachingrecordsystem.uitestcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" + "TeachingRecordSystem.TestCommon": "[1.0.0, )", + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, - "teachingrecordsystem.uitestcommon": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.TestCommon": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" } }, "AngleSharp": { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/HostFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/HostFixture.cs index f0c618e3f..0fb45b8b5 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/HostFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/HostFixture.cs @@ -8,8 +8,8 @@ using TeachingRecordSystem.Core.Services.Files; using TeachingRecordSystem.Core.Services.TrsDataSync; using TeachingRecordSystem.TestCommon.Infrastructure; -using TeachingRecordSystem.UiCommon.FormFlow.State; using TeachingRecordSystem.UiTestCommon.Infrastructure.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.Tests; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/JourneyInstanceExtensions.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/JourneyInstanceExtensions.cs index 40b798020..70cf95a43 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/JourneyInstanceExtensions.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/JourneyInstanceExtensions.cs @@ -1,4 +1,4 @@ -using TeachingRecordSystem.UiCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow; namespace TeachingRecordSystem.AuthorizeAccess.Tests; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/PageTests/RequestTrn/TestBase.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/PageTests/RequestTrn/TestBase.cs index 38e93dafe..876a03ad2 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/PageTests/RequestTrn/TestBase.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/PageTests/RequestTrn/TestBase.cs @@ -3,8 +3,8 @@ using Microsoft.Extensions.Primitives; using TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn; using TeachingRecordSystem.Core.DataStore.Postgres; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.Tests.PageTests.RequestTrn; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/TestBase.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/TestBase.cs index 8a4e15534..29065b85d 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/TestBase.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/TestBase.cs @@ -9,8 +9,8 @@ using TeachingRecordSystem.Core.DataStore.Postgres; using TeachingRecordSystem.Core.DataStore.Postgres.Models; using TeachingRecordSystem.Core.Services.TrsDataSync; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.AuthorizeAccess.Tests; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json index 36c55620f..f77072cd1 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json @@ -2340,8 +2340,7 @@ "Joonasw.AspNetCore.SecurityHeaders": "[5.0.0, )", "OpenIddict.AspNetCore": "[5.2.0, )", "TeachingRecordSystem.Core": "[1.0.0, )", - "TeachingRecordSystem.ServiceDefaults": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, "teachingrecordsystem.core": { @@ -2397,19 +2396,6 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { - "type": "Project", - "dependencies": { - "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", - "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", - "Sentry.AspNetCore": "[4.9.0, )", - "Serilog.AspNetCore": "[8.0.3, )", - "TeachingRecordSystem.Core": "[1.0.0, )", - "prometheus-net.AspNetCore": "[8.2.1, )" - } - }, "teachingrecordsystem.testcommon": { "type": "Project", "dependencies": { @@ -2422,17 +2408,24 @@ "xunit.assert": "[2.9.0, )" } }, - "teachingrecordsystem.uicommon": { + "teachingrecordsystem.uitestcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" + "TeachingRecordSystem.TestCommon": "[1.0.0, )", + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, - "teachingrecordsystem.uitestcommon": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.TestCommon": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" } }, "AngleSharp": { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.EndToEndTests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.EndToEndTests/packages.lock.json index c7c82e72b..1cb560223 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.EndToEndTests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.EndToEndTests/packages.lock.json @@ -2469,19 +2469,6 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { - "type": "Project", - "dependencies": { - "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", - "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", - "Sentry.AspNetCore": "[4.9.0, )", - "Serilog.AspNetCore": "[8.0.3, )", - "TeachingRecordSystem.Core": "[1.0.0, )", - "prometheus-net.AspNetCore": "[8.2.1, )" - } - }, "teachingrecordsystem.supportui": { "type": "Project", "dependencies": { @@ -2494,8 +2481,7 @@ "Microsoft.Identity.Web": "[2.17.0, )", "Microsoft.Identity.Web.GraphServiceClientBeta": "[2.16.0, )", "TeachingRecordSystem.Core": "[1.0.0, )", - "TeachingRecordSystem.ServiceDefaults": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, "teachingrecordsystem.testcommon": { @@ -2510,10 +2496,17 @@ "xunit.assert": "[2.9.0, )" } }, - "teachingrecordsystem.uicommon": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" } }, "AngleSharp": { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/GlobalUsings.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/GlobalUsings.cs index 25c633f23..dc760af01 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/GlobalUsings.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/GlobalUsings.cs @@ -1,5 +1,5 @@ global using TeachingRecordSystem.TestCommon; -global using TeachingRecordSystem.UiCommon.FormFlow; global using TeachingRecordSystem.UiTestCommon; +global using TeachingRecordSystem.WebCommon.FormFlow; global using UiDefaults = TeachingRecordSystem.SupportUi.Pages.Common.UiDefaults; global using AssertEx = TeachingRecordSystem.UiTestCommon.AssertEx; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/HostFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/HostFixture.cs index fbeb1411c..bdb4075d5 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/HostFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/HostFixture.cs @@ -8,8 +8,8 @@ using TeachingRecordSystem.SupportUi.Services.AzureActiveDirectory; using TeachingRecordSystem.SupportUi.Tests.Infrastructure.Security; using TeachingRecordSystem.TestCommon.Infrastructure; -using TeachingRecordSystem.UiCommon.FormFlow.State; using TeachingRecordSystem.UiTestCommon.Infrastructure.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.SupportUi.Tests; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/TestBase.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/TestBase.cs index ba9aae376..1a4ef577c 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/TestBase.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/TestBase.cs @@ -8,7 +8,7 @@ using TeachingRecordSystem.Core.Services.TrsDataSync; using TeachingRecordSystem.SupportUi.Tests.Infrastructure; using TeachingRecordSystem.SupportUi.Tests.Infrastructure.Security; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.SupportUi.Tests; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/packages.lock.json index 2c671a01f..079727b23 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/packages.lock.json @@ -2474,19 +2474,6 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.servicedefaults": { - "type": "Project", - "dependencies": { - "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", - "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", - "Sentry.AspNetCore": "[4.9.0, )", - "Serilog.AspNetCore": "[8.0.3, )", - "TeachingRecordSystem.Core": "[1.0.0, )", - "prometheus-net.AspNetCore": "[8.2.1, )" - } - }, "teachingrecordsystem.supportui": { "type": "Project", "dependencies": { @@ -2499,8 +2486,7 @@ "Microsoft.Identity.Web": "[2.17.0, )", "Microsoft.Identity.Web.GraphServiceClientBeta": "[2.16.0, )", "TeachingRecordSystem.Core": "[1.0.0, )", - "TeachingRecordSystem.ServiceDefaults": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, "teachingrecordsystem.testcommon": { @@ -2515,17 +2501,24 @@ "xunit.assert": "[2.9.0, )" } }, - "teachingrecordsystem.uicommon": { + "teachingrecordsystem.uitestcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" + "TeachingRecordSystem.TestCommon": "[1.0.0, )", + "TeachingRecordSystem.WebCommon": "[1.0.0, )" } }, - "teachingrecordsystem.uitestcommon": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.TestCommon": "[1.0.0, )", - "TeachingRecordSystem.UiCommon": "[1.0.0, )" + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" } }, "AngleSharp": { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/Infrastructure/FormFlow/InMemoryInstanceStateProvider.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/Infrastructure/FormFlow/InMemoryInstanceStateProvider.cs index 9dbfc1545..dfed0cca0 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/Infrastructure/FormFlow/InMemoryInstanceStateProvider.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/Infrastructure/FormFlow/InMemoryInstanceStateProvider.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Text.Json; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; namespace TeachingRecordSystem.UiTestCommon.Infrastructure.FormFlow; diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/TeachingRecordSystem.UiTestCommon.csproj b/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/TeachingRecordSystem.UiTestCommon.csproj index 4639aa6a7..e4cd66edb 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/TeachingRecordSystem.UiTestCommon.csproj +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/TeachingRecordSystem.UiTestCommon.csproj @@ -7,7 +7,7 @@ - + diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/packages.lock.json index 1286fd18c..68b1d25ea 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.UiTestCommon/packages.lock.json @@ -209,6 +209,31 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.AspNetCore.Cryptography.Internal": { + "type": "Transitive", + "resolved": "3.1.32", + "contentHash": "tULjwFie6fYm4o6WfD+aHTTrps2I22MQVZpmEWaJumFmzZWA1nHsKezuCBl/u/iKiXtN3npL6MoINaiLHURr/A==" + }, + "Microsoft.AspNetCore.DataProtection": { + "type": "Transitive", + "resolved": "3.1.32", + "contentHash": "D46awzK+Q0jP7Bq0cQlsxQrhg7MBhlxG2z+U+9EzcbjcjaDzQvaD5/cxD+qKdu9bHMcSFf9fMr5wizSBPPai1Q==", + "dependencies": { + "Microsoft.AspNetCore.Cryptography.Internal": "3.1.32", + "Microsoft.AspNetCore.DataProtection.Abstractions": "3.1.32", + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.32", + "Microsoft.Extensions.Hosting.Abstractions": "3.1.32", + "Microsoft.Extensions.Logging.Abstractions": "3.1.32", + "Microsoft.Extensions.Options": "3.1.32", + "Microsoft.Win32.Registry": "4.7.0", + "System.Security.Cryptography.Xml": "4.7.1" + } + }, + "Microsoft.AspNetCore.DataProtection.Abstractions": { + "type": "Transitive", + "resolved": "3.1.32", + "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + }, "Microsoft.Azure.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -363,6 +388,22 @@ "System.Diagnostics.DiagnosticSource": "8.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "8.0.0", @@ -481,8 +522,8 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "5.0.10", - "contentHash": "pp9tbGqIhdEXL6Q1yJl+zevAJSq4BsxqhS1GXzBvEsEz9DDNu9GLNzgUy2xyFc4YjB4m4Ff2YEWTnvQvVYdkvQ==" + "resolved": "7.0.0", + "contentHash": "udvKco0sAVgYGTBnHUb0tY9JQzJ/nPDiv/8PIyz69wl1AibeCDZOLVVI+6156dPfHmJH7ws5oUJRiW4ZmAvuuA==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -640,17 +681,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" } }, "Microsoft.Win32.SystemEvents": { @@ -717,6 +752,15 @@ "resolved": "5.2.0", "contentHash": "CMzogVlVEaeZK/xlYPAeqDsZM01512x4dMQsgFKH2RzE+o5tI8LzpwX+0pQ2WKaNq6cl82zDEHS2rnOPIOUCUg==" }, + "prometheus-net": { + "type": "Transitive", + "resolved": "8.2.1", + "contentHash": "3wVgdEPOCBF752s2xps5T+VH+c9mJK8S8GKEDg49084P6JZMumTZI5Te6aJ9MQpX0sx7om6JOnBpIi7ZBmmiDQ==", + "dependencies": { + "Microsoft.Extensions.Http": "3.1.0", + "Microsoft.Extensions.ObjectPool": "7.0.0" + } + }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", "resolved": "4.3.2", @@ -820,6 +864,31 @@ "resolved": "4.12.1", "contentHash": "OLf7885OKHWLaTLTyw884mwOT4XKCWj2Hz5Wuz/TJemJqXwCIdIljkJBIoeHviRUPvtB7ulDgeYXf/Z7ScToSA==" }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "YEAMWu1UnWgf1c1KP85l1SgXGfiVo0Rz6x08pCiPOIBt2Qe18tcZLvdBUuV5o1QHvrs8FAry9wTIhgBRtjIlEg==", + "dependencies": { + "Microsoft.Extensions.Logging": "8.0.0", + "Serilog": "3.1.1" + } + }, + "Serilog.Sinks.Debug": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "Y6g3OBJ4JzTyyw16fDqtFcQ41qQAydnEvEqmXjhwhgjsnG/FaJ8GUqF5ldsC/bVkK8KYmqrPhDO+tm4dF6xx4A==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, "SharpZipLib": { "type": "Transitive", "resolved": "1.3.3", @@ -2014,10 +2083,17 @@ "xunit.assert": "[2.9.0, )" } }, - "teachingrecordsystem.uicommon": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" } }, "AngleSharp": { @@ -2029,6 +2105,27 @@ "System.Text.Encoding.CodePages": "8.0.0" } }, + "AspNetCore.HealthChecks.NpgSql": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "X7Ewbi6pVdsZ3ENV3EnA4DPPckHuTmWZBtu3vhFQEnmxKTQakD1dkPCoX65xkqVRy/akBPc2A/yvFyrsZpUqsg==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Npgsql": "8.0.0" + } + }, + "Azure.Extensions.AspNetCore.DataProtection.Blobs": { + "type": "CentralTransitive", + "requested": "[1.3.4, )", + "resolved": "1.3.4", + "contentHash": "zS+x0MpUMSbvZD598lwAoax+ohIeSAvGlXpT71iP7FFmMZ+Tjz/8hx+jZH/RbV2cJYTYbux8XFDll7LMPuz46g==", + "dependencies": { + "Azure.Core": "1.38.0", + "Azure.Storage.Blobs": "12.16.0", + "Microsoft.AspNetCore.DataProtection": "3.1.32" + } + }, "Azure.Storage.Blobs": { "type": "CentralTransitive", "requested": "[12.19.1, )", @@ -2170,6 +2267,15 @@ "System.Runtime.Extensions": "4.3.0" } }, + "Hangfire.AspNetCore": { + "type": "CentralTransitive", + "requested": "[1.8.14, )", + "resolved": "1.8.14", + "contentHash": "aTPzKN/g9SW30QB1SLTOMuckKqTVL1YAhtEpWll4LPbPTgyeBHJTChdRhrN127fj+mqJ6P4P7+HJBhNYUFTfNw==", + "dependencies": { + "Hangfire.NetCore": "[1.8.14]" + } + }, "Hangfire.Core": { "type": "CentralTransitive", "requested": "[1.8.14, )", @@ -2209,6 +2315,15 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { + "type": "CentralTransitive", + "requested": "[8.0.8, )", + "resolved": "8.0.8", + "contentHash": "y/2e8g+A2kRiyuHK+KWO8AgKZL6+heKM/Y2ijP4HVMP3QJFWK9xakXucMqC8A4hvL1U9JTEjOuZoa+c7Tr/XYA==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Relational": "8.0.8" + } + }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", @@ -2502,6 +2617,15 @@ "resolved": "8.2.1", "contentHash": "/Z3EspfWBdTla4I9IAcQn32/7kB5WS3rSnOYloz8YlVyClu8h7uuYf4pfUvffOYVbxmDX/mFRfxwzqW2Zs96ZA==" }, + "prometheus-net.AspNetCore": { + "type": "CentralTransitive", + "requested": "[8.2.1, )", + "resolved": "8.2.1", + "contentHash": "/4TfTvbwIDqpaKTiWvEsjUywiHYF9zZvGZF5sK15avoDsUO/WPQbKsF8TiMaesuphdFQPK2z52P0zk6j26V0rQ==", + "dependencies": { + "prometheus-net": "8.2.1" + } + }, "Respawn": { "type": "CentralTransitive", "requested": "[6.2.0, )", @@ -2521,6 +2645,28 @@ "Microsoft.Extensions.DependencyModel": "8.0.1" } }, + "Sentry.AspNetCore": { + "type": "CentralTransitive", + "requested": "[4.9.0, )", + "resolved": "4.9.0", + "contentHash": "927iNu4O4f+q8mVXNmekRHil0KIZGhFH7w8TJ4wHXxrZiP0z7Q21yWfYamyWO8z2rXFwm4G7WlSaEjU6RIZ3Uw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Sentry.Extensions.Logging": "4.9.0" + } + }, + "Sentry.Extensions.Logging": { + "type": "CentralTransitive", + "requested": "[4.9.0, )", + "resolved": "4.9.0", + "contentHash": "P+9y+rxE5YPHw1sWWMUcSDF5tHfm+vP9yxJiALE85RXMkzT/H7tp7Pstclbnht38KiPsC3sFUtMBdYFdiMvHKg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.Http": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0", + "Sentry": "4.9.0" + } + }, "Sentry.Serilog": { "type": "CentralTransitive", "requested": "[4.12.1, )", @@ -2537,6 +2683,22 @@ "resolved": "4.0.0", "contentHash": "2jDkUrSh5EofOp7Lx5Zgy0EB+7hXjjxE2ktTb1WVQmU00lDACR2TdROGKU0K1pDTBSJBN1PqgYpgOZF8mL7NJw==" }, + "Serilog.AspNetCore": { + "type": "CentralTransitive", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "Y5at41mc0OV982DEJslBKHd6uzcWO6POwR3QceJ6gtpMPxCzm4+FElGPF0RdaTD7MGsP6XXE05LMbSi0NO+sXg==", + "dependencies": { + "Microsoft.Extensions.Logging": "8.0.0", + "Serilog": "3.1.1", + "Serilog.Extensions.Hosting": "8.0.0", + "Serilog.Formatting.Compact": "2.0.0", + "Serilog.Settings.Configuration": "8.0.4", + "Serilog.Sinks.Console": "5.0.0", + "Serilog.Sinks.Debug": "2.0.0", + "Serilog.Sinks.File": "5.0.0" + } + }, "Serilog.Expressions": { "type": "CentralTransitive", "requested": "[5.0.0, )", @@ -2546,6 +2708,19 @@ "Serilog": "4.0.0" } }, + "Serilog.Extensions.Hosting": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "db0OcbWeSCvYQkHWu6n0v40N4kKaTAXNjlM3BKvcbwvNzYphQFcBR+36eQ/7hMMwOkJvAyLC2a9/jNdUL5NjtQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Serilog": "3.1.1", + "Serilog.Extensions.Logging": "8.0.0" + } + }, "Serilog.Formatting.Compact": { "type": "CentralTransitive", "requested": "[3.0.0, )", diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/EndToEndTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/EndToEndTests.cs similarity index 97% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/EndToEndTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/EndToEndTests.cs index 81bf0f8cb..19462dd71 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/EndToEndTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/EndToEndTests.cs @@ -3,9 +3,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Primitives; -using TeachingRecordSystem.UiCommon.Tests.FormFlow.Infrastructure; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.Tests.FormFlow.Infrastructure; -namespace TeachingRecordSystem.UiCommon.FormFlow.Tests; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow; public class EndToEndTests : MvcTestBase { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs similarity index 92% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs index 16de10cb0..53c4440e0 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/InMemoryInstanceStateProvider.cs @@ -1,7 +1,7 @@ -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.Tests.FormFlow.Infrastructure; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow.Infrastructure; public class InMemoryInstanceStateProvider : IUserInstanceStateProvider { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/MvcTestBase.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/MvcTestBase.cs similarity index 88% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/MvcTestBase.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/MvcTestBase.cs index 5e071500a..77ed232e2 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/MvcTestBase.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/MvcTestBase.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.Primitives; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.Tests.FormFlow.Infrastructure; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow.Infrastructure; [Collection("Mvc")] public abstract class MvcTestBase diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/MvcTestFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/MvcTestFixture.cs similarity index 90% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/MvcTestFixture.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/MvcTestFixture.cs index 735112f80..144d17770 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/Infrastructure/MvcTestFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/Infrastructure/MvcTestFixture.cs @@ -1,9 +1,8 @@ using Microsoft.AspNetCore.TestHost; -using TeachingRecordSystem.UiCommon.FormFlow; -using TeachingRecordSystem.UiCommon.FormFlow.State; -using TeachingRecordSystem.UiCommon.FormFlow.Tests; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.Tests.FormFlow.Infrastructure; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow.Infrastructure; public sealed class MvcTestFixture : IDisposable { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceIdTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceIdTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceIdTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceIdTests.cs index f6f31f766..4c0de9b23 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceIdTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceIdTests.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; +using TeachingRecordSystem.WebCommon.FormFlow; -namespace TeachingRecordSystem.UiCommon.FormFlow.Tests; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow; public class JourneyInstanceIdTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceProviderTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceProviderTests.cs similarity index 99% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceProviderTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceProviderTests.cs index 1d926cc7d..f964a0b4f 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceProviderTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceProviderTests.cs @@ -2,9 +2,10 @@ using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.FormFlow.Tests; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow; public class JourneyInstanceProviderTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceTests.cs similarity index 95% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceTests.cs index 4af09885f..8206d4090 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/JourneyInstanceTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/JourneyInstanceTests.cs @@ -1,7 +1,8 @@ using Microsoft.Extensions.Primitives; -using TeachingRecordSystem.UiCommon.FormFlow.State; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.FormFlow.State; -namespace TeachingRecordSystem.UiCommon.FormFlow.Tests; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow; public class JourneyInstanceTests { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/MissingInstanceActionFilterTests.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/MissingInstanceActionFilterTests.cs similarity index 94% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/MissingInstanceActionFilterTests.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/MissingInstanceActionFilterTests.cs index 170f4a5c6..33b2f5ac7 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/MissingInstanceActionFilterTests.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/MissingInstanceActionFilterTests.cs @@ -1,9 +1,10 @@ using System.Net; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Primitives; -using TeachingRecordSystem.UiCommon.Tests.FormFlow.Infrastructure; +using TeachingRecordSystem.WebCommon.FormFlow; +using TeachingRecordSystem.WebCommon.Tests.FormFlow.Infrastructure; -namespace TeachingRecordSystem.UiCommon.FormFlow.Tests; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow; public class MissingInstanceActionFilterTests : MvcTestBase { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/RouteValueDictionaryExtensions.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/RouteValueDictionaryExtensions.cs similarity index 84% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/RouteValueDictionaryExtensions.cs rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/RouteValueDictionaryExtensions.cs index b2dbeb13d..1effa62ca 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/FormFlow/RouteValueDictionaryExtensions.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/FormFlow/RouteValueDictionaryExtensions.cs @@ -1,4 +1,4 @@ -namespace TeachingRecordSystem.UiCommon.FormFlow.Tests; +namespace TeachingRecordSystem.WebCommon.Tests.FormFlow; internal static class RouteValueDictionaryExtensions { diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/TeachingRecordSystem.UiCommon.Tests.csproj b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/TeachingRecordSystem.WebCommon.Tests.csproj similarity index 86% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/TeachingRecordSystem.UiCommon.Tests.csproj rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/TeachingRecordSystem.WebCommon.Tests.csproj index 99dc09ef5..4a1f4c772 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/TeachingRecordSystem.UiCommon.Tests.csproj +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/TeachingRecordSystem.WebCommon.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/packages.lock.json similarity index 93% rename from TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/packages.lock.json rename to TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/packages.lock.json index 7c215473a..64a69ea16 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.UiCommon.Tests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.WebCommon.Tests/packages.lock.json @@ -198,6 +198,31 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.AspNetCore.Cryptography.Internal": { + "type": "Transitive", + "resolved": "3.1.32", + "contentHash": "tULjwFie6fYm4o6WfD+aHTTrps2I22MQVZpmEWaJumFmzZWA1nHsKezuCBl/u/iKiXtN3npL6MoINaiLHURr/A==" + }, + "Microsoft.AspNetCore.DataProtection": { + "type": "Transitive", + "resolved": "3.1.32", + "contentHash": "D46awzK+Q0jP7Bq0cQlsxQrhg7MBhlxG2z+U+9EzcbjcjaDzQvaD5/cxD+qKdu9bHMcSFf9fMr5wizSBPPai1Q==", + "dependencies": { + "Microsoft.AspNetCore.Cryptography.Internal": "3.1.32", + "Microsoft.AspNetCore.DataProtection.Abstractions": "3.1.32", + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.32", + "Microsoft.Extensions.Hosting.Abstractions": "3.1.32", + "Microsoft.Extensions.Logging.Abstractions": "3.1.32", + "Microsoft.Extensions.Options": "3.1.32", + "Microsoft.Win32.Registry": "4.7.0", + "System.Security.Cryptography.Xml": "4.7.1" + } + }, + "Microsoft.AspNetCore.DataProtection.Abstractions": { + "type": "Transitive", + "resolved": "3.1.32", + "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" + }, "Microsoft.AspNetCore.TestHost": { "type": "Transitive", "resolved": "8.0.7", @@ -365,6 +390,22 @@ "System.Diagnostics.DiagnosticSource": "8.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "8.0.0", @@ -483,8 +524,8 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "5.0.10", - "contentHash": "pp9tbGqIhdEXL6Q1yJl+zevAJSq4BsxqhS1GXzBvEsEz9DDNu9GLNzgUy2xyFc4YjB4m4Ff2YEWTnvQvVYdkvQ==" + "resolved": "7.0.0", + "contentHash": "udvKco0sAVgYGTBnHUb0tY9JQzJ/nPDiv/8PIyz69wl1AibeCDZOLVVI+6156dPfHmJH7ws5oUJRiW4ZmAvuuA==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -659,17 +700,11 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" } }, "Microsoft.Win32.SystemEvents": { @@ -779,6 +814,15 @@ "resolved": "5.2.0", "contentHash": "CMzogVlVEaeZK/xlYPAeqDsZM01512x4dMQsgFKH2RzE+o5tI8LzpwX+0pQ2WKaNq6cl82zDEHS2rnOPIOUCUg==" }, + "prometheus-net": { + "type": "Transitive", + "resolved": "8.2.1", + "contentHash": "3wVgdEPOCBF752s2xps5T+VH+c9mJK8S8GKEDg49084P6JZMumTZI5Te6aJ9MQpX0sx7om6JOnBpIi7ZBmmiDQ==", + "dependencies": { + "Microsoft.Extensions.Http": "3.1.0", + "Microsoft.Extensions.ObjectPool": "7.0.0" + } + }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", "resolved": "4.3.2", @@ -891,6 +935,31 @@ "resolved": "4.12.1", "contentHash": "OLf7885OKHWLaTLTyw884mwOT4XKCWj2Hz5Wuz/TJemJqXwCIdIljkJBIoeHviRUPvtB7ulDgeYXf/Z7ScToSA==" }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "YEAMWu1UnWgf1c1KP85l1SgXGfiVo0Rz6x08pCiPOIBt2Qe18tcZLvdBUuV5o1QHvrs8FAry9wTIhgBRtjIlEg==", + "dependencies": { + "Microsoft.Extensions.Logging": "8.0.0", + "Serilog": "3.1.1" + } + }, + "Serilog.Sinks.Debug": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "Y6g3OBJ4JzTyyw16fDqtFcQ41qQAydnEvEqmXjhwhgjsnG/FaJ8GUqF5ldsC/bVkK8KYmqrPhDO+tm4dF6xx4A==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, "SharpZipLib": { "type": "Transitive", "resolved": "1.3.3", @@ -2210,10 +2279,17 @@ "dbup-sqlserver": "[5.0.37, )" } }, - "teachingrecordsystem.uicommon": { + "teachingrecordsystem.webcommon": { "type": "Project", "dependencies": { - "TeachingRecordSystem.Core": "[1.0.0, )" + "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", + "Hangfire.AspNetCore": "[1.8.14, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", + "Sentry.AspNetCore": "[4.9.0, )", + "Serilog.AspNetCore": "[8.0.3, )", + "TeachingRecordSystem.Core": "[1.0.0, )", + "prometheus-net.AspNetCore": "[8.2.1, )" } }, "AngleSharp": { @@ -2225,6 +2301,27 @@ "System.Text.Encoding.CodePages": "8.0.0" } }, + "AspNetCore.HealthChecks.NpgSql": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "X7Ewbi6pVdsZ3ENV3EnA4DPPckHuTmWZBtu3vhFQEnmxKTQakD1dkPCoX65xkqVRy/akBPc2A/yvFyrsZpUqsg==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Npgsql": "8.0.0" + } + }, + "Azure.Extensions.AspNetCore.DataProtection.Blobs": { + "type": "CentralTransitive", + "requested": "[1.3.4, )", + "resolved": "1.3.4", + "contentHash": "zS+x0MpUMSbvZD598lwAoax+ohIeSAvGlXpT71iP7FFmMZ+Tjz/8hx+jZH/RbV2cJYTYbux8XFDll7LMPuz46g==", + "dependencies": { + "Azure.Core": "1.38.0", + "Azure.Storage.Blobs": "12.16.0", + "Microsoft.AspNetCore.DataProtection": "3.1.32" + } + }, "Azure.Storage.Blobs": { "type": "CentralTransitive", "requested": "[12.19.1, )", @@ -2342,6 +2439,15 @@ "System.Runtime.Extensions": "4.3.0" } }, + "Hangfire.AspNetCore": { + "type": "CentralTransitive", + "requested": "[1.8.14, )", + "resolved": "1.8.14", + "contentHash": "aTPzKN/g9SW30QB1SLTOMuckKqTVL1YAhtEpWll4LPbPTgyeBHJTChdRhrN127fj+mqJ6P4P7+HJBhNYUFTfNw==", + "dependencies": { + "Hangfire.NetCore": "[1.8.14]" + } + }, "Hangfire.Core": { "type": "CentralTransitive", "requested": "[1.8.14, )", @@ -2381,6 +2487,15 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { + "type": "CentralTransitive", + "requested": "[8.0.8, )", + "resolved": "8.0.8", + "contentHash": "y/2e8g+A2kRiyuHK+KWO8AgKZL6+heKM/Y2ijP4HVMP3QJFWK9xakXucMqC8A4hvL1U9JTEjOuZoa+c7Tr/XYA==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Relational": "8.0.8" + } + }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", @@ -2665,6 +2780,15 @@ "resolved": "8.2.1", "contentHash": "/Z3EspfWBdTla4I9IAcQn32/7kB5WS3rSnOYloz8YlVyClu8h7uuYf4pfUvffOYVbxmDX/mFRfxwzqW2Zs96ZA==" }, + "prometheus-net.AspNetCore": { + "type": "CentralTransitive", + "requested": "[8.2.1, )", + "resolved": "8.2.1", + "contentHash": "/4TfTvbwIDqpaKTiWvEsjUywiHYF9zZvGZF5sK15avoDsUO/WPQbKsF8TiMaesuphdFQPK2z52P0zk6j26V0rQ==", + "dependencies": { + "prometheus-net": "8.2.1" + } + }, "Scrutor": { "type": "CentralTransitive", "requested": "[5.0.1, )", @@ -2675,6 +2799,28 @@ "Microsoft.Extensions.DependencyModel": "8.0.1" } }, + "Sentry.AspNetCore": { + "type": "CentralTransitive", + "requested": "[4.9.0, )", + "resolved": "4.9.0", + "contentHash": "927iNu4O4f+q8mVXNmekRHil0KIZGhFH7w8TJ4wHXxrZiP0z7Q21yWfYamyWO8z2rXFwm4G7WlSaEjU6RIZ3Uw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Sentry.Extensions.Logging": "4.9.0" + } + }, + "Sentry.Extensions.Logging": { + "type": "CentralTransitive", + "requested": "[4.9.0, )", + "resolved": "4.9.0", + "contentHash": "P+9y+rxE5YPHw1sWWMUcSDF5tHfm+vP9yxJiALE85RXMkzT/H7tp7Pstclbnht38KiPsC3sFUtMBdYFdiMvHKg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.Http": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0", + "Sentry": "4.9.0" + } + }, "Sentry.Serilog": { "type": "CentralTransitive", "requested": "[4.12.1, )", @@ -2691,6 +2837,22 @@ "resolved": "4.0.0", "contentHash": "2jDkUrSh5EofOp7Lx5Zgy0EB+7hXjjxE2ktTb1WVQmU00lDACR2TdROGKU0K1pDTBSJBN1PqgYpgOZF8mL7NJw==" }, + "Serilog.AspNetCore": { + "type": "CentralTransitive", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "Y5at41mc0OV982DEJslBKHd6uzcWO6POwR3QceJ6gtpMPxCzm4+FElGPF0RdaTD7MGsP6XXE05LMbSi0NO+sXg==", + "dependencies": { + "Microsoft.Extensions.Logging": "8.0.0", + "Serilog": "3.1.1", + "Serilog.Extensions.Hosting": "8.0.0", + "Serilog.Formatting.Compact": "2.0.0", + "Serilog.Settings.Configuration": "8.0.4", + "Serilog.Sinks.Console": "5.0.0", + "Serilog.Sinks.Debug": "2.0.0", + "Serilog.Sinks.File": "5.0.0" + } + }, "Serilog.Expressions": { "type": "CentralTransitive", "requested": "[5.0.0, )", @@ -2700,6 +2862,19 @@ "Serilog": "4.0.0" } }, + "Serilog.Extensions.Hosting": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "db0OcbWeSCvYQkHWu6n0v40N4kKaTAXNjlM3BKvcbwvNzYphQFcBR+36eQ/7hMMwOkJvAyLC2a9/jNdUL5NjtQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Serilog": "3.1.1", + "Serilog.Extensions.Logging": "8.0.0" + } + }, "Serilog.Formatting.Compact": { "type": "CentralTransitive", "requested": "[3.0.0, )",