Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ utilise updated module availability in Chapter 4 #148

Merged
merged 6 commits into from
Jun 14, 2024
Merged

✨ utilise updated module availability in Chapter 4 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3c7480
feat: use configuration insted feature management
kamilbaczek Jun 11, 2024
26cbd99
fix: add configuration for main app
kamilbaczek Jun 11, 2024
ced7de8
Update chapter-4-package-workflow.yml
kamilbaczek Jun 11, 2024
f17dbba
Update chapter-4-contracts-workflow.yml
kamilbaczek Jun 11, 2024
447e68a
fix: app configuration for chapter 3
kamilbaczek Jun 11, 2024
1d43214
fix: downgrade unit test packages
kamilbaczek Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/chapter-4-contracts-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Add Evolutionary Architecture Nuget Source
uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@feature/nuget_config
uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ github.repository_owner }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/chapter-4-package-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ jobs:
dotnet pack Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj -c Release
dotnet pack Fitnet.Common.UnitTesting/Fitnet.Common.UnitTesting.csproj -c Release

- name: Prepare Packages
run: dotnet nuget add source --username $OWNER --password $GITHUB_TOKEN --store-password-in-clear-text --name github "https://nuget.pkg.github.com/$OWNER/index.json"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OWNER: ${{ github.repository_owner }}
- name: Add Evolutionary Architecture Nuget Source
uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ github.repository_owner }}
path: ${{ env.CHAPTER_DIR }}

- name: Publish Packages
run: |
Expand Down
15 changes: 10 additions & 5 deletions Chapter-3-microservice-extraction/Fitnet/Src/Fitnet/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
}
},
"AllowedHosts": "*",
"FeatureManagement": {
"Contracts": true,
"Offers": true,
"Passes": true,
"Reports": true
"Modules": {
"Passes": {
"Enabled": true
},
"Reports": {
"Enabled": true
},
"Offers": {
"Enabled": true
}
},
"ConnectionStrings": {
"Passes": "",
Expand Down
3 changes: 0 additions & 3 deletions .../Fitnet/Src/Offers/Tests/Fitnet.Offers.IntegrationTests/appsettings.IntegrationTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"Passes": {
"Enabled": false
},
"Contracts": {
"Enabled": false
},
"Reports": {
"Enabled": false
},
Expand Down
3 changes: 0 additions & 3 deletions .../Fitnet/Src/Passes/Tests/Fitnet.Passes.IntegrationTests/appsettings.IntegrationTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"Passes": {
"Enabled": true
},
"Contracts": {
"Enabled": false
},
"Reports": {
"Enabled": false
},
Expand Down
3 changes: 0 additions & 3 deletions ...itnet/Src/Reports/Tests/Fitnet.Reports.IntegrationTests/appsettings.IntegrationTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"Passes": {
"Enabled": true
},
"Contracts": {
"Enabled": false
},
"Reports": {
"Enabled": true
},
Expand Down
4 changes: 2 additions & 2 deletions ...Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/Fitnet.Contracts.Api.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<ItemGroup>
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.analyzers" Version="1.10.0">
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.analyzers" Version="1.11.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions ...ign/Fitnet.Contracts/Src/Fitnet.Contracts.Application/Fitnet.Contracts.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="ErrorOr" Version="2.0.1" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.2" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.6" />
<PackageReference Include="evolutionaryarchitecture.fitnet.contracts.integrationevents" Version="1.0.7" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="MassTransit.Abstractions" Version="8.2.2" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="MediatR" Version="12.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fitnet.Contracts.Core\Fitnet.Contracts.Core.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions ...tnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Fitnet.Contracts.Core.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<ItemGroup>
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.2" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.UnitTesting" Version="4.1.5" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.6" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.UnitTesting" Version="4.1.6" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.analyzers" Version="1.10.0">
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.analyzers" Version="1.14.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion ...ain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Fitnet.Contracts.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="ErrorOr" Version="2.0.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.2" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.6" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.DomainDrivenDesign.BuildingBlocks" Version="1.2.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...tnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Fitnet.Contracts.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="MassTransit" Version="8.2.2" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.2.2" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="MediatR" Version="12.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
Expand Down
2 changes: 1 addition & 1 deletion ...ontracts/Src/Fitnet.Contracts.IntegrationEvents/Fitnet.Contracts.IntegrationEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<Version>1.0.7</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Infrastructure" Version="4.1.2" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Infrastructure" Version="4.1.6" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ....Contracts/Src/Fitnet.Contracts.IntegrationTests/Fitnet.Contracts.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.2" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.integrationteststoolbox" Version="4.1.2" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.6" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.integrationteststoolbox" Version="4.1.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
</ItemGroup>

Expand Down
18 changes: 13 additions & 5 deletions .../Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationTests/appsettings.IntegrationTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
{
"FeatureManagement": {
"Contracts": true,
"Offers": false,
"Passes": false,
"Reports": false
"Modules": {
"Passes": {
"Enabled": false
},
"Contracts": {
"Enabled": true
},
"Reports": {
"Enabled": false
},
"Offers": {
"Enabled": false
}
}
}
2 changes: 1 addition & 1 deletion ...ctical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Fitnet.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.2" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.6" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion ...lying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Global using directives

global using JetBrains.Annotations;
global using Microsoft.FeatureManagement;
1 change: 0 additions & 1 deletion ...4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
builder.Services.AddSingleton(TimeProvider.System);
builder.Services.AddFeatureManagement();
builder.Services.AddClock();

builder.Services.AddContractsApi(builder.Configuration);
Expand Down
5 changes: 1 addition & 4 deletions ...ying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
}
},
"AllowedHosts": "*",
"FeatureManagement": {
"Contracts": true,
},
"ConnectionStrings": {
"Contracts": ""
},
Expand All @@ -17,4 +14,4 @@
"Username": "guest",
"Password": "guest"
}
}
}
2 changes: 1 addition & 1 deletion Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet/Fitnet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Global using directives

global using JetBrains.Annotations;
global using Microsoft.FeatureManagement;
3 changes: 1 addition & 2 deletions Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();

builder.Services.AddFeatureManagement();
builder.Services.AddClock();

builder.Services.AddPasses(builder.Configuration, Module.Passes);
builder.Services.AddOffers(builder.Configuration, Module.Offers);
builder.Services.AddReports(Module.Reports);
builder.Services.AddReports(builder.Configuration, Module.Reports);

var app = builder.Build();

Expand Down
15 changes: 10 additions & 5 deletions Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
}
},
"AllowedHosts": "*",
"FeatureManagement": {
"Contracts": true,
"Offers": true,
"Passes": true,
"Reports": true
"Modules": {
"Passes": {
"Enabled": true
},
"Reports": {
"Enabled": true
},
"Offers": {
"Enabled": true
}
},
"ConnectionStrings": {
"Passes": "",
Expand Down
2 changes: 1 addition & 1 deletion ...actical-domain-driven-design/Fitnet/Src/Offers/Fitnet.Offers.Api/Fitnet.Offers.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="evolutionaryarchitecture.fitnet.common.core" Version="4.1.1" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.core" Version="4.1.6" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions ...pplying-tactical-domain-driven-design/Fitnet/Src/Offers/Fitnet.Offers.Api/OffersModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
namespace EvolutionaryArchitecture.Fitnet.Offers.Api;

using Common.Infrastructure.Modules;
using DataAccess;
using Common.Infrastructure.Mediator;
using System.Reflection;
using Common.Infrastructure.Modules;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
Expand All @@ -12,7 +12,7 @@ public static class OffersModule
{
public static void RegisterOffers(this WebApplication app, string module)
{
if (!app.IsModuleEnabled(module))
if (!app.Configuration.IsModuleEnabled(module))
{
return;
}
Expand All @@ -23,7 +23,7 @@ public static void RegisterOffers(this WebApplication app, string module)
public static IServiceCollection AddOffers(this IServiceCollection services, IConfiguration configuration,
string module)
{
if (!services.IsModuleEnabled(module))
if (!configuration.IsModuleEnabled(module))
{
return services;
}
Expand Down
4 changes: 2 additions & 2 deletions ...-driven-design/Fitnet/Src/Offers/Fitnet.Offers.DataAccess/Fitnet.Offers.DataAccess.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...net/Src/Offers/Tests/Fitnet.Offers.IntegrationTests/Fitnet.Offers.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="evolutionaryarchitecture.fitnet.common.integrationteststoolbox" Version="4.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.integrationteststoolbox" Version="4.1.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 10 additions & 5 deletions .../Fitnet/Src/Offers/Tests/Fitnet.Offers.IntegrationTests/appsettings.IntegrationTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"FeatureManagement": {
"Contracts": false,
"Offers": true,
"Passes": false,
"Reports": false
"Modules": {
"Passes": {
"Enabled": false
},
"Reports": {
"Enabled": false
},
"Offers": {
"Enabled": true
}
}
}
10 changes: 5 additions & 5 deletions ...actical-domain-driven-design/Fitnet/Src/Passes/Fitnet.Passes.Api/Fitnet.Passes.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.6" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.6" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Contracts.IntegrationEvents" Version="1.0.7" />
<PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.1.3" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.1.3" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
<PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.2.2" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.2.2" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...pplying-tactical-domain-driven-design/Fitnet/Src/Passes/Fitnet.Passes.Api/PassesModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class PassesModule
{
public static void RegisterPasses(this WebApplication app, string module)
{
if (!app.IsModuleEnabled(module))
if (!app.Configuration.IsModuleEnabled(module))
{
return;
}
Expand All @@ -25,7 +25,7 @@ public static void RegisterPasses(this WebApplication app, string module)
public static IServiceCollection AddPasses(this IServiceCollection services, IConfiguration configuration,
string module)
{
if (!services.IsModuleEnabled(module))
if (!configuration.IsModuleEnabled(module))
{
return services;
}
Expand Down
6 changes: 3 additions & 3 deletions ...-driven-design/Fitnet/Src/Passes/Fitnet.Passes.DataAccess/Fitnet.Passes.DataAccess.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.1.3" />
<PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>
</Project>
Loading
Loading