Merge branch 'develop'

devlead · Sep 21, 2024 · 4670899 · 4670899
2 parents 6280f50 + ece12c6
commit 4670899
Show file tree

Hide file tree

Showing 23 changed files with 535 additions and 647 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,11 +26,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install .NET SDK 7.0.x - 8.0.x
+      - name: Install .NET SDK 8.0.x
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            7.0.x
             8.0.x
 
       - name: Install .NET SDK

diff --git a/build.cake b/build.cake
@@ -210,6 +210,7 @@ Task("Clean")
 .Then("Integration-Tests")
 .Then("Generate-Statiq-Web")
     .WithCriteria<BuildData>((context, data) => data.ShouldRunIntegrationTests(), "ShouldRunIntegrationTests")
+    .WithCriteria<BuildData>((context, data) => !context.IsRunningOnMacOs(), "Not IsRunningOnMacOS")
     .Does<BuildData>(static (context, data) => {
         context.DotNetRun(
             data.ProjectRoot.CombineWithFilePath("ARI.TestWeb/ARI.TestWeb.csproj").FullPath,

diff --git a/global.json b/global.json
@@ -1,7 +1,5 @@
 {
   "sdk": {
-      "version": "8.0.203",
-      "rollForward": "latestMinor",
-      "allowPrerelease": false
+    "version": "9.0.100-rc.1.24452.12"
   }
 }
diff --git a/src/ARI.TestWeb/ARI.TestWeb.csproj b/src/ARI.TestWeb/ARI.TestWeb.csproj
@@ -11,6 +11,18 @@
 
   <ItemGroup>
     <PackageReference Include="Devlead.Statiq" Version="0.20.1" />
+    <PackageReference Include="Statiq.Web" Version="1.0.0-beta.60" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageReference Include="Azure.Identity" Version="1.12.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ARI.Tests/ARI.Tests.csproj b/src/ARI.Tests/ARI.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
@@ -58,20 +58,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.1.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Verify.NUnit" Version="23.5.2" />
+    <PackageReference Include="Verify.NUnit" Version="26.6.0" />
     <PackageReference Condition=" '$(TargetFramework)' == 'net7.0' " Include="Verify.Http" Version="5.0.1" />
-    <PackageReference Condition=" '$(TargetFramework)' != 'net7.0' " Include="Verify.Http" Version="6.2.0" />
+    <PackageReference Condition=" '$(TargetFramework)' != 'net7.0' " Include="Verify.Http" Version="6.3.0" />
     <PackageReference Include="Cake.Testing" Version="4.0.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
   </ItemGroup>

diff --git a/src/ARI.Tests/Fixture/MocksFixture.cs b/src/ARI.Tests/Fixture/MocksFixture.cs
@@ -89,7 +89,7 @@ public static class MocksFixture
                                                     )
                                                 );
 #pragma warning disable CS8601 // Possible null reference assignment.
-    public static IDictionary<string, JsonValue> Properties { get; } = JsonSerializer.Deserialize<SortedDictionary<string, JsonValue>>(
+    public static IDictionary<string, JsonElement> Properties { get; } = JsonSerializer.Deserialize<SortedDictionary<string, JsonElement>>(
         """
         {
             "alwaysOn": false,

diff --git a/src/ARI.Tests/TestCaseGenericAttribute.cs b/src/ARI.Tests/TestCaseGenericAttribute.cs
@@ -9,7 +9,7 @@
 using NUnit.Framework.Internal.Builders;
 using NUnit.Framework.Internal;
 
-namespace NUnit.Framework;
+namespace NUnit.Framework.Extensions;
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
 public class TestCaseGenericAttribute : TestCaseAttribute, ITestBuilder

diff --git a/src/ARI.Tests/Unit/Commands/InventoryCommandTests.cs b/src/ARI.Tests/Unit/Commands/InventoryCommandTests.cs
@@ -17,6 +17,7 @@ public async Task ExecuteAsync(bool skipTenantOverview, bool includeSiteApplicat
     {
         // Given
         var context = new CommandContext(
+            Array.Empty<string>(),
             Substitute.For<IRemainingArguments>(),
             nameof(InventoryCommand),
             null

diff --git a/src/ARI.Tests/Unit/Services/ARM/TokenServiceTests.cs b/src/ARI.Tests/Unit/Services/ARM/TokenServiceTests.cs
@@ -8,8 +8,8 @@ namespace ARI.Tests.Unit.Services.ARM;
 [TestFixture]
 public class TokenServiceTests
 {
-    [TestCase<ArmResult<AzureTenant>>(Constants.Request.Uri.Tenants)]
-    [TestCase<ArmResult<Subscription>>(Constants.Request.Uri.Subscriptions)]
+    [NUnit.Framework.Extensions.TestCase<ArmResult<AzureTenant>>(Constants.Request.Uri.Tenants)]
+    [NUnit.Framework.Extensions.TestCase<ArmResult<Subscription>>(Constants.Request.Uri.Subscriptions)]
     public async Task ARMHttpClientGetAsync<T>(string url)
     {
         // Given
@@ -26,7 +26,7 @@ public async Task ARMHttpClientGetAsync<T>(string url)
         await Verify(result);
     }
 
-    [TestCase<GraphOrg>(Constants.Request.Uri.GraphOrg)]
+    [NUnit.Framework.Extensions.TestCase<GraphOrg>(Constants.Request.Uri.GraphOrg)]
     public async Task GraphHttpClientGetAsync<T>(string url)
     {
         // Given