.NET 8.0 Update

.github/workflows/build.yml

@@ -0,0 +1,94 @@
+name: build
+on:
+  push:
+    branches:
+    - main
+    - master
+    tags:
+    - '*'
+  pull_request:
+    branches:
+    - main
+    - master
+  workflow_dispatch:
+    inputs:
+      forcePublish:
+        description: When true the Publish stage will always be run, otherwise it only runs for tagged versions.
+        required: false
+        default: false
+        type: boolean
+      forcePublicNugetDestination:
+        description: When true the NuGet Publish destination will always be set to nuget.org. (Normally, force publishing publishes to the private feed on GitHub.)
+        required: false
+        default: false
+        type: boolean
+      skipCleanup:
+        description: When true the pipeline clean-up stage will not be run. For example, the cache used between pipeline stages will be retained.
+        required: false
+        default: false
+        type: boolean
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.sha }}
+  cancel-in-progress: true
+
+permissions:
+  actions: write  # enable cache clean-up
+  checks: write  # enable test result annotations
+  contents: write  # enable creating releases
+  issues: read
+  packages: write  # enable publishing packages
+  pull-requests: write  # enable test result annotations
+
+jobs:
+  prepareConfig:
+    name: Prepare Configuration
+    runs-on: ubuntu-latest
+    outputs:
+      RESOLVED_ENV_VARS: ${{ steps.prepareEnvVarsAndSecrets.outputs.environmentVariablesYamlBase64 }}
+      RESOLVED_SECRETS: ${{ steps.prepareEnvVarsAndSecrets.outputs.secretsYamlBase64 }}
+    steps:
+    # Declare any environment variables and/or secrets that need to be available inside the build process
+    - uses: endjin/Endjin.RecommendedPractices.GitHubActions/actions/prepare-env-vars-and-secrets@main
+      id: prepareEnvVarsAndSecrets
+      with:
+        environmentVariablesYaml: |
+          ZF_NUGET_PUBLISH_SOURCE: ${{ (startsWith(github.ref, 'refs/tags/') || github.event.inputs.forcePublicNugetDestination == 'true') && 'https://api.nuget.org/v3/index.json' || format('https://nuget.pkg.github.com/{0}/index.json', github.repository_owner) }}
+        secretsYaml: |
+          NUGET_API_KEY: "${{ startsWith(github.ref, 'refs/tags/') && secrets.NUGET_APIKEY || secrets.BUILD_PUBLISHER_PAT }}"
+          AzureServicesAuthConnectionString: RunAs=Developer;DeveloperTool=AzureCli
+          TenancyClient__TenancyServiceBaseUri: ${{ vars.TESTS_MARAINTENANCYBASEURL }}
+          TenancyClient__ResourceIdForMsiAuthentication: ${{ vars.TESTS_MARAINTENANCYRESOURCEIDFORMSIAUTHENTICATION }}
+        secretsEncryptionKey: ${{ secrets.SHARED_WORKFLOW_KEY }}
+
+  build:
+    needs: prepareConfig
+    uses: endjin/Endjin.RecommendedPractices.GitHubActions/.github/workflows/scripted-build-matrix-pipeline.yml@main
+    with:
+      netSdkVersion: '8.x'
+      # additionalNetSdkVersion: '9.x'
+      # workflow_dispatch inputs are always strings, the type property is just for the UI
+      forcePublish: ${{ github.event.inputs.forcePublish == 'true' }}
+      skipCleanup: ${{ github.event.inputs.skipCleanup == 'true' }}
+      enableCrossOsCaching: true
+      testPhaseMatrixJson: |
+        {
+          "os": ["windows-latest", "ubuntu-latest"],
+          "dotnetFramework": ["net8.0"]
+        }
+      # testArtifactName: ''
+      # testArtifactPath: ''
+      compilePhaseEnv: ${{ needs.prepareConfig.outputs.RESOLVED_ENV_VARS }}
+      testPhaseEnv: ${{ needs.prepareConfig.outputs.RESOLVED_ENV_VARS }}
+      packagePhaseEnv: ${{ needs.prepareConfig.outputs.RESOLVED_ENV_VARS }}
+      publishPhaseEnv: ${{ needs.prepareConfig.outputs.RESOLVED_ENV_VARS }}
+    secrets:
+      compilePhaseAzureCredentials: ${{ secrets.AZURE_READER_CREDENTIALS }}
+      testPhaseAzureCredentials: ${{ secrets.TESTS_KV_READER_CREDENTIALS }}
+      # packagePhaseAzureCredentials: ${{ secrets.AZURE_PUBLISH_CREDENTIALS }}
+      # publishPhaseAzureCredentials: ${{ secrets.AZURE_PUBLISH_CREDENTIALS }}
+      # compilePhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
+      testPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
+      # packagePhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
+      publishPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
+      secretsEncryptionKey: ${{ secrets.SHARED_WORKFLOW_KEY }}

.gitignore

@@ -345,4 +345,5 @@ appsettings.json
 # Scripted build migration 
 _codeCoverage/
 _packages/
-*.sbom.*
+*.sbom.*
+.zf/extensions/

.zf/config.ps1

@@ -0,0 +1,70 @@
+<#
+This example demonstrates a software build process using the 'ZeroFailed.Build.DotNet' extension
+to provide the features needed when building a .NET solutions.
+#>
+
+$zerofailedExtensions = @(
+    @{
+        # References the extension from its GitHub repository. If not already installed, use latest version from 'main' will be downloaded.
+        Name = "ZeroFailed.Build.DotNet"
+        GitRepository = "https://github.com/zerofailed/ZeroFailed.Build.DotNet"
+        GitRef = "main"
+    }
+)
+
+# Load the tasks and process
+. ZeroFailed.tasks -ZfPath $here/.zf
+
+
+#
+# Build process control options
+#
+$SkipInit = $false
+$SkipVersion = $false
+$SkipBuild = $false
+$CleanBuild = $Clean
+$SkipTest = $false
+$SkipTestReport = $false
+$SkipAnalysis = $false
+$SkipPackage = $false
+
+#
+# Build process configuration
+#
+$SolutionToBuild = (Resolve-Path (Join-Path $here "Solutions/Marain.TenantManagement.sln")).Path
+$ProjectsToPublish = @(
+    "Solutions/Marain.TenantManagement.Cli/Marain.TenantManagement.Cli.csproj"
+)
+$NuSpecFilesToPackage = @()
+$NugetPublishSource = property ZF_NUGET_PUBLISH_SOURCE "$here/_local-nuget-feed"
+$IncludeAssembliesInCodeCoverage = "Marain*"
+$ExcludeAssembliesInCodeCoverage = ""
+
+
+# Customise the build process
+
+task . FullBuild
+
+
+#
+# Build Process Extensibility Points - uncomment and implement as required
+#
+
+# task RunFirst {}
+# task PreInit {}
+# task PostInit {}
+# task PreVersion {}
+# task PostVersion {}
+# task PreBuild {}
+# task PostBuild {}
+# task PreTest {}
+# task PostTest {}
+# task PreTestReport {}
+# task PostTestReport {}
+# task PreAnalysis {}
+# task PostAnalysis {}
+# task PrePackage {}
+# task PostPackage {}
+# task PrePublish {}
+# task PostPublish {}
+# task RunLast {}

GitVersion.yml

@@ -20,5 +20,5 @@ branches:
     - feature
     - support
     - hotfix
-next-version: "3.1"
+next-version: "4.0"
 

Solutions/Marain.Services.Tenancy.Testing/Marain.Services.Tenancy.Testing.csproj

@@ -2,7 +2,7 @@
   <Import Project="$(EndjinProjectPropsPath)" Condition="$(EndjinProjectPropsPath) != ''" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>true</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -15,12 +15,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Testing.SpecFlow" Version="2.0.1" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.5">
+    <PackageReference Include="Corvus.Testing.ReqnRoll" Version="4.0.5" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.18">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[6.0.*,)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.*,)" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Marain.Services.Tenancy.Testing/Marain/TenantManagement/Testing/InMemoryTenantProvider.cs

@@ -7,15 +7,14 @@ namespace Marain.TenantManagement.Testing
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Text.Json;
     using System.Threading.Tasks;
 
-    using Corvus.Extensions.Json;
     using Corvus.Json;
+    using Corvus.Json.Serialization;
     using Corvus.Tenancy;
     using Corvus.Tenancy.Exceptions;
 
-    using Newtonsoft.Json;
-
     /// <summary>
     /// In-memory implementation of ITenantProvider.
     /// </summary>
@@ -40,7 +39,7 @@ namespace Marain.TenantManagement.Testing
     /// </remarks>
     public class InMemoryTenantProvider : ITenantStore
     {
-        private readonly IJsonSerializerSettingsProvider jsonSerializerSettingsProvider;
+        private readonly IJsonSerializerOptionsProvider jsonSerializerOptionsProvider;
         private readonly List<StoredTenant> allTenants = new();
         private readonly Dictionary<string, List<string>> tenantsByParent = new();
         private readonly IPropertyBagFactory propertyBagFactory;
@@ -49,15 +48,15 @@ public class InMemoryTenantProvider : ITenantStore
         /// Creates a new instance of the <see cref="InMemoryTenantProvider"/> class.
         /// </summary>
         /// <param name="rootTenant">The root tenant.</param>
-        /// <param name="jsonSerializerSettingsProvider">The serialization settings provider.</param>
+        /// <param name="jsonSerializerOptionsProvider">The serialization settings provider.</param>
         /// <param name="propertyBagFactory">Provides the ability to create and modify property bags.</param>
         public InMemoryTenantProvider(
             RootTenant rootTenant,
-            IJsonSerializerSettingsProvider jsonSerializerSettingsProvider,
+            IJsonSerializerOptionsProvider jsonSerializerOptionsProvider,
             IPropertyBagFactory propertyBagFactory)
         {
             this.Root = rootTenant;
-            this.jsonSerializerSettingsProvider = jsonSerializerSettingsProvider;
+            this.jsonSerializerOptionsProvider = jsonSerializerOptionsProvider;
             this.propertyBagFactory = propertyBagFactory;
         }
 
@@ -81,7 +80,7 @@ public async Task<ITenant> CreateWellKnownChildTenantAsync(string parentTenantId
 
             List<string> childrenList = this.GetChildren(parent.Id);
             childrenList.Add(newTenant.Id);
-            this.allTenants.Add(new StoredTenant(newTenant, this.jsonSerializerSettingsProvider.Instance));
+            this.allTenants.Add(new StoredTenant(newTenant, this.jsonSerializerOptionsProvider.Instance));
 
             return newTenant;
         }
@@ -193,7 +192,7 @@ public List<string> GetChildren(string parentId)
         {
             if (!this.tenantsByParent.TryGetValue(parentId, out List<string>? children))
             {
-                children = new List<string>();
+                children = [];
                 this.tenantsByParent.Add(parentId, children);
             }
 
@@ -207,12 +206,12 @@ public List<string> GetChildren(string parentId)
         /// </summary>
         private class StoredTenant
         {
-            private readonly JsonSerializerSettings settings;
+            private readonly JsonSerializerOptions options;
             private string tenant = string.Empty;
 
-            public StoredTenant(ITenant tenant, JsonSerializerSettings settings)
+            public StoredTenant(ITenant tenant, JsonSerializerOptions options)
             {
-                this.settings = settings;
+                this.options = options;
                 this.Id = tenant.Id;
                 this.Name = tenant.Name;
                 this.Tenant = tenant;
@@ -224,8 +223,8 @@ public StoredTenant(ITenant tenant, JsonSerializerSettings settings)
 
             public ITenant Tenant
             {
-                get => JsonConvert.DeserializeObject<Tenant>(this.tenant, this.settings)!;
-                set => this.tenant = JsonConvert.SerializeObject(value, this.settings);
+                get => JsonSerializer.Deserialize<Tenant>(this.tenant, this.options)!;
+                set => this.tenant = JsonSerializer.Serialize(value, this.options);
             }
         }
     }