From 2ec29d65fc4e5507d3873761d3890933cfcb7f0e Mon Sep 17 00:00:00 2001 From: Sergii Diachenko Date: Sun, 14 Nov 2021 13:59:44 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=AC=86=20Upgraded=20dependencies?= =?UTF-8?q?=20(#789)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: :arrow_up: Upgraded dependencies * specified build agent OS version * few more images specified * removed specflow flag * reverted test-config * awaited scenario cleanup * update more refs * try remove integration test * ignore other tests * another ignore * leave single test * reverted languafge ext * reverted ms packages to 5.0.0 --- .../tournamentData/kryvbas-21-22-schedule.json | 4 ++++ .../tournamentData/kryvbas-21-22-standings.json | 4 ++++ .../tournamentData/lvld-21-22-schedule.json | 4 ++++ .../tournamentData/lvld-21-22-standings.json | 4 ++++ .../tournamentData/mariupol-21-22-schedule.json | 4 ++++ .../tournamentData/mariupol-21-22-standings.json | 4 ++++ azure-pipelines.yml | 14 +++++++++++++- src/Client/VolleyM.API/VolleyM.API.csproj | 12 ++++++------ .../VolleyM.Domain.Contracts.csproj | 4 ++-- .../VolleyM.Domain.IdentityAndAccess.csproj | 2 +- .../VolleyM.Infrastructure.Bootstrap.csproj | 6 +++--- .../VolleyM.Architecture.UnitTests.csproj | 8 ++++---- .../VolleyM.Domain.Contributors.UnitTests.csproj | 15 +++++++++------ .../VolleyM.Domain.Framework.UnitTests.csproj | 15 +++++++++------ ...leyM.Domain.IdentityAndAccess.UnitTests.csproj | 15 +++++++++------ .../Players/CorrectName.feature | 4 ++-- .../Players/CorrectNameSteps.cs | 3 --- .../VolleyM.Domain.Players.UnitTests.csproj | 10 +++++----- .../DomainTestSetupBase.cs | 8 ++++---- .../VolleyM.Domain.UnitTests.Framework.csproj | 8 ++++---- .../Fixture/ContextA/EventA.cs | 4 +--- ...yM.Infrastructure.EventBroker.UnitTests.csproj | 15 +++++++++------ .../VolleyM.Tools.MigrationTool.csproj | 10 +++++----- 23 files changed, 110 insertions(+), 67 deletions(-) create mode 100644 archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-schedule.json create mode 100644 archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-standings.json create mode 100644 archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-schedule.json create mode 100644 archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-standings.json create mode 100644 archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-schedule.json create mode 100644 archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-standings.json diff --git a/archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-schedule.json b/archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-schedule.json new file mode 100644 index 000000000..5ccbab94d --- /dev/null +++ b/archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-schedule.json @@ -0,0 +1,4 @@ +{ + "id": 21, + "mode": ["schedule"] +} \ No newline at end of file diff --git a/archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-standings.json b/archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-standings.json new file mode 100644 index 000000000..c4fb9c83b --- /dev/null +++ b/archive/src/volley.org.ua_Integration/tournamentData/kryvbas-21-22-standings.json @@ -0,0 +1,4 @@ +{ + "id": 21, + "mode": ["standings","pivot"] +} \ No newline at end of file diff --git a/archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-schedule.json b/archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-schedule.json new file mode 100644 index 000000000..a901f997c --- /dev/null +++ b/archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-schedule.json @@ -0,0 +1,4 @@ +{ + "id": 20, + "mode": ["schedule"] +} \ No newline at end of file diff --git a/archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-standings.json b/archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-standings.json new file mode 100644 index 000000000..8a7319baf --- /dev/null +++ b/archive/src/volley.org.ua_Integration/tournamentData/lvld-21-22-standings.json @@ -0,0 +1,4 @@ +{ + "id": 20, + "mode": ["standings","pivot"] +} \ No newline at end of file diff --git a/archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-schedule.json b/archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-schedule.json new file mode 100644 index 000000000..62056f0b7 --- /dev/null +++ b/archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-schedule.json @@ -0,0 +1,4 @@ +{ + "id": 22, + "mode": ["schedule"] +} \ No newline at end of file diff --git a/archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-standings.json b/archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-standings.json new file mode 100644 index 000000000..78286f992 --- /dev/null +++ b/archive/src/volley.org.ua_Integration/tournamentData/mariupol-21-22-standings.json @@ -0,0 +1,4 @@ +{ + "id": 22, + "mode": ["standings","pivot"] +} \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index be09c9eba..efd2d64c5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,12 +77,14 @@ stages: jobs: - job: integration_test displayName: Integration Tests + pool: + vmImage: 'ubuntu-latest' steps: - template: build/azure-pipeline/setup-dotnet-cli.yml parameters: version: 5.0.300 # Need to set this var for the build to avoid Specflow issue https://github.com/SpecFlowOSS/SpecFlow/issues/1912 - - script: echo "##vso[task.setvariable variable=MSBUILDSINGLELOADCONTEXT;]1" + # - script: echo "##vso[task.setvariable variable=MSBUILDSINGLELOADCONTEXT;]1" - script: | echo "##vso[task.setvariable variable=VOLLEYM_TESTTARGET;]AzureCloud" echo "##vso[task.setvariable variable=VOLLEYM_IDENTITYCONTEXTTABLESTORAGEOPTIONS__CONNECTIONSTRING;]$(vm_azstorage_connection_string_staging)" @@ -99,6 +101,8 @@ stages: condition: succeededOrFailed() #publish even if tests failed - it is useful for debugging - job: azure_storage_migrations displayName: Run Azure Storage Migrations + pool: + vmImage: 'ubuntu-latest' steps: - download: current artifact: azureStorageMigration @@ -115,6 +119,8 @@ stages: VOLLEYM_MIGRATION_PLAYERSCONTEXTTABLESTORAGEOPTIONS__CONNECTIONSTRING: $(vm_azstorage_connection_string_staging) - job: deploy_app_service_int displayName: Deploy App Service + pool: + vmImage: 'ubuntu-latest' dependsOn: - azure_storage_migrations steps: @@ -131,6 +137,8 @@ stages: -PLAYERSCONTEXTTABLESTORAGEOPTIONS__CONNECTIONSTRING $(vm_azstorage_connection_string_staging) - job: run_api_tests displayName: API Tests + pool: + vmImage: 'ubuntu-latest' dependsOn: - deploy_app_service_int steps: @@ -154,6 +162,8 @@ stages: jobs: - job: azure_storage_migrations displayName: Run Azure Storage Migrations + pool: + vmImage: 'ubuntu-latest' steps: - download: current artifact: azureStorageMigration @@ -170,6 +180,8 @@ stages: VOLLEYM_MIGRATION_PLAYERSCONTEXTTABLESTORAGEOPTIONS__CONNECTIONSTRING: $(vm_azstorage_connection_string_production) - job: deploy_app_service_prod displayName: Deploy App Service + pool: + vmImage: 'ubuntu-latest' dependsOn: azure_storage_migrations steps: diff --git a/src/Client/VolleyM.API/VolleyM.API.csproj b/src/Client/VolleyM.API/VolleyM.API.csproj index 7355ea58b..bb690bf23 100644 --- a/src/Client/VolleyM.API/VolleyM.API.csproj +++ b/src/Client/VolleyM.API/VolleyM.API.csproj @@ -8,22 +8,22 @@ - + - + - + - + - + - + diff --git a/src/Domain/VolleyM.Domain.Contracts/VolleyM.Domain.Contracts.csproj b/src/Domain/VolleyM.Domain.Contracts/VolleyM.Domain.Contracts.csproj index 8080ea38a..d30791667 100644 --- a/src/Domain/VolleyM.Domain.Contracts/VolleyM.Domain.Contracts.csproj +++ b/src/Domain/VolleyM.Domain.Contracts/VolleyM.Domain.Contracts.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/Domain/VolleyM.Domain.IdentityAndAccess/VolleyM.Domain.IdentityAndAccess.csproj b/src/Domain/VolleyM.Domain.IdentityAndAccess/VolleyM.Domain.IdentityAndAccess.csproj index 4706d87c2..24a610073 100644 --- a/src/Domain/VolleyM.Domain.IdentityAndAccess/VolleyM.Domain.IdentityAndAccess.csproj +++ b/src/Domain/VolleyM.Domain.IdentityAndAccess/VolleyM.Domain.IdentityAndAccess.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Infrastructure/VolleyM.Infrastructure.Bootstrap/VolleyM.Infrastructure.Bootstrap.csproj b/src/Infrastructure/VolleyM.Infrastructure.Bootstrap/VolleyM.Infrastructure.Bootstrap.csproj index b9737e603..4bca39b35 100644 --- a/src/Infrastructure/VolleyM.Infrastructure.Bootstrap/VolleyM.Infrastructure.Bootstrap.csproj +++ b/src/Infrastructure/VolleyM.Infrastructure.Bootstrap/VolleyM.Infrastructure.Bootstrap.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/tests/unit-tests/VolleyM.Architecture.UnitTests/VolleyM.Architecture.UnitTests.csproj b/tests/unit-tests/VolleyM.Architecture.UnitTests/VolleyM.Architecture.UnitTests.csproj index 2fa4e479b..7b5bfab90 100644 --- a/tests/unit-tests/VolleyM.Architecture.UnitTests/VolleyM.Architecture.UnitTests.csproj +++ b/tests/unit-tests/VolleyM.Architecture.UnitTests/VolleyM.Architecture.UnitTests.csproj @@ -8,17 +8,17 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/unit-tests/VolleyM.Domain.Contributors.UnitTests/VolleyM.Domain.Contributors.UnitTests.csproj b/tests/unit-tests/VolleyM.Domain.Contributors.UnitTests/VolleyM.Domain.Contributors.UnitTests.csproj index 5895c58a4..47ebe6cdf 100644 --- a/tests/unit-tests/VolleyM.Domain.Contributors.UnitTests/VolleyM.Domain.Contributors.UnitTests.csproj +++ b/tests/unit-tests/VolleyM.Domain.Contributors.UnitTests/VolleyM.Domain.Contributors.UnitTests.csproj @@ -8,18 +8,21 @@ - + - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/unit-tests/VolleyM.Domain.Framework.UnitTests/VolleyM.Domain.Framework.UnitTests.csproj b/tests/unit-tests/VolleyM.Domain.Framework.UnitTests/VolleyM.Domain.Framework.UnitTests.csproj index f57383781..f75a27982 100644 --- a/tests/unit-tests/VolleyM.Domain.Framework.UnitTests/VolleyM.Domain.Framework.UnitTests.csproj +++ b/tests/unit-tests/VolleyM.Domain.Framework.UnitTests/VolleyM.Domain.Framework.UnitTests.csproj @@ -8,18 +8,21 @@ - + - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/unit-tests/VolleyM.Domain.IdentityAndAccess.UnitTests/VolleyM.Domain.IdentityAndAccess.UnitTests.csproj b/tests/unit-tests/VolleyM.Domain.IdentityAndAccess.UnitTests/VolleyM.Domain.IdentityAndAccess.UnitTests.csproj index 0ef506634..dea97bcd5 100644 --- a/tests/unit-tests/VolleyM.Domain.IdentityAndAccess.UnitTests/VolleyM.Domain.IdentityAndAccess.UnitTests.csproj +++ b/tests/unit-tests/VolleyM.Domain.IdentityAndAccess.UnitTests/VolleyM.Domain.IdentityAndAccess.UnitTests.csproj @@ -12,18 +12,21 @@ - + - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectName.feature b/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectName.feature index 23b12f19f..43a117f39 100644 --- a/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectName.feature +++ b/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectName.feature @@ -2,7 +2,7 @@ In order to correct mistakes in the name or react to name changes I want VolleyM system to alow changing players name -@azurecloud @unit @api:512 +@unit @azurecloud @api:512 Scenario: Name corrected Given player exists | Id | Version | FirstName | LastName | @@ -16,7 +16,7 @@ Scenario: Name corrected | FirstName | LastName | | Jane | Doe | -@unit @api:512 @azurecloud +@unit @azurecloud @api:512 Scenario: PlayerNameCorrected event Given player exists | Id | Version | FirstName | LastName | diff --git a/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectNameSteps.cs b/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectNameSteps.cs index 68996464d..9ec47e408 100644 --- a/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectNameSteps.cs +++ b/tests/unit-tests/VolleyM.Domain.Players.UnitTests/Players/CorrectNameSteps.cs @@ -1,8 +1,5 @@ using System; using System.Threading.Tasks; -using FluentAssertions; -using FluentAssertions.Execution; -using Google.Protobuf.WellKnownTypes; using LanguageExt; using SimpleInjector; using TechTalk.SpecFlow; diff --git a/tests/unit-tests/VolleyM.Domain.Players.UnitTests/VolleyM.Domain.Players.UnitTests.csproj b/tests/unit-tests/VolleyM.Domain.Players.UnitTests/VolleyM.Domain.Players.UnitTests.csproj index 2345d5a77..0fcfa85f4 100644 --- a/tests/unit-tests/VolleyM.Domain.Players.UnitTests/VolleyM.Domain.Players.UnitTests.csproj +++ b/tests/unit-tests/VolleyM.Domain.Players.UnitTests/VolleyM.Domain.Players.UnitTests.csproj @@ -8,16 +8,16 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/DomainTestSetupBase.cs b/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/DomainTestSetupBase.cs index 98f18cece..273e5cc86 100644 --- a/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/DomainTestSetupBase.cs +++ b/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/DomainTestSetupBase.cs @@ -141,14 +141,14 @@ private TenantId GetFeatureTenantId() } [AfterScenario(Order = Constants.AFTER_SCENARIO_TEST_FRAMEWORK_ORDER)] - public void AfterEachScenario() + public async Task AfterEachScenario() { - BaseTestFixture.ScenarioTearDown(); + await BaseTestFixture.ScenarioTearDown(); Log.Warning("Scope is about to be disposed. Feature={FeatureTitle}, {ThreadId}; ", _featureContext.FeatureInfo.Title, Thread.CurrentThread.ManagedThreadId); - _scope.Dispose(); + await _scope.DisposeScopeAsync(); _scope = null; - Container.Dispose(); + await Container.DisposeContainerAsync(); Container = null; } diff --git a/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/VolleyM.Domain.UnitTests.Framework.csproj b/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/VolleyM.Domain.UnitTests.Framework.csproj index d730c9a0f..369d0b536 100644 --- a/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/VolleyM.Domain.UnitTests.Framework.csproj +++ b/tests/unit-tests/VolleyM.Domain.UnitTests.Framework/VolleyM.Domain.UnitTests.Framework.csproj @@ -10,11 +10,11 @@ - + - - - + + + diff --git a/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/Fixture/ContextA/EventA.cs b/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/Fixture/ContextA/EventA.cs index 0e3f0b686..c72637ea0 100644 --- a/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/Fixture/ContextA/EventA.cs +++ b/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/Fixture/ContextA/EventA.cs @@ -1,6 +1,4 @@ -using Gherkin.Events; - -namespace VolleyM.Infrastructure.EventBroker.UnitTests.Fixture.ContextA +namespace VolleyM.Infrastructure.EventBroker.UnitTests.Fixture.ContextA { public class EventA : EventBase { diff --git a/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/VolleyM.Infrastructure.EventBroker.UnitTests.csproj b/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/VolleyM.Infrastructure.EventBroker.UnitTests.csproj index 7b8bce19f..8b4ff62a9 100644 --- a/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/VolleyM.Infrastructure.EventBroker.UnitTests.csproj +++ b/tests/unit-tests/VolleyM.Infrastructure.EventBroker.UnitTests/VolleyM.Infrastructure.EventBroker.UnitTests.csproj @@ -8,18 +8,21 @@ - + - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tools/VolleyM.Tools.MigrationTool/VolleyM.Tools.MigrationTool.csproj b/tools/VolleyM.Tools.MigrationTool/VolleyM.Tools.MigrationTool.csproj index 4fed7f27c..3237a9720 100644 --- a/tools/VolleyM.Tools.MigrationTool/VolleyM.Tools.MigrationTool.csproj +++ b/tools/VolleyM.Tools.MigrationTool/VolleyM.Tools.MigrationTool.csproj @@ -13,12 +13,12 @@ - - + + - - - + + +