From 296a4d5dc3bba745f3afdc0ae193ba6902dce70c Mon Sep 17 00:00:00 2001 From: George Date: Sat, 25 Jul 2026 15:36:04 +0200 Subject: [PATCH] Fix solution package smoke isolation --- TinyEvents.sln | 15 --------------- samples/README.md | 10 +++++++++- samples/TinyEvents.PackageSmoke/README.md | 10 +++++++--- .../Test-PackageSmoke.ps1 | 2 +- 4 files changed, 17 insertions(+), 20 deletions(-) rename {scripts => samples/TinyEvents.PackageSmoke}/Test-PackageSmoke.ps1 (98%) diff --git a/TinyEvents.sln b/TinyEvents.sln index a2202d5..bd81d48 100644 --- a/TinyEvents.sln +++ b/TinyEvents.sln @@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyEvents.Sample.AdoNet", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyEvents.Sample.EfCore", "samples\TinyEvents.Sample.EfCore\TinyEvents.Sample.EfCore.csproj", "{D602F870-F917-4D71-9841-E3F2088CE67C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyEvents.PackageSmoke", "samples\TinyEvents.PackageSmoke\TinyEvents.PackageSmoke.csproj", "{F32341BD-DA7B-4143-91B1-88F78659FF24}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyEvents.PostgreSql.AdoNet", "src\TinyEvents.PostgreSql.AdoNet\TinyEvents.PostgreSql.AdoNet.csproj", "{85D02657-2329-4B56-A4D6-BE10D9C4053D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyEvents.PostgreSql.EntityFrameworkCore", "src\TinyEvents.PostgreSql.EntityFrameworkCore\TinyEvents.PostgreSql.EntityFrameworkCore.csproj", "{BE429123-7A4B-475F-B8CC-263B799C85FD}" @@ -217,18 +215,6 @@ Global {D602F870-F917-4D71-9841-E3F2088CE67C}.Release|x64.Build.0 = Release|Any CPU {D602F870-F917-4D71-9841-E3F2088CE67C}.Release|x86.ActiveCfg = Release|Any CPU {D602F870-F917-4D71-9841-E3F2088CE67C}.Release|x86.Build.0 = Release|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Debug|x64.ActiveCfg = Debug|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Debug|x64.Build.0 = Debug|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Debug|x86.ActiveCfg = Debug|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Debug|x86.Build.0 = Debug|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Release|Any CPU.Build.0 = Release|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Release|x64.ActiveCfg = Release|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Release|x64.Build.0 = Release|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Release|x86.ActiveCfg = Release|Any CPU - {F32341BD-DA7B-4143-91B1-88F78659FF24}.Release|x86.Build.0 = Release|Any CPU {85D02657-2329-4B56-A4D6-BE10D9C4053D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85D02657-2329-4B56-A4D6-BE10D9C4053D}.Debug|Any CPU.Build.0 = Debug|Any CPU {85D02657-2329-4B56-A4D6-BE10D9C4053D}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -331,7 +317,6 @@ Global {3E943682-24D1-4995-BF59-700B53BE7B52} = {0AB3BF05-4346-4AA6-1389-037BE0695223} {1C66EB46-7588-408D-8D3A-6F4444C0F275} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA} {D602F870-F917-4D71-9841-E3F2088CE67C} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA} - {F32341BD-DA7B-4143-91B1-88F78659FF24} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA} {85D02657-2329-4B56-A4D6-BE10D9C4053D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} {BE429123-7A4B-475F-B8CC-263B799C85FD} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} {A8EF6D4A-A8F0-412D-823B-BEFB93E32BB9} = {0AB3BF05-4346-4AA6-1389-037BE0695223} diff --git a/samples/README.md b/samples/README.md index bacc470..ba2a0e3 100644 --- a/samples/README.md +++ b/samples/README.md @@ -100,7 +100,15 @@ Invoke-RestMethod -Method Get -Uri http://localhost:5000/welcome-emails ## Package Smoke Sample -`TinyEvents.PackageSmoke` references the public NuGet packages instead of local project references. Use it after publishing packages: +`TinyEvents.PackageSmoke` references NuGet packages instead of local project +references and is intentionally excluded from `TinyEvents.sln`. Validate locally +packed packages with: + +```powershell +.\samples\TinyEvents.PackageSmoke\Test-PackageSmoke.ps1 +``` + +Use it against published packages with: ```bash docker compose -f samples/TinyEvents.PackageSmoke/docker-compose.yml up -d diff --git a/samples/TinyEvents.PackageSmoke/README.md b/samples/TinyEvents.PackageSmoke/README.md index 142b411..043e0b4 100644 --- a/samples/TinyEvents.PackageSmoke/README.md +++ b/samples/TinyEvents.PackageSmoke/README.md @@ -1,11 +1,15 @@ # TinyEvents Package Smoke +This project is intentionally not part of `TinyEvents.sln`. It consumes the +locally packed NuGet packages, so including it would make a normal solution +restore depend on packages that have not been built yet. + ## Local Package Build Smoke Run this sample against locally packed packages without touching a database: ```powershell -.\scripts\Test-PackageSmoke.ps1 +.\samples\TinyEvents.PackageSmoke\Test-PackageSmoke.ps1 ``` That command builds the solution, packs the complete TinyEvents release train with a unique local version, restores this sample from those local packages, and builds the sample. @@ -15,13 +19,13 @@ That command builds the solution, packs the complete TinyEvents release train wi To start the sample SQL Server and PostgreSQL containers and run the database smoke paths: ```powershell -.\scripts\Test-PackageSmoke.ps1 -StartDatabases -Run +.\samples\TinyEvents.PackageSmoke\Test-PackageSmoke.ps1 -StartDatabases -Run ``` To run against already-started databases, omit `-StartDatabases`: ```powershell -.\scripts\Test-PackageSmoke.ps1 -Run +.\samples\TinyEvents.PackageSmoke\Test-PackageSmoke.ps1 -Run ``` `-Run` uses the default SQL Server port `14334` and PostgreSQL port `54324` unless the environment variables below override them. diff --git a/scripts/Test-PackageSmoke.ps1 b/samples/TinyEvents.PackageSmoke/Test-PackageSmoke.ps1 similarity index 98% rename from scripts/Test-PackageSmoke.ps1 rename to samples/TinyEvents.PackageSmoke/Test-PackageSmoke.ps1 index c999d45..2af689d 100644 --- a/scripts/Test-PackageSmoke.ps1 +++ b/samples/TinyEvents.PackageSmoke/Test-PackageSmoke.ps1 @@ -19,7 +19,7 @@ function Invoke-Native { } } -$repoRoot = Resolve-Path (Join-Path $PSScriptRoot "..") +$repoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") $solution = Join-Path $repoRoot "TinyEvents.sln" $sampleProject = Join-Path $repoRoot "samples\TinyEvents.PackageSmoke\TinyEvents.PackageSmoke.csproj" $composeFile = Join-Path $repoRoot "samples\TinyEvents.PackageSmoke\docker-compose.yml"