From 9be94d7c96648cc0e3c899a15eba2b7668cd94c2 Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Mon, 16 Sep 2024 00:52:44 +0200 Subject: [PATCH 1/5] :green_heart: moved codecov.yml --- {.codecov => .github}/codecov.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.codecov => .github}/codecov.yml (100%) diff --git a/.codecov/codecov.yml b/.github/codecov.yml similarity index 100% rename from .codecov/codecov.yml rename to .github/codecov.yml From 1e628d431965bb7c4cd2d51f576ee6b24523c35e Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Mon, 16 Sep 2024 01:03:36 +0200 Subject: [PATCH 2/5] :speech_balloon: changelog, releasenotes and readme --- .../PackageReleaseNotes.txt | 9 ++++++++- .../PackageReleaseNotes.txt | 9 ++++++++- .../PackageReleaseNotes.txt | 9 ++++++++- .nuget/Codebelt.Extensions.Xunit/PackageReleaseNotes.txt | 9 ++++++++- CHANGELOG.md | 4 ++++ README.md | 2 +- 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/.nuget/Codebelt.Extensions.Xunit.App/PackageReleaseNotes.txt b/.nuget/Codebelt.Extensions.Xunit.App/PackageReleaseNotes.txt index 7adc578..e486582 100644 --- a/.nuget/Codebelt.Extensions.Xunit.App/PackageReleaseNotes.txt +++ b/.nuget/Codebelt.Extensions.Xunit.App/PackageReleaseNotes.txt @@ -1,4 +1,11 @@ -Version 8.4.0 +Version 9.0.0 +Availability: .NET 9 and .NET 8 +  +# ALM +- CHANGED Dependencies to latest and greatest with respect to TFMs +- REMOVED Support for TFM .NET 6 (LTS) +  +Version 8.4.0 Availability: .NET 8 and .NET 6   # ALM diff --git a/.nuget/Codebelt.Extensions.Xunit.Hosting.AspNetCore/PackageReleaseNotes.txt b/.nuget/Codebelt.Extensions.Xunit.Hosting.AspNetCore/PackageReleaseNotes.txt index 0b593a4..010b1d2 100644 --- a/.nuget/Codebelt.Extensions.Xunit.Hosting.AspNetCore/PackageReleaseNotes.txt +++ b/.nuget/Codebelt.Extensions.Xunit.Hosting.AspNetCore/PackageReleaseNotes.txt @@ -1,4 +1,11 @@ -Version 8.4.0 +Version 9.0.0 +Availability: .NET 9 and .NET 8 +  +# ALM +- CHANGED Dependencies to latest and greatest with respect to TFMs +- REMOVED Support for TFM .NET 6 (LTS) +  +Version 8.4.0 Availability: .NET 8 and .NET 6   # ALM diff --git a/.nuget/Codebelt.Extensions.Xunit.Hosting/PackageReleaseNotes.txt b/.nuget/Codebelt.Extensions.Xunit.Hosting/PackageReleaseNotes.txt index 444b1bf..c016419 100644 --- a/.nuget/Codebelt.Extensions.Xunit.Hosting/PackageReleaseNotes.txt +++ b/.nuget/Codebelt.Extensions.Xunit.Hosting/PackageReleaseNotes.txt @@ -1,4 +1,11 @@ -Version 8.4.0 +Version 9.0.0 +Availability: .NET 9, .NET 8 and .NET Standard 2.0 +  +# ALM +- CHANGED Dependencies to latest and greatest with respect to TFMs +- REMOVED Support for TFM .NET 6 (LTS) +  +Version 8.4.0 Availability: .NET 8, .NET 6 and .NET Standard 2.0   # ALM diff --git a/.nuget/Codebelt.Extensions.Xunit/PackageReleaseNotes.txt b/.nuget/Codebelt.Extensions.Xunit/PackageReleaseNotes.txt index 723b86d..ed3e7c6 100644 --- a/.nuget/Codebelt.Extensions.Xunit/PackageReleaseNotes.txt +++ b/.nuget/Codebelt.Extensions.Xunit/PackageReleaseNotes.txt @@ -1,4 +1,11 @@ -Version 8.4.0 +Version 9.0.0 +Availability: .NET 9, .NET 8 and .NET Standard 2.0 +  +# ALM +- CHANGED Dependencies to latest and greatest with respect to TFMs +- REMOVED Support for TFM .NET 6 (LTS) +  +Version 8.4.0 Availability: .NET 8, .NET 6 and .NET Standard 2.0   # ALM diff --git a/CHANGELOG.md b/CHANGELOG.md index f5986ed..f30a27b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ For more details, please refer to `PackageReleaseNotes.txt` on a per assembly ba > [!NOTE] > Changelog entries prior to version 8.4.0 was migrated from previous versions of Cuemon.Extensions.Xunit, Cuemon.Extensions.Xunit.Hosting, and Cuemon.Extensions.Xunit.Hosting.AspNetCore. +## [9.0.0] - TBD + +This major release is first and foremost focused on ironing out any wrinkles that have been introduced with .NET 9 preview releases so the final release is production ready together with the official launch from Microsoft. + ## [8.4.0] - 2024-09-15 ### Added diff --git a/README.md b/README.md index 5510b74..34a0341 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Provides a focused API for unit-testing specific types of .NET projects. Provides a convenient set of default API additions for unit-testing various types of .NET projects. -### Contributing to Extensions for xUnit API by Codebelt +### Contributing to `Extensions for xUnit API by Codebelt` Contributions are welcome! Feel free to submit issues, feature requests, or pull requests to help improve this library. From f166a73180c6065324fe7960638a75c2711b19fd Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Mon, 16 Sep 2024 01:04:11 +0200 Subject: [PATCH 3/5] :construction_worker: opt-in for .net9; opt-out for .net6 --- .github/workflows/pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipelines.yml b/.github/workflows/pipelines.yml index ba795fc..c91c217 100644 --- a/.github/workflows/pipelines.yml +++ b/.github/workflows/pipelines.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: configuration: [Debug, Release] - framework: [net8.0, net6.0, netstandard2.0] + framework: [net9.0,net8.0,netstandard2.0] outputs: version: ${{ steps.minver-calculate.outputs.version }} steps: From 5d7646bbccf272f8dacbe747c929a8d1834a9249 Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Mon, 16 Sep 2024 01:04:30 +0200 Subject: [PATCH 4/5] :arrow_up: opt-in for .net9; opt-out for .net6 --- Directory.Build.props | 8 ++++---- .../Codebelt.Extensions.Xunit.App.csproj | 2 +- .../AspNetCoreHostFixture.cs | 3 ++- ...lt.Extensions.Xunit.Hosting.AspNetCore.csproj | 14 +++++++------- .../Codebelt.Extensions.Xunit.Hosting.csproj | 16 ++++++++-------- .../HostFixture.cs | 3 ++- .../Codebelt.Extensions.Xunit.csproj | 2 +- ...ensions.Xunit.Hosting.AspNetCore.Tests.csproj | 6 +++--- testenvironments.json | 2 +- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 80704a5..c5737fe 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,7 +15,7 @@ - net8.0;net6.0;netstandard2.0 + net9.0;net8.0;netstandard2.0 Copyright © Geekle 2024. All rights reserved. gimlichael Geekle @@ -38,7 +38,7 @@ - + @@ -49,11 +49,11 @@ - net8.0;net6.0 + net9.0;net8.0 - net8.0;net6.0;net48 + net9.0;net8.0;net48 diff --git a/src/Codebelt.Extensions.Xunit.App/Codebelt.Extensions.Xunit.App.csproj b/src/Codebelt.Extensions.Xunit.App/Codebelt.Extensions.Xunit.App.csproj index b2172b2..f09b6e9 100644 --- a/src/Codebelt.Extensions.Xunit.App/Codebelt.Extensions.Xunit.App.csproj +++ b/src/Codebelt.Extensions.Xunit.App/Codebelt.Extensions.Xunit.App.csproj @@ -1,7 +1,7 @@  - net8.0;net6.0 + net9.0;net8.0 250bdf91-e7c7-4cb4-a39d-e1a5374c5602 diff --git a/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/AspNetCoreHostFixture.cs b/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/AspNetCoreHostFixture.cs index a795ed3..2f21154 100644 --- a/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/AspNetCoreHostFixture.cs +++ b/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/AspNetCoreHostFixture.cs @@ -2,6 +2,7 @@ using System.IO; using System.Threading.Tasks; using Cuemon; +using Cuemon.Collections.Generic; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.StaticWebAssets; @@ -40,7 +41,7 @@ public AspNetCoreHostFixture() public override void ConfigureHost(Test hostTest) { Validator.ThrowIfNull(hostTest); - Validator.ThrowIfNotContainsType(hostTest, nameof(hostTest), $"{nameof(hostTest)} is not assignable from AspNetCoreHostTest.", typeof(AspNetCoreHostTest<>)); + Validator.ThrowIfNotContainsType(hostTest, Arguments.ToArrayOf(typeof(AspNetCoreHostTest<>)), $"{nameof(hostTest)} is not assignable from AspNetCoreHostTest."); var hb = new HostBuilder() .ConfigureWebHost(webBuilder => diff --git a/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/Codebelt.Extensions.Xunit.Hosting.AspNetCore.csproj b/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/Codebelt.Extensions.Xunit.Hosting.AspNetCore.csproj index 90cabaa..0d39be5 100644 --- a/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/Codebelt.Extensions.Xunit.Hosting.AspNetCore.csproj +++ b/src/Codebelt.Extensions.Xunit.Hosting.AspNetCore/Codebelt.Extensions.Xunit.Hosting.AspNetCore.csproj @@ -1,7 +1,7 @@  - net8.0;net6.0 + net9.0;net8.0 200bdf91-e7c7-4cb4-a39d-e1a5374c5602 false @@ -15,17 +15,17 @@ - - + + - - + + - - + + diff --git a/src/Codebelt.Extensions.Xunit.Hosting/Codebelt.Extensions.Xunit.Hosting.csproj b/src/Codebelt.Extensions.Xunit.Hosting/Codebelt.Extensions.Xunit.Hosting.csproj index bcf6cdc..0b2eb40 100644 --- a/src/Codebelt.Extensions.Xunit.Hosting/Codebelt.Extensions.Xunit.Hosting.csproj +++ b/src/Codebelt.Extensions.Xunit.Hosting/Codebelt.Extensions.Xunit.Hosting.csproj @@ -10,6 +10,14 @@ host-test class-fixture host-fixture microsoft dependency injection host configuration hosting-environment service-provider configure-services + + + + + + + + @@ -18,14 +26,6 @@ - - - - - - - - diff --git a/src/Codebelt.Extensions.Xunit.Hosting/HostFixture.cs b/src/Codebelt.Extensions.Xunit.Hosting/HostFixture.cs index eea8ff8..efba269 100644 --- a/src/Codebelt.Extensions.Xunit.Hosting/HostFixture.cs +++ b/src/Codebelt.Extensions.Xunit.Hosting/HostFixture.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Cuemon; +using Cuemon.Collections.Generic; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -35,7 +36,7 @@ public HostFixture() public virtual void ConfigureHost(Test hostTest) { Validator.ThrowIfNull(hostTest); - Validator.ThrowIfNotContainsType(hostTest, nameof(hostTest), $"{nameof(hostTest)} is not assignable from HostTest.", typeof(HostTest<>)); + Validator.ThrowIfNotContainsType(hostTest, Arguments.ToArrayOf(typeof(HostTest<>)), $"{nameof(hostTest)} is not assignable from HostTest."); var hb = new HostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) diff --git a/src/Codebelt.Extensions.Xunit/Codebelt.Extensions.Xunit.csproj b/src/Codebelt.Extensions.Xunit/Codebelt.Extensions.Xunit.csproj index 12186e2..4e03fb9 100644 --- a/src/Codebelt.Extensions.Xunit/Codebelt.Extensions.Xunit.csproj +++ b/src/Codebelt.Extensions.Xunit/Codebelt.Extensions.Xunit.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests.csproj b/test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests.csproj index 4e31fe3..1ac5eb6 100644 --- a/test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests.csproj +++ b/test/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests/Codebelt.Extensions.Xunit.Hosting.AspNetCore.Tests.csproj @@ -1,13 +1,13 @@  - net8.0;net6.0 + net9.0;net8.0 Codebelt.Extensions.Xunit.Hosting.AspNetCore - - + + diff --git a/testenvironments.json b/testenvironments.json index 046978a..3cd700b 100644 --- a/testenvironments.json +++ b/testenvironments.json @@ -9,7 +9,7 @@ { "name": "Docker-Ubuntu", "type": "docker", - "dockerImage": "gimlichael/ubuntu-testrunner:net6.0.424-net8.0.303" + "dockerImage": "gimlichael/ubuntu-testrunner:net6.0.425-net8.0.401-9.0.100-rc.1.24452.12" } ] } From 5ca20e6dc895167d3c88988700f4492a99b8ab36 Mon Sep 17 00:00:00 2001 From: Michael Mortensen Date: Mon, 16 Sep 2024 01:12:18 +0200 Subject: [PATCH 5/5] :construction_worker: added .net9 to Security Analysis --- .github/workflows/pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pipelines.yml b/.github/workflows/pipelines.yml index c91c217..7073675 100644 --- a/.github/workflows/pipelines.yml +++ b/.github/workflows/pipelines.yml @@ -189,6 +189,8 @@ jobs: - name: Install .NET uses: codebeltnet/install-dotnet@v1 + with: + includePreview: true - name: Restore Dependencies uses: codebeltnet/dotnet-restore@v2