Merge develop/2.0 into main

.gitignore

@@ -339,3 +339,5 @@ local.settings.json
 appsettings.json
 
 **/MsDeploy
+
+*.feature.cs

GitVersion.yml

@@ -20,5 +20,8 @@ branches:
     - feature
     - support
     - hotfix
-next-version: "1.1"
-
+  develop:
+    mode: ContinuousDeployment
+    tag: alpha
+    regex: ^develop/\d\.\d$
+next-version: "2.0"

Solutions/Marain.Tenancy.Cli/Marain.Tenancy.Cli.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>tenancy</AssemblyName>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
@@ -40,7 +40,7 @@
     </PackageReference>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
     <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="[3.1.*,)" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="[6.0.*,)" />
     <PackageReference Include="ConsoleTables" Version="2.4.2" />
   </ItemGroup>
 

Solutions/Marain.Tenancy.Cli/Marain/Tenancy/Cli/Commands/Create.cs

@@ -73,7 +73,7 @@ public async Task OnExecute(CommandLineApplication app)
 
             if (string.IsNullOrEmpty(this.Name))
             {
-                throw new ArgumentException("Name must be supplied", nameof(this.Name));
+                throw new InvalidOperationException("Name must be supplied");
             }
 
             Guid wellKnownGuid = string.IsNullOrEmpty(this.WellKnownTenantGuid)

Solutions/Marain.Tenancy.Cli/Marain/Tenancy/Cli/Program.cs

@@ -6,7 +6,9 @@ namespace Marain.Tenancy.Cli
 {
     using System;
     using System.Threading.Tasks;
-    using Corvus.Identity.ManagedServiceIdentity.ClientAuthentication;
+
+    using Corvus.Identity.ClientAuthentication.Azure;
+
     using Marain.Tenancy.Client;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Hosting;
@@ -35,12 +37,12 @@ public static async Task Main(string[] args)
                 services.AddJsonNetDateTimeOffsetToIso8601AndUnixTimeConverter();
                 services.AddSingleton<JsonConverter>(new StringEnumConverter(true));
 
-                var msiTokenSourceOptions = new AzureManagedIdentityTokenSourceOptions
+                var msiTokenSourceOptions = new LegacyAzureServiceTokenProviderOptions
                 {
                     AzureServicesAuthConnectionString = ctx.Configuration["AzureServicesAuthConnectionString"],
                 };
 
-                services.AddAzureManagedIdentityBasedTokenSource(msiTokenSourceOptions);
+                services.AddServiceIdentityAzureTokenCredentialSourceFromLegacyConnectionString(msiTokenSourceOptions);
 
                 var tenancyClientOptions = new TenancyClientOptions
                 {

Solutions/Marain.Tenancy.Cli/Marain/Tenancy/Cli/TenancyCliCommand.cs

@@ -4,6 +4,7 @@
 
 namespace Marain.Tenancy.Cli
 {
+    using System.Diagnostics.CodeAnalysis;
     using System.Threading.Tasks;
     using Marain.Tenancy.Cli.Commands;
     using McMaster.Extensions.CommandLineUtils;
@@ -23,6 +24,7 @@ public class TenancyCliCommand
         /// </summary>
         /// <param name="app">The current <c>CommandLineApplication</c>.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "The command line framework requires this to be an instance method")]
         protected Task<int> OnExecute(CommandLineApplication app)
         {
             app.ShowHelp();

Solutions/Marain.Tenancy.Cli/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Cli: list": {
+      "commandName": "Project",
+      "commandLineArgs": "list"
+    }
+  }
+}

Solutions/Marain.Tenancy.Cli/appsettings.template.json

@@ -2,7 +2,7 @@
   // If running with a local tenancy service, point TenancyClient:TenancyServiceBaseUri at the localhost address for that
   // and set the ResourceIdForMsiAuthentication to an empty string.
   "TenancyClient:TenancyServiceBaseUri": "https://mardevtenancy.azurewebsites.net/",
-  "TenancyClient:ResourceIdForMsiAuthentication": "f1815180-9920-477b-95cc-7b93c2cd5de0"
+  "TenancyClient:ResourceIdForMsiAuthentication": "e7281b1b-6540-4c1b-ac18-eb0c2d42bfbf"
 
   // If TenancyClient:TenancyServiceBaseUri refers to an instance in Azure, or if you've configured
   // TenantCosmosContainerFactoryOptions, this local service will need to authenticate.