Avanade · chullybun · Nov 22, 2024 · Nov 21, 2024 · Nov 22, 2024 · Nov 22, 2024
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -65,8 +65,8 @@ jobs:
       with:
         dotnet-version: |
             6.0.x
-            7.0.x
             8.0.x
+            9.0.x
 
     # Tools
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 Represents the **NuGet** versions.
 
+## v5.18.0
+- *Enhancement:* Added `net9.0` support.
+- *Enhancement:* Deprecated `net7.0` support; no longer supported by [Microsoft](https://dotnet.microsoft.com/en-us/platform/support/policy).
+- *Enhancement:* Updated dependencies to latest; including transitive where applicable.
+- *Enhancement:* Integrated `UnitTestEx` version `5.0.0` to enable the latest capabilities and improvements.
+  - `CoreEx.UnitTesting.NUnit` given changes is no longer required and has been deprecated, the `UnitTestEx.NUnit` (or other) must be explicitly referenced as per testing framework being used.
+  - `CoreEx.UnitTesting` package updated to include only standard .NET core capabilities to follow new `UnitTestEx` pattern; new packages created to house specific as follows:
+    - `CoreEx.UnitTesting.Azure.Functions` created to house Azure Functions specific capabilities;
+    - `CoreEx.UnitTesting.Azure.ServiceBus` created to house Azure Service Bus specific capabilities.
+  - Existing usage will require references to the new packages as required. There should be limited need to update existing tests to use beyond the requirement for the root `UnitTestEx` namespace. The updated default within `UnitTestEx` is to expose the key capabilities from the root namespace. For example, `using UnitTestEx.NUnit`, should be replaced with `using UnitTestEx`.
+
 ## v5.17.1
 - *Fixed:* The database console `Script` command execution has been updated to output to the correct directory path.
 - *Fixed:* The `Agent` code-generation artefacts have been further simplified/improved.

diff --git a/Common.targets b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>5.17.1</Version>
+		<Version>5.18.0</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Avanade</Authors>
 		<Company>Avanade</Company>

diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj b/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
@@ -5,8 +5,8 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cdr.Banking.Business\Cdr.Banking.Business.csproj" />

diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj b/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
@@ -12,8 +12,8 @@
     <Folder Include="DataSvc\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
@@ -10,6 +10,6 @@
     <Folder Include="Entities\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/AccountTest.cs b/samples/Cdr.Banking/Cdr.Banking.Test/AccountTest.cs
@@ -8,7 +8,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Cdr.Banking.Test
 {

diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj b/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
@@ -34,12 +34,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs b/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
@@ -7,7 +7,6 @@
 using NUnit.Framework;
 using System.Threading.Tasks;
 using UnitTestEx;
-using UnitTestEx.NUnit;
 using Cosmos = Microsoft.Azure.Cosmos;
 
 namespace Cdr.Banking.Test

diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/TransactionArgsTest.cs b/samples/Cdr.Banking/Cdr.Banking.Test/TransactionArgsTest.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Cdr.Banking.Test
 {

diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/TransactionTest.cs b/samples/Cdr.Banking/Cdr.Banking.Test/TransactionTest.cs
@@ -7,7 +7,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Cdr.Banking.Test
 {

diff --git a/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj b/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.9.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
@@ -16,14 +16,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
-    <PackageReference Include="CoreEx.FluentValidation" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
+    <PackageReference Include="CoreEx.FluentValidation" Version="3.30.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </ItemGroup>
 

diff --git a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
@@ -9,7 +9,7 @@
     <Folder Include="Agents\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
     <PackageReference Include="Grpc.Tools" Version="2.67.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj b/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
@@ -52,16 +52,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting" Version="3.27.3" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Demo/Beef.Demo.Test/ContactTest.cs b/samples/Demo/Beef.Demo.Test/ContactTest.cs
@@ -10,7 +10,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/Demo/Beef.Demo.Test/EventOutboxTest.cs b/samples/Demo/Beef.Demo.Test/EventOutboxTest.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using UnitTestEx;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/Demo/Beef.Demo.Test/FixtureSetup.cs b/samples/Demo/Beef.Demo.Test/FixtureSetup.cs
@@ -6,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using UnitTestEx;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/Demo/Beef.Demo.Test/GenderTest.cs b/samples/Demo/Beef.Demo.Test/GenderTest.cs
@@ -7,7 +7,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/Demo/Beef.Demo.Test/PostalInfoTest.cs b/samples/Demo/Beef.Demo.Test/PostalInfoTest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
+using UnitTestEx;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/Demo/Beef.Demo.Test/ReferenceDataTest.cs b/samples/Demo/Beef.Demo.Test/ReferenceDataTest.cs
@@ -13,7 +13,6 @@
 using System.Threading.Tasks;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/Demo/Beef.Demo.Test/RobotTest.cs b/samples/Demo/Beef.Demo.Test/RobotTest.cs
@@ -17,7 +17,6 @@
 using System.Threading.Tasks;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 using Cosmos = Microsoft.Azure.Cosmos;
 
 namespace Beef.Demo.Test

diff --git a/samples/Demo/Beef.Demo.Test/XParallelPersonTest.cs b/samples/Demo/Beef.Demo.Test/XParallelPersonTest.cs
@@ -6,7 +6,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {

diff --git a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
@@ -5,9 +5,9 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.9.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\My.Hr.Business\My.Hr.Business.csproj" />

diff --git a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.31" />
   </ItemGroup>
 </Project>
diff --git a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
@@ -6,6 +6,6 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/My.Hr/My.Hr.Test/GlobalUsings.cs b/samples/My.Hr/My.Hr.Test/GlobalUsings.cs
@@ -16,7 +16,6 @@
 global using System.Threading.Tasks;
 global using UnitTestEx;
 global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
 global using My.Hr.Api;
 global using My.Hr.Business;
 global using My.Hr.Business.Data;

diff --git a/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj b/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
@@ -32,17 +32,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj b/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
@@ -6,12 +6,12 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Azure" Version="3.27.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Azure" Version="3.30.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
     <PackageReference Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" Version="8.0.1" />
     <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyEf.Hr.Business\MyEf.Hr.Business.csproj" />

diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
@@ -7,6 +7,6 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
@@ -15,8 +15,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx.Azure" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />

diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Test/GlobalUsings.cs b/samples/MyEf.Hr/MyEf.Hr.Security.Test/GlobalUsings.cs
@@ -7,5 +7,4 @@
 global using NUnit.Framework.Internal;
 global using System.Net;
 global using UnitTestEx;
-global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
+global using UnitTestEx.Expectations;
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,8 +65,8 @@ jobs: @@
           with:
             dotnet-version: |
 .0.x
-.0.x
 .0.x
+.0.x
         # Tools
@@ Expand Down @@