From d1b13b69a3e0287a5505e8b059f59f30ff9a57c2 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Sun, 13 Jul 2025 23:28:34 +0100 Subject: [PATCH 1/8] Drop support for .NET 6 --- .../.idea/projectSettingsUpdater.xml | 1 + ...avaig.Extensions.Logging.Diagnostics.Tests.csproj | 12 ++++-------- ...avaig.Extensions.Logging.Diagnostics.XUnit.csproj | 5 +++-- .../readme.md | 1 + .../Stravaig.Extensions.Logging.Diagnostics.csproj | 11 ++++------- .../readme.md | 1 + 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml b/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml index a3dafd3..3e83363 100644 --- a/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml +++ b/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml @@ -2,6 +2,7 @@ \ No newline at end of file diff --git a/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj b/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj index c8c133e..cfb1629 100644 --- a/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj +++ b/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0;net9.0 + net8.0;net9.0 false 12 @@ -9,22 +9,18 @@ - + - - - - - - + + diff --git a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj index 5eae679..00f44de 100644 --- a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj +++ b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj @@ -2,7 +2,7 @@ $([System.DateTime]::Now.Year) - net6.0;net8.0;net9.0 + net8.0;net9.0 XUnit extensions for Stravaig Logging Capture for Tests $(STRAVAIG_NUGET_VERSION) Colin Angus Mackay @@ -18,7 +18,8 @@ XUnit extensions for Stravaig Logging Capture for Tests. Use version 2.x for .NET 6.0 onwards. - Use version 3.x for .NET 6.0, 8.0 & 9.0 onwards. + Use version 3.x for .NET 6.0, 8.0 & 9.0 onwards. + Use version 4.x for .NET 8.0 & 9.0 onwards. enable 12 diff --git a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md index 9c6b3e5..842a831 100644 --- a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md +++ b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md @@ -6,6 +6,7 @@ XUnit extensions for [Stravaig Log Capture](https://www.nuget.org/packages/Strav * v2.x: Supports .NET 6.0, 7.0 & 8.0 * v3.x: Supports .NET 6.0, 8.0 & 9.0 +* v4.x: Supports .NET 8.0 & 9.0 ## How to use diff --git a/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj b/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj index c354c4a..f7005e4 100644 --- a/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj +++ b/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj @@ -2,7 +2,7 @@ $([System.DateTime]::Now.Year) - net6.0;net8.0;net9.0 + net8.0;net9.0 Stravaig Logging Capture for Tests $(STRAVAIG_NUGET_VERSION) Colin Angus Mackay @@ -20,7 +20,8 @@ Use version 1.x for .NET prior to 6.0. Use version 2.x for .NET 6.0 onwards. - Use version 3.x for .NET 6.0, 8.0 & 9.0 onwards. + Use version 3.x for .NET 6.0, 8.0 & 9.0 onwards. + Use version 4.x for .NET 8.0 & 9.0 onwards. enable 13 @@ -46,16 +47,12 @@ - - - - - + diff --git a/src/Stravaig.Extensions.Logging.Diagnostics/readme.md b/src/Stravaig.Extensions.Logging.Diagnostics/readme.md index 556a8c7..79d9c64 100644 --- a/src/Stravaig.Extensions.Logging.Diagnostics/readme.md +++ b/src/Stravaig.Extensions.Logging.Diagnostics/readme.md @@ -7,6 +7,7 @@ Stravaig Log Capture is a way to capture the logs in a test and examine them to * v1.x: Supports .NET Core 3.1 & .NET 5 * v2.x: Supports .NET 6.0, 7.0 & 8.0 * v3.x: Supports .NET 6.0, 8.0 & 9.0 +* v4.x: Supports .NET 8.0 & 9.0 ## Why do I want to test my logs? From 85058553c17eb1d91e60074da0823b88db6534b3 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Sun, 13 Jul 2025 23:30:07 +0100 Subject: [PATCH 2/8] (#175) Update release notes --- release-notes/wip-release-notes.md | 13 +++---------- version.txt | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/release-notes/wip-release-notes.md b/release-notes/wip-release-notes.md index 07fba35..f55dadf 100644 --- a/release-notes/wip-release-notes.md +++ b/release-notes/wip-release-notes.md @@ -4,18 +4,11 @@ Date: ??? -### Bug Fixes - -### Features - ### Miscellaneous +- Drop support for .NET 6.0 + ### Dependencies -- All targets: -- .NET 6.0 targets: -- .NET 8.0 targets: - .NET 9.0 targets: - - - + - Bump Microsoft.Extensions.Logging.Abstractions to 9.0.7 diff --git a/version.txt b/version.txt index b0f2dcb..fcdb2e1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.0.4 +4.0.0 From d093f95606eb8b838180c1efc6b266461b6c0e31 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Sun, 13 Jul 2025 23:30:25 +0100 Subject: [PATCH 3/8] (#175) Update workflow --- .github/workflows/workflow.yml | 15 ++++++++------- Set-Version.ps1 | 5 ++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index bc0928a..dbe3a0e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,4 +1,4 @@ -name: Stravaig Test Capture Logger V3 +name: Stravaig Test Capture Logger V4 on: push: branches: @@ -46,13 +46,14 @@ jobs: echo "Package version: $STRAVAIG_PACKAGE_VERSION" echo "Version Suffix: $STRAVAIG_PACKAGE_VERSION_SUFFIX" echo "Stable Version: $STRAVAIG_STABLE_VERSION" + echo "Assembly Version: $STRAVAIG_ASSEMBLY_VERSION" echo "Preview Version: $STRAVAIG_PREVIEW_VERSION" + exho "Preview Assembly Version: $STRAVAIG_PREVIEW_ASSEMBLY_VERSION" - uses: actions/setup-dotnet@v4 - name: Setup .NET 6.0, 8.0 & 9.0 + name: Setup .NET 8.0 & 9.0 with: dotnet-version: | - 6.0.x 8.0.x 9.0.x @@ -62,14 +63,14 @@ jobs: - name: Package Preview Release run: | export STRAVAIG_NUGET_VERSION=$STRAVAIG_PREVIEW_VERSION - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION - name: Package Stable Release run: | export STRAVAIG_NUGET_VERSION=$STRAVAIG_STABLE_VERSION - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION - name: Archive Packages uses: actions/upload-artifact@v4 diff --git a/Set-Version.ps1 b/Set-Version.ps1 index 334cf63..e77219f 100644 --- a/Set-Version.ps1 +++ b/Set-Version.ps1 @@ -56,10 +56,13 @@ $suffix = "preview." $suffix += $runNumber.ToString(); $previewVersion = "$nextVersion-$suffix"; +$assemblyVersion = "$nextVersion.$runNumber" $envContent = "STRAVAIG_PACKAGE_VERSION=$nextVersion" + [System.Environment]::NewLine + "STRAVAIG_PACKAGE_VERSION_SUFFIX=$suffix" + [System.Environment]::NewLine + "STRAVAIG_STABLE_VERSION=$nextVersion" + [System.Environment]::NewLine + -"STRAVAIG_PREVIEW_VERSION=$previewVersion"; +"STRAVAIG_PREVIEW_VERSION=$previewVersion" + [System.Environment]::NewLine + +"STRAVAIG_PREVIEW_ASSEMBLY_VERSION=$assemblyVersion" + [System.Environment]::NewLine + +"STRAVAIG_ASSEMBLY_VERSION=$nextVersion" Write-Host $envContent; From 5f5187fb95277f1c29215e31d262291e6286dd67 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Sun, 13 Jul 2025 23:31:56 +0100 Subject: [PATCH 4/8] (#175) Fix typo in workflow --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index dbe3a0e..36b8ee8 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -48,7 +48,7 @@ jobs: echo "Stable Version: $STRAVAIG_STABLE_VERSION" echo "Assembly Version: $STRAVAIG_ASSEMBLY_VERSION" echo "Preview Version: $STRAVAIG_PREVIEW_VERSION" - exho "Preview Assembly Version: $STRAVAIG_PREVIEW_ASSEMBLY_VERSION" + echo "Preview Assembly Version: $STRAVAIG_PREVIEW_ASSEMBLY_VERSION" - uses: actions/setup-dotnet@v4 name: Setup .NET 8.0 & 9.0 From bbb6252f8e7d03fedfaeb02b9a751be97bb285c8 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Mon, 14 Jul 2025 21:01:29 +0100 Subject: [PATCH 5/8] (#175) Fix version args on pack command --- .github/workflows/workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 36b8ee8..e8d80ae 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -63,14 +63,14 @@ jobs: - name: Package Preview Release run: | export STRAVAIG_NUGET_VERSION=$STRAVAIG_PREVIEW_VERSION - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION - name: Package Stable Release run: | export STRAVAIG_NUGET_VERSION=$STRAVAIG_STABLE_VERSION - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION - dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:Version=$STRAVAIG_ASSEMBLY_VERSION /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION + dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION - name: Archive Packages uses: actions/upload-artifact@v4 From e3e8278b0183c4513c0a3a7892988f9a6eb7f564 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Mon, 14 Jul 2025 21:09:10 +0100 Subject: [PATCH 6/8] (#175) Update repo read me file --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6c99426..c4ac1c5 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ A logger for use in tests so that the messages logged can be examined in tests. * v1.x supports .NET Core 3.1 and .NET 5.0 * v2.x supports .NET 6.0, 7.0 and 8.0 * v3.x supports .NET 6.0, 8.0 & 9.0 +* v4.x supports .NET 8.0 & 9.0 ## Why test logs? From 1fb767cdf442abd877d7b34892b44a6720668801 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Mon, 14 Jul 2025 21:11:01 +0100 Subject: [PATCH 7/8] (#175) Update documentation version numbers --- docs/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/index.md b/docs/index.md index 37db9b7..8e57736 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,6 +57,8 @@ v2.x supports: .NET 6.0, 7.0 and 8.0 v3.x supports: .NET 6.0, 8.0 & 9.0 +v4.x supports: .NET 8.0 & 9.0 + ## Other Stuff * [Contributors](contributors.md) From 33dec5d9189a260e20779b6b8d21db34ce781484 Mon Sep 17 00:00:00 2001 From: Colin Mackay Date: Mon, 14 Jul 2025 21:15:06 +0100 Subject: [PATCH 8/8] (#175) Dump env in workflow --- .github/workflows/workflow.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index e8d80ae..7bedc99 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -42,13 +42,7 @@ jobs: run: ./Set-Version.ps1 - name: Display workflow state - run: | - echo "Package version: $STRAVAIG_PACKAGE_VERSION" - echo "Version Suffix: $STRAVAIG_PACKAGE_VERSION_SUFFIX" - echo "Stable Version: $STRAVAIG_STABLE_VERSION" - echo "Assembly Version: $STRAVAIG_ASSEMBLY_VERSION" - echo "Preview Version: $STRAVAIG_PREVIEW_VERSION" - echo "Preview Assembly Version: $STRAVAIG_PREVIEW_ASSEMBLY_VERSION" + run: env | sort - uses: actions/setup-dotnet@v4 name: Setup .NET 8.0 & 9.0