Skip to content

Commit

Permalink
refactor: ⬆ Upgraded dependencies (#789)
Browse files Browse the repository at this point in the history
* refactor: ⬆️ 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
  • Loading branch information
sdiachen authored Nov 14, 2021
1 parent 411575a commit 2ec29d6
Show file tree
Hide file tree
Showing 23 changed files with 110 additions and 67 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": 21,
"mode": ["schedule"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": 21,
"mode": ["standings","pivot"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": 20,
"mode": ["schedule"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": 20,
"mode": ["standings","pivot"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": 22,
"mode": ["schedule"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": 22,
"mode": ["standings","pivot"]
}
14 changes: 13 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -154,6 +162,8 @@ stages:
jobs:
- job: azure_storage_migrations
displayName: Run Azure Storage Migrations
pool:
vmImage: 'ubuntu-latest'
steps:
- download: current
artifact: azureStorageMigration
Expand All @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions src/Client/VolleyM.API/VolleyM.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@

<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
<PackageReference Include="Esquio" Version="5.0.5" />
<PackageReference Include="Esquio.AspNetCore" Version="5.0.5" />
<PackageReference Include="Esquio.Configuration.Store" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.4.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
<PackageReference Include="SimpleInjector" Version="5.3.1" />
<PackageReference Include="SimpleInjector" Version="5.3.2" />
<PackageReference Include="SimpleInjector.Integration.AspNetCore" Version="5.3.0" />
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc.Core" Version="5.3.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
<PackageReference Include="FluentValidation" Version="10.2.3" />
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
<PackageReference Include="FluentValidation" Version="10.3.4" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
<PackageReference Include="SimpleInjector" Version="5.3.1" />
<PackageReference Include="System.Composition" Version="5.0.1" />
<PackageReference Include="System.Composition.Hosting" Version="5.0.1" />
<PackageReference Include="SimpleInjector" Version="5.3.2" />
<PackageReference Include="System.Composition" Version="6.0.0" />
<PackageReference Include="System.Composition.Hosting" Version="6.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="SimpleInjector" Version="5.3.1" />
<PackageReference Include="SimpleInjector" Version="5.3.2" />
<PackageReference Include="SimpleInjector.Integration.AspNetCore" Version="5.3.0" />
<PackageReference Include="Microsoft.Build" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NetArchTest.Rules" Version="1.3.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.14" />
<PackageReference Include="SpecFlow" Version="3.8.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.8.14" />
<PackageReference Include="SpecFlow.xUnit" Version="3.8.14" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SpecFlow" Version="3.9.40" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.14" />
<PackageReference Include="SpecFlow" Version="3.8.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.8.14" />
<PackageReference Include="SpecFlow.xUnit" Version="3.8.14" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SpecFlow" Version="3.9.40" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,21 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.14" />
<PackageReference Include="SpecFlow" Version="3.8.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.8.14" />
<PackageReference Include="SpecFlow.xUnit" Version="3.8.14" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SpecFlow" Version="3.9.40" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

<ItemGroup>
<PackageReference Include="Bogus" Version="33.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="SpecFlow" Version="3.8.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.8.14" />
<PackageReference Include="SpecFlow.xUnit" Version="3.8.14" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="SpecFlow" Version="3.9.40" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="SimpleInjector" Version="5.3.1" />
<PackageReference Include="SpecFlow" Version="3.8.14" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="SimpleInjector" Version="5.3.2" />
<PackageReference Include="SpecFlow" Version="3.9.40" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.14" />
<PackageReference Include="SpecFlow" Version="3.8.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.8.14" />
<PackageReference Include="SpecFlow.xUnit" Version="3.8.14" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SpecFlow" Version="3.9.40" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit 2ec29d6

Please sign in to comment.