diff --git a/.github/workflows/chapter-4-package-workflow.yml b/.github/workflows/chapter-4-package-workflow.yml index 2b1a661c..4feaed25 100644 --- a/.github/workflows/chapter-4-package-workflow.yml +++ b/.github/workflows/chapter-4-package-workflow.yml @@ -13,7 +13,7 @@ on: env: CHAPTER_DIR: "Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common" - NUGET_SOURCE_NAME: "evolutionaryArchitecture" + NUGET_SOURCE_NAME: "EvolutionaryArchitecture" jobs: build: @@ -27,7 +27,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: dotnet restore - name: Build @@ -45,7 +45,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: dotnet restore - name: Test @@ -64,7 +64,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Pack Projects run: | @@ -74,13 +74,14 @@ jobs: dotnet pack Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj -c Release dotnet pack Fitnet.Common.UnitTesting/Fitnet.Common.UnitTesting.csproj -c Release - - 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 }} - nuget-source-name: ${{ env.NUGET_SOURCE_NAME }} + - name: Authenticate to GitHub Packages + run: | + dotnet nuget add source \ + https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json \ + --name ${{ env.NUGET_SOURCE_NAME }} \ + --username ${{ github.actor }} \ + --password ${{ secrets.GITHUB_TOKEN }} \ + --store-password-in-clear-text - name: Publish Packages run: | diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Build.props b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Build.props index 4e4b16a0..d2b7b621 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Build.props +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Build.props @@ -3,7 +3,7 @@ EvolutionaryArchitecture.$(MSBuildProjectName) $(AssemblyName) - net9.0 + net10.0 latest true true @@ -12,7 +12,7 @@ true true https://github.com/evolutionary-architecture/evolutionary-architecture-by-example - 4.1.7 + 4.2.0 diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Packages.props b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Packages.props new file mode 100644 index 00000000..a04ce0a7 --- /dev/null +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Directory.Packages.props @@ -0,0 +1,35 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api.UnitTests/Fitnet.Common.Api.UnitTests.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api.UnitTests/Fitnet.Common.Api.UnitTests.csproj index ef476753..ede13f6b 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api.UnitTests/Fitnet.Common.Api.UnitTests.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api.UnitTests/Fitnet.Common.Api.UnitTests.csproj @@ -9,11 +9,10 @@ - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api/Fitnet.Common.Api.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api/Fitnet.Common.Api.csproj index 4bd6eaa4..c4954177 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api/Fitnet.Common.Api.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Api/Fitnet.Common.Api.csproj @@ -1,11 +1,11 @@ - + - + @@ -13,11 +13,8 @@ - - - - - + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core.UnitTests/Fitnet.Common.Core.UnitTests.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core.UnitTests/Fitnet.Common.Core.UnitTests.csproj index 741a9654..65b5be10 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core.UnitTests/Fitnet.Common.Core.UnitTests.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core.UnitTests/Fitnet.Common.Core.UnitTests.csproj @@ -10,10 +10,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/Fitnet.Common.Core.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/Fitnet.Common.Core.csproj index e70f667e..2c00e36f 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/Fitnet.Common.Core.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/Fitnet.Common.Core.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/ValueObject.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/ValueObject.cs index 0a494757..fa4779a8 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/ValueObject.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Core/ValueObject.cs @@ -1,6 +1,8 @@ namespace EvolutionaryArchitecture.Fitnet.Common.Core; +#pragma warning disable S4035 public abstract class ValueObject : IEquatable +#pragma warning restore S4035 { protected abstract IEnumerable GetEqualityComponents(); diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Infrastructure/Fitnet.Common.Infrastructure.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Infrastructure/Fitnet.Common.Infrastructure.csproj index 692cfa1a..2331b97b 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Infrastructure/Fitnet.Common.Infrastructure.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.Infrastructure/Fitnet.Common.Infrastructure.csproj @@ -1,11 +1,10 @@ - - - - - - - + + + + + + \ No newline at end of file diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj index 5bf5e790..72e7a5fe 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj @@ -5,22 +5,22 @@ - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/TestEngine/EventBus/EventBusAssertions.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/TestEngine/EventBus/EventBusAssertions.cs index ce745deb..dbc068e9 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/TestEngine/EventBus/EventBusAssertions.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/TestEngine/EventBus/EventBusAssertions.cs @@ -1,10 +1,10 @@ namespace EvolutionaryArchitecture.Fitnet.Common.IntegrationTestsToolbox.TestEngine.EventBus; -using FluentAssertions; using MassTransit.Testing; +using Shouldly; public static class EventBusAssertions { public static void EnsureConsumed(this ITestHarness harness) where TEvent : class => - harness.Consumed.Select().Any().Should().BeTrue(); + harness.Consumed.Select().Any().ShouldBeTrue(); } diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.UnitTesting/Fitnet.Common.UnitTesting.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.UnitTesting/Fitnet.Common.UnitTesting.csproj index 4e9d7e7e..e2799789 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.UnitTesting/Fitnet.Common.UnitTesting.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.UnitTesting/Fitnet.Common.UnitTesting.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.sln b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.sln deleted file mode 100644 index 16c9a76c..00000000 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.sln +++ /dev/null @@ -1,52 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.Api", "Fitnet.Common.Api\Fitnet.Common.Api.csproj", "{28EC553D-3AE3-4913-9F84-AD8346DC41A1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.Api.UnitTests", "Fitnet.Common.Api.UnitTests\Fitnet.Common.Api.UnitTests.csproj", "{9F511573-672B-40D9-AB9D-C5DBE1AF9F9F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.Core", "Fitnet.Common.Core\Fitnet.Common.Core.csproj", "{D0618CB2-2A6C-4FB0-AA88-9CAB026987AC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.Core.UnitTests", "Fitnet.Common.Core.UnitTests\Fitnet.Common.Core.UnitTests.csproj", "{375BE0BF-11A2-49E1-87F5-A51842EF06D8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.Infrastructure", "Fitnet.Common.Infrastructure\Fitnet.Common.Infrastructure.csproj", "{8110B4CE-52EC-4830-B7CB-15FE8629774E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.IntegrationTestsToolbox", "Fitnet.Common.IntegrationTestsToolbox\Fitnet.Common.IntegrationTestsToolbox.csproj", "{7730CC34-33C2-404B-A22E-E188FB1D8388}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Common.UnitTesting", "Fitnet.Common.UnitTesting\Fitnet.Common.UnitTesting.csproj", "{885FE937-0E7E-47B7-8160-7C9CE605562F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {28EC553D-3AE3-4913-9F84-AD8346DC41A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28EC553D-3AE3-4913-9F84-AD8346DC41A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28EC553D-3AE3-4913-9F84-AD8346DC41A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28EC553D-3AE3-4913-9F84-AD8346DC41A1}.Release|Any CPU.Build.0 = Release|Any CPU - {9F511573-672B-40D9-AB9D-C5DBE1AF9F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F511573-672B-40D9-AB9D-C5DBE1AF9F9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F511573-672B-40D9-AB9D-C5DBE1AF9F9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F511573-672B-40D9-AB9D-C5DBE1AF9F9F}.Release|Any CPU.Build.0 = Release|Any CPU - {D0618CB2-2A6C-4FB0-AA88-9CAB026987AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0618CB2-2A6C-4FB0-AA88-9CAB026987AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0618CB2-2A6C-4FB0-AA88-9CAB026987AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0618CB2-2A6C-4FB0-AA88-9CAB026987AC}.Release|Any CPU.Build.0 = Release|Any CPU - {375BE0BF-11A2-49E1-87F5-A51842EF06D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {375BE0BF-11A2-49E1-87F5-A51842EF06D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {375BE0BF-11A2-49E1-87F5-A51842EF06D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {375BE0BF-11A2-49E1-87F5-A51842EF06D8}.Release|Any CPU.Build.0 = Release|Any CPU - {8110B4CE-52EC-4830-B7CB-15FE8629774E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8110B4CE-52EC-4830-B7CB-15FE8629774E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8110B4CE-52EC-4830-B7CB-15FE8629774E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8110B4CE-52EC-4830-B7CB-15FE8629774E}.Release|Any CPU.Build.0 = Release|Any CPU - {7730CC34-33C2-404B-A22E-E188FB1D8388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7730CC34-33C2-404B-A22E-E188FB1D8388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7730CC34-33C2-404B-A22E-E188FB1D8388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7730CC34-33C2-404B-A22E-E188FB1D8388}.Release|Any CPU.Build.0 = Release|Any CPU - {885FE937-0E7E-47B7-8160-7C9CE605562F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {885FE937-0E7E-47B7-8160-7C9CE605562F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {885FE937-0E7E-47B7-8160-7C9CE605562F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {885FE937-0E7E-47B7-8160-7C9CE605562F}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.slnx b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.slnx new file mode 100644 index 00000000..ad52459c --- /dev/null +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Common/Fitnet.Common.slnx @@ -0,0 +1,9 @@ + + + + + + + + +